diff options
Diffstat (limited to 'pkgs/applications')
148 files changed, 467 insertions, 731 deletions
diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index 720fd0b88be9..d9a05e0bf660 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { longDescription = '' Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders. ''; - version = "${version}"; + version = version; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix index ed1f05eaf5c6..cf383c1dd495 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises. This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. ''; - version = "${version}"; + version = version; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index ff3c456c3644..c72815d5ca25 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -6,18 +6,18 @@ , curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: -mkDerivation { +mkDerivation rec { pname = "amarok"; - version = "2.9.0-20190731"; + version = "2.9.0-20190824"; src = fetchgit { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out url = git://anongit.kde.org/amarok.git; - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.CZ"; - rev = "783da6d8e93737f5e41a3bc017906dc1f94bb94f"; - sha256 = "08bypxk5kaay98hbwz9pj3hwgiyk3qmn9qw99bnjkkkw9wzsxiy6"; + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; + sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index 7f551304df11..fb9b3c9513f8 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "axoloti"; repo = "axoloti"; - rev = "${version}"; + rev = version; sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9"; }; diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index 86e200ab252f..d16d93318216 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; - rev = "${version}"; + rev = version; sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip"; }; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index ad1239b22af2..21cd3fbdb25a 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,7 +20,7 @@ let src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "${version}"; + rev = version; sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 0ca5988383a6..9d3656a81f97 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tomszilagyi"; repo = "ir.lv2"; - rev = "${version}"; + rev = version; sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6"; }; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 3d5c6f699dd2..f3abfbca145d 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sadko4u"; - repo = "${pname}"; + repo = pname; rev = "${pname}-${version}"; sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2"; }; diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 6f81ebbb8f1e..8b08aed62b8b 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -9,7 +9,7 @@ with lib; stdenv.mkDerivation rec { pname = "musescore-darwin"; - version = "${concatStringsSep "." versionComponents}"; + version = concatStringsSep "." versionComponents; src = fetchurl { url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 7934af8aad8e..2a39caa08659 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -1,4 +1,6 @@ -{ stdenv +{ mkDerivation +, lib +, qtbase , fetchFromGitHub , fftwSinglePrec , ruby @@ -6,20 +8,21 @@ , aubio , cmake , pkgconfig -, qt5 -, libsForQt5 , boost , bash -, makeWrapper , jack2Full +, supercollider +, qscintilla +, qwt }: let - supercollider = libsForQt5.callPackage ../../../development/interpreters/supercollider { - fftw = fftwSinglePrec; - }; -in stdenv.mkDerivation rec { + supercollider_single_prec = supercollider.override { fftw = fftwSinglePrec; }; + +in + +mkDerivation rec { version = "3.1.0"; pname = "sonic-pi"; @@ -33,15 +36,14 @@ in stdenv.mkDerivation rec { buildInputs = [ bash cmake - makeWrapper pkgconfig - qt5.qtbase - libsForQt5.qscintilla - libsForQt5.qwt + qtbase + qscintilla + qwt ruby libffi aubio - supercollider + supercollider_single_prec boost ]; @@ -80,20 +82,23 @@ in stdenv.mkDerivation rec { installPhase = '' runHook preInstall - cp -r . $out - wrapProgram $out/bin/sonic-pi \ + runHook postInstall + ''; + + # $out/bin/sonic-pi is a shell script, and wrapQtAppsHook doesn't wrap them. + dontWrapQtApps = true; + preFixup = '' + wrapQtApp "$out/bin/sonic-pi" \ --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \ --set AUBIO_LIB "${aubio}/lib/libaubio.so" - - runHook postInstall ''; meta = { homepage = http://sonic-pi.net/; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Phlogistique kamilchm ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 8dcca85a25c4..768b40a11388 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { and the engine can be run standalone on a computer without a monitor. ''; - version = "${version}"; + version = version; homepage = http://essej.net/sooperlooper/index.html; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 3daed9f63501..9035a2a73c57 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; - rev = "${version}"; + rev = version; sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1"; }; diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 9eb71835caa9..1247bbc19f97 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { without audible degradation. ''; - version = "${version}"; + version = version; homepage = http://shibatch.sourceforge.net/; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix index 2438cf68536d..030bb2c01a72 100644 --- a/pkgs/applications/audio/tambura/default.nix +++ b/pkgs/applications/audio/tambura/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "olilarkin"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y"; }; diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 382a1a8b2e21..79801f2e99fa 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -30,7 +30,7 @@ python2.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]}" + "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]) ]; # some tests require internet access diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 5b8b17232b90..2b7ae5d9c6e6 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = let options = { - BOOST_ROOT = "${boost}"; + BOOST_ROOT = boost; Boost_USE_STATIC_LIBS = "OFF"; RAIBLOCKS_GUI = "ON"; RAIBLOCKS_TEST = "ON"; diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix index a936691bd799..a6d4660dff11 100644 --- a/pkgs/applications/blockchains/parity/beta.nix +++ b/pkgs/applications/blockchains/parity/beta.nix @@ -1,6 +1,6 @@ let version = "2.6.2"; sha256 = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r"; - cargoSha256 = "18zd91n04wck3gd8szj4vxn3jq0bzq0h3rg0wcs6nzacbzhcx2sw"; + cargoSha256 = "1wr0i54zc3l6n0x6cvlq9zfy3bw9w5fcvdz4vmyym9r1nkvk31s7"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix index 9b5a72077d5c..88d24a87e135 100644 --- a/pkgs/applications/blockchains/parity/default.nix +++ b/pkgs/applications/blockchains/parity/default.nix @@ -1,6 +1,6 @@ let version = "2.5.7"; sha256 = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj"; - cargoSha256 = "0aa0nkv3jr7cdzswbxghxxv0y65a59jgs1682ch8vrasi0x17m1x"; + cargoSha256 = "11mr5q5aynli9xm4wnxcypl3ij7f4b0p7l557yi9n0cvdraw8ki4"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b5381983240a..2a9129cfebf2 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.10"; # "Android Studio 3.6 Canary 10" - build = "192.5842447"; - sha256Hash = "0qyvqm0ihp6czx77skia87qnz87wrsp1a6la04dr4b0xln2c8m5b"; + version = "3.6.0.11"; # "Android Studio 3.6 Canary 11" + build = "192.5863777"; + sha256Hash = "1wz4vcdj4225vffsq0ji4zgg9qaqlfd21x7c6nczhqvydbyrjzg8"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index 4c1a0dd2312d..cedc56e97ceb 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -14,7 +14,7 @@ in pkgs.mkShell { pkgs.bash ]; - EMACS2NIX = "${src}"; + EMACS2NIX = src; shellHook = '' export PATH=$PATH:${src} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 545ad5a5e0c3..fd62ea18b713 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -6,7 +6,7 @@ src = pkgs.fetchFromGitHub { owner = "skeeto"; repo = "elisp-ffi"; - rev = "${version}"; + rev = version; sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22"; }; buildInputs = [ external.libffi ]; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index fe440c146ae8..838e57343c43 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -68,10 +68,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (self.melpaPackages) easy-kill; }; - elpy = super.elpy.overrideAttrs(old: { - propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ]; - }); - emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index ac35560c7f63..f7351454fb8c 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,7 +1,7 @@ { runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in -runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " +runCommand name { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " mkdir -p $out ln -s ${geany}/share $out makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 205c32d5f806..43cea9fcae93 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -8,7 +8,7 @@ let in { displayName = "Python 3"; argv = [ - "${env.interpreter}" + env.interpreter "-m" "ipykernel_launcher" "-f" diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index f53d345d49ed..61e2b3a58459 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -3,6 +3,7 @@ { inherit parinfer-rust; + kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { }; kak-buffers = pkgs.callPackage ./kak-buffers.nix { }; kak-fzf = pkgs.callPackage ./kak-fzf.nix { }; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix b/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix new file mode 100644 index 000000000000..408cba45fbe6 --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "kak-ansi"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "eraserhd"; + repo = "kak-ansi"; + rev = "v${version}"; + sha256 = "0ddjih8hfyf6s4g7y46p1355kklaw1ydzzh61141i0r45wyb2d0d"; + }; + + installPhase = '' + mkdir -p $out/bin $out/share/kak/autoload/plugins/ + cp kak-ansi-filter $out/bin/ + # Hard-code path of filter and don't try to build when Kakoune boots + sed ' + /^declare-option.* ansi_filter /i\ +declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} + /^declare-option.* ansi_filter /,/^}/d + ' rc/ansi.kak >$out/share/kak/autoload/plugins/ansi.kak + ''; + + meta = with stdenv.lib; { + description = "Kakoune support for rendering ANSI code"; + homepage = "https://github.com/eraserhd/kak-ansi"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index dd49b0a1cf77..d1028ec6ce8d 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -35,7 +35,7 @@ in python.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "retext-project"; repo = "retext"; - rev = "${version}"; + rev = version; sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si"; }; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 74e5460f529f..933644cc4717 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -4,6 +4,7 @@ , llvmPackages }: +with stdenv.lib; let verMajor = "1"; verMinor = "2"; @@ -47,7 +48,13 @@ stdenv.mkDerivation rec { sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; }; - hunspellDictionaries = with stdenv.lib; filter isDerivation (unique (attrValues hunspellDicts)); + hunspellDictionaries = filter isDerivation (unique (attrValues hunspellDicts)); + # These dicts contain identically-named dict files, so we only keep the + # -large versions in case of clashes + largeDicts = filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; + otherDicts = filter (d: !(hasAttr "dictFileName" d && + elem d.dictFileName (map (d: d.dictFileName) largeDicts))) hunspellDictionaries; + dictionaries = largeDicts ++ otherDicts; mathJaxSrc = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; @@ -77,7 +84,7 @@ stdenv.mkDerivation rec { mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer} mkdir dependencies/common/dictionaries - for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do + for dict in ${builtins.concatStringsSep " " dictionaries}; do for i in "$dict/share/hunspell/"*; do ln -sv $i dependencies/common/dictionaries/ done diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index fb0c32f72d7c..40d16733db27 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q"; - "x86_64-darwin" = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky"; + x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q"; + x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky"; }.${system}; in callPackage ./generic.nix rec { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 33a6a26d8b35..02d0396a94f5 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132"; - "x86_64-darwin" = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4"; + x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132"; + x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4"; }.${system}; in callPackage ./generic.nix rec { diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 008bfdf881e5..2c520f21f848 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -152,7 +152,9 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { installPhase = "installPlugins src/gimp-lqr-plugin"; }; - gmic = pkgs.gmic.gimpPlugin; + gmic = pkgs.gmic-qt.override { + variant = "gimp"; + }; ufraw = pkgs.ufraw.gimpPlugin; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index eb48333997ca..2535f7514f1d 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index d4a7e396cb05..ae2db5181ccb 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/src"; - IPEPREFIX="${placeholder "out"}"; + IPEPREFIX=placeholder "out"; URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; LUA_PACKAGE = "lua"; diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix index f96b70a77b47..c527ce2b229a 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -16,7 +16,7 @@ let }; binary = appimageTools.wrapType2 { - name = "${pname}"; + name = pname; inherit src; }; # we only use this to extract the icon diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index 75c1bf5be8bf..0fe33ea017da 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -5,7 +5,7 @@ incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, - kitinerary + kitinerary, kontactinterface }: mkDerivation { @@ -20,6 +20,6 @@ mkDerivation { incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar libksieve mailcommon mailimporter messagelib poppler prison kpkpass - kitinerary + kitinerary kontactinterface ]; } diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 13539169dece..a4f6b1ce9881 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { LUPDATE="${qttools.dev}/bin/lupdate"; LRELEASE="${qttools.dev}/bin/lrelease"; MOC="${qtbase.dev}/bin/moc"; - QTDIR="${qtbase.dev}"; + QTDIR=qtbase.dev; RCC="${qtbase.dev}/bin/rcc"; UIC="${qtbase.dev}/bin/uic"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c48d458567dc..0ebeb1beffa1 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -88,7 +88,7 @@ python3Packages.buildPythonApplication { --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' substituteInPlace ./electrum/qrscanner.py \ - --replace ${libzbar_name} ${zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} '' else '' sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index a5e4bd74a6eb..0a28efbc28cd 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "electrum-ltc"; - version = "3.1.3.1"; + version = "3.3.8.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index d0d3c2b424d3..d8b355efe86d 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "geistesk"; repo = "et"; - rev = "${version}"; + rev = version; sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc"; }; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index 265181d7db3a..b2a992b850e1 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ]; + buildInputs = [ openssl ]; makeFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - meta = with stdenv.lib; { description = "A collection of tools to download books from Google Books"; homepage = https://njw.me.uk/getxbook/; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 464e0ba53346..41cdf267f5de 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi"; - rev = "${version}"; + rev = version; ignoreExternals = true; }; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index f0026cac52e0..273be11ac63a 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = pkgs.fetchFromGitHub { owner = "alexandervdm"; repo = "gummi"; - rev = "${version}"; + rev = version; sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn"; }; diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index 2af091b0df38..4c4b461303fb 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -1,24 +1,24 @@ -{ stdenv, requireFile, unzip, rlwrap, bash }: +{ stdenv, requireFile, unzip, rlwrap, bash, zlib }: assert (stdenv.hostPlatform.system == "i686-linux"); let libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc ]; + [ stdenv.cc.libc stdenv.cc.cc zlib ]; in stdenv.mkDerivation rec { pname = "kdbplus"; - version = "3.3"; + version = "3.6"; - src = requireFile { + src = requireFile rec { message = '' Nix can't download kdb+ for you automatically. Go to http://kx.com and download the free, 32-bit version for - Linux. Then run "nix-prefetch-url file://\$PWD/linux.zip" in - the directory where you saved it. Note you need version 3.3. + Linux. Then run "nix-prefetch-url file://\$PWD/${name}" in + the directory where you saved it. Note you need version ${version}. ''; - name = "linux.zip"; - sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940"; + name = "linuxx86.zip"; + sha256 = "0w6znd9warcqx28vf648n0vgmxyyy9kvsfpsfw37d1kp5finap4p"; }; dontStrip = true; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index b1c849b6bcee..22e6cd2f6667 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; - rev = "${version}"; + rev = version; sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac"; }; diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index ab40dfc8131b..2334221f926d 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -104,6 +104,9 @@ in buildFHSUserEnv { # WINE cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap ocl-icd utillinux + + # Winetricks + fribidi ] ++ xorgDeps pkgs; extraInstallCommands = '' diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 744d124f84d5..f7964e4e5c6d 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,8 +1,8 @@ -{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch +{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc, fetchpatch , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "2.3.0"; pname = "lyx"; @@ -30,10 +30,9 @@ stdenv.mkDerivation rec { doCheck = true; # python is run during runtime to do various tasks - postFixup = '' - wrapProgram "$out/bin/lyx" \ - --prefix PATH : '${python}/bin' - ''; + qtWrapperArgs = [ + " --prefix PATH : ${python}/bin" + ]; patches = [ (fetchpatch { @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = http://www.lyx.org; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index ed0bbc4cb488..3749f568aef2 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; - rev = "${version}"; + rev = version; sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp"; }; diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix index a234af740f3c..ad59b1be10e0 100644 --- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix +++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; + meta = with stdenv.lib; { homepage = http://www.netsurf-browser.org/; description = "String internment library for netsurf browser"; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index e5d73672eb75..a795c4485160 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - # for finding the nlopt library, which doesn't pick up the package in the nix store. # We need to set the path via the NLOPT environment variable instead. - NLOPT = "${nlopt}"; + NLOPT = nlopt; prePatch = '' # In nix ioctls.h isn't available from the standard kernel-headers package diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 48a05091ca85..1f35643dd761 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -11,7 +11,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "shundhammer"; repo = "qdirstat"; - rev = "${version}"; + rev = version; sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan"; }; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index ab15855b910b..b7c137258fd9 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase -, qtmultimedia, qttools, qtwebengine }: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, libeb, lzo +, qtbase, qtmultimedia, qttools, qtwebengine }: -stdenv.mkDerivation { +mkDerivation { pname = "qolibri"; - version = "2018-11-14"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "ludios"; repo = "qolibri"; - rev = "133a1c33e74d931ad54407f70d84a0016d96981f"; - sha256 = "16ifix0q8ww4l3xflgxr9j81c0lzlnkjr8fj961x3nxz7288pdg2"; + rev = "b58f9838d39300cba444eba725a369181c5d746b"; + sha256 = "0kcc6dvbcmq9y7hk8mp23pydiaqz6f0clg64d1f2y04ppphmah42"; }; nativeBuildInputs = [ pkgconfig cmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/ludios/qolibri; description = "EPWING reader for viewing Japanese dictionaries"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 71a433bded79..46b446b429bf 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "sieren"; repo = "QSyncthingTray"; - rev = "${version}"; + rev = version; sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w"; }; diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index b6676a0bf70e..7c239a9b7543 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -8,12 +8,12 @@ let description = "A clone of the well-known terminal emulator rxvt"; desktopItem = makeDesktopItem { - name = "${pname}"; + name = pname; exec = "urxvt"; icon = "utilities-terminal"; comment = description; desktopName = "URxvt"; - genericName = "${pname}"; + genericName = pname; categories = "System;TerminalEmulator;"; }; in diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index c116b5874069..9550a8d4fd7b 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "IgnorantGuru"; repo = "spacefm"; - rev = "${version}"; + rev = version; sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; }; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index 6cacb6215179..ba898932f06c 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jmhobbs"; repo = "terminal-parrot"; - rev = "${version}"; + rev = version; sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; }; diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix new file mode 100644 index 000000000000..8d84ab59d479 --- /dev/null +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, sqlite, zlib, perl }: + +stdenv.mkDerivation rec { + pname = "tippecanoe"; + version = "1.34.3"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = pname; + rev = version; + sha256 = "08pkxzwp4w5phrk9b0vszxnx8yymp50v0bcw96pz8qwk48z4xm0i"; + }; + + buildInputs = [ sqlite zlib ]; + checkInputs = [ perl ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + doCheck = true; + + meta = with stdenv.lib; { + description = "Build vector tilesets from large collections of GeoJSON features"; + homepage = https://github.com/mapbox/tippecanoe; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix index 240ad6e5fca4..669c06a9480e 100644 --- a/pkgs/applications/misc/todolist/default.nix +++ b/pkgs/applications/misc/todolist/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "gammons"; repo = "todolist"; - rev = "${version}"; + rev = version; sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p"; }; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index df9ed8973702..425ea8d237b3 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; - rev = "${version}"; + rev = version; sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5"; }; diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 8764c41c8a4c..ad29c8f94d8b 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -31,10 +31,21 @@ stdenv.mkDerivation rec { patches = debianPatches; - meta = { + postPatch = '' + substituteInPlace urlview.c \ + --replace '/etc/urlview/url_handler.sh' "$out/etc/urlview/url_handler.sh" + ''; + + postInstall = '' + install -Dm755 url_handler.sh $out/etc/urlview/url_handler.sh + patchShebangs $out/etc/urlview + ''; + + meta = with stdenv.lib; { description = "Extract URLs from text"; homepage = https://packages.qa.debian.org/u/urlview.html; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index cda3b1a6f850..2d8a860e7e86 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme -, geoclue2, liboauth }: +, geoclue2, liboauth, nettle }: stdenv.mkDerivation rec { pname = "viking"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme - geoclue2 liboauth + geoclue2 liboauth nettle ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index a7a6500fd22a..6a5e62f54e1e 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,22 +1,30 @@ -{stdenv, fetchurl, wxGTK, chmlib}: +{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }: -stdenv.mkDerivation { - name = "xchm-1.23"; - src = fetchurl { - url = mirror://sourceforge/xchm/xchm-1.23.tar.gz; - sha256 = "0qn0fyxcrn30ndq2asx31k0qkx3grbm16fb1y580wd2gjmh5r3wg"; +stdenv.mkDerivation rec { + pname = "xchm"; + version = "1.30"; + + src = fetchFromGitHub { + owner = "rzvncj"; + repo = "xCHM"; + rev = version; + sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v"; }; - buildInputs = [wxGTK chmlib]; - postConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS $(${wxGTK}/lib/wx/config/* --libs | sed -e s@-pthread@@)" - echo $NIX_LDFLAGS + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ wxGTK30 chmlib ]; + + configureFlags = [ "--with-wx-prefix=${wxGTK30}" ]; + + preConfigure = '' + export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0" ''; meta = with stdenv.lib; { description = "A viewer for Microsoft HTML Help files"; - homepage = http://xchm.sourceforge.net; + homepage = "https://github.com/rzvncj/xCHM"; license = licenses.gpl2; + maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index b7c6f938b19e..2e81e9b05d34 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "crosswire"; repo = "xiphos"; - rev = "${version}"; + rev = version; sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; }; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index be42127e2548..4d7b54536e4a 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -17,7 +17,7 @@ stdenv'.mkDerivation rec { src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; - rev = "${version}"; + rev = version; sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm"; }; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index a0ea67133c6f..b356f809f03c 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -100,11 +100,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.238"; + version = "32.0.0.255"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0jqx68lfqjpy6wbxdi0giclvh9mc9rha92hqdj1nx42v95k3gc65"; + sha256 = "1rqb54kqxq66vvqk5yrr3rsy3wcj9r9wnkngk27c7jayzm6bwgvv"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 772ca926cd75..fb3a6723817b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.238"; + version = "32.0.0.255"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1f5i64nzkvxy20vi7kldaamwp6pi2zgmjiw061cgqrwf7hj45wkg" + "1hd5z8qmki36k2wdwgg3v4sj32g8590r5563gdrjrk7bmrqfjnji" else - "09jvxqp83hpk89ak8flq14s3s3nhy3ary91jc6k47v325axh1cl9" + "0y13bxdgkxaqsyab09skiqj8dfjw76n2lr7p525ba8lbfbc8xj52" else if arch == "x86_64" then - "05gvssjdz43pvgivdngrf8qr5b30p45hr2sr97cyl6b87581qw9s" + "0qkslkaiw3c9xk1rjcl4x9d0fi6i91k7g01mf0gq28wgzcyz4cw7" else - "06l7zhgh5rfxxw46b500zdgcqsk2h7kivng5b0b74s3vy7f0g270"; + "0qblmaa3nq1g7825yhvz98pvd1591q3q7bsrhv5bbhdbmb9c1qd5"; }; nativeBuildInputs = [ unzip ]; @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; license = stdenv.lib.licenses.unfree; - maintainers = []; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index c603dc6cf9f0..527eb2610067 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.238"; + version = "32.0.0.255"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1vhfjpwsmg96irfvz81ldzn2m4qcjnql5psg4cifjay423yxabvy" + "1igc23mljmw1bw6fwx3rwpz7kxiy8n5znkng20w3yin2zh8qw8sy" else - "0am95xi2jasvxj5b2i12wzpvl3bvxli537k1i04698cg0na6x0y0"; + "0rfvgx1g0s8wswwpmfjx6p59yh1cxya3x3bczbissrq4rcb1v315"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 05eafb48e721..1f441b4e9615 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -47,7 +47,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pyyaml pyqt5 pyqtwebengine jinja2 pygments - pypeg2 cssutils pyopengl attrs + pypeg2 cssutils pyopengl attrs setuptools # scripts and userscripts libs tldextract beautifulsoup4 pyreadability pykeepass stem diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c0cb85eb1777..739315917d43 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.5.4"; + version = "8.5.5"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z"; + sha256 = "00r5k9bbfpv3s6shxqypl13psr1zz51xiyz3vmm4flhr2qa4ycsz"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1b34skl3hwvpy0r4l5ykgnnwhbz7cvly2gi9ib4h7lijjfafiys1"; + sha256 = "1nxvw5kiggfr4n5an436ass84cvwjviaa894kfm72yf2ls149f29"; }; }; in diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 4495fc095796..3383d6838f7b 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "online-net"; repo = "c14-cli"; - rev = "${version}"; + rev = version; sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; }; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index b32862bb4d67..f0edbdf3ed68 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - version = "2.14.2"; + version = "2.14.3"; pname = "helm"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "0hxfyfpmhgr5jilp2xm9d5vxiq5fcgqm2hh4g4izcgiz9bz7b6k0"; + sha256 = "18ly31db2kxybjlisz8dfz3cdxs7j2wsh4rx5lwhbm5hpp42h17d"; }; goPackagePath = "k8s.io/helm"; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 7938265d1b8d..4de0c3fbd7b6 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "xetys"; repo = "hetzner-kube"; - rev = "${version}"; + rev = version; sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0"; }; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index e38dc355d246..359b289dbbcd 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kontemplate"; - version = "1.7.0"; + version = "1.8.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "tazjin"; repo = "kontemplate"; rev = "v${version}"; - sha256 = "0vzircajhrfq1nykwpl52cqgzyhy51w4ff7ldpgi95w3a4fz1hzz"; + sha256 = "123mjmmm4hynraq1fpn3j5i0a1i87l265kkjraxxxbl0zacv74i1"; }; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix index f0a52f5266ef..7693968bd550 100644 --- a/pkgs/applications/networking/cluster/kontemplate/deps.nix +++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix @@ -1,111 +1,111 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { - goPackagePath = "github.com/Masterminds/semver"; + goPackagePath = "github.com/Masterminds/goutils"; fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "c84ddcca87bf5a941b138dde832a7e20b0159ad8"; - sha256 = "1dcfdr018a0yszjpvr3wshvq9cc3kvy95l55si556p617wsn1wan"; + type = "git"; + url = "https://github.com/Masterminds/goutils"; + rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; }; } { - goPackagePath = "github.com/Masterminds/sprig"; + goPackagePath = "github.com/Masterminds/semver"; fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "77bb58b7f5e10889a1195c21b9e7a96ee166f199"; - sha256 = "0q4g12f3nvda1skz33qzbbdd2vj3gjfwf361hyzlx20s71brk3bk"; + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "5bc3b9184d48f1412b300b87a200cf020d9254cf"; + sha256 = "1vdfm653v50jf63cw0kg2hslx50cn4mk6lj3p51bi11jrg48kfng"; }; } { - goPackagePath = "github.com/alecthomas/template"; + goPackagePath = "github.com/Masterminds/sprig"; fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "6f509977777c33eae63b2136d97f7b976cb971cc"; + sha256 = "05h9k6fhjxnpwlihj3z02q9kvqvnq53jix0ab84sx0666bci3cdh"; }; } { - goPackagePath = "github.com/alecthomas/units"; + goPackagePath = "github.com/alecthomas/template"; fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; }; } { - goPackagePath = "github.com/aokoli/goutils"; + goPackagePath = "github.com/alecthomas/units"; fetch = { - type = "git"; - url = "https://github.com/aokoli/goutils"; - rev = "3391d3790d23d03408670993e957e8f408993c34"; - sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n"; + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "c3de453c63f4bdb4dadffab9805ec00426c505f7"; + sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; }; } { goPackagePath = "github.com/ghodss/yaml"; fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "e9ed3c6dfb39bb1a32197cb10d527906fe4da4b6"; - sha256 = "07cf0j3wbsl1gmn175mdgljcarfz4xbqd6pgc7b08a5lcn7zwhjz"; + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"; + sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; }; } { goPackagePath = "github.com/google/uuid"; fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "dec09d789f3dba190787f8b4454c7d3c936fed9e"; - sha256 = "1hc4w67p6zkh2qk7wm1yrl69jjrjjk615mly5ll4iidn1m4mzi4i"; + type = "git"; + url = "https://github.com/google/uuid"; + rev = "c2e93f3ae59f2904160ceaab466009f965df46d6"; + sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h"; }; } { goPackagePath = "github.com/huandu/xstrings"; fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "7bb0250b58e5c15670406e6f93ffda43281305b1"; - sha256 = "1fc8q65xvsxpa12p8hcjqap2pf72zqlwpm165js9kwbgm2sf977c"; + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d"; + sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx"; }; } { goPackagePath = "github.com/imdario/mergo"; fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d"; + sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9"; }; } { goPackagePath = "golang.org/x/crypto"; fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; - sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "9756ffdc24725223350eb3266ffb92590d28f278"; + sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; }; } { goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index d665693439f0..cbe32e57f20d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { patchShebangs ./hack ''; - WHAT="${concatStringsSep " " components}"; + WHAT=concatStringsSep " " components; postBuild = '' ./hack/update-generated-docs.sh diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index ab8b7deae72d..dcda18f18be6 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; - rev = "${version}"; + rev = version; sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr"; }; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 0ffc7a1fb6f0..1ad30335b94d 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -61,6 +61,9 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ pythonProtobuf ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=class-memaccess"; + preConfigure = '' # https://issues.apache.org/jira/browse/MESOS-6616 configureFlagsArray+=( diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index de683b26484c..ce6c5424fba1 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -10,7 +10,7 @@ buildGoPackage rec { goPackagePath = "github.com/heptio/sonobuoy"; buildFlagsArray = - let t = "${goPackagePath}"; + let t = goPackagePath; in '' -ldflags= -s -X ${t}/pkg/buildinfo.Version=${version} diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 8e9e6691a79e..144d46043ffe 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "wercker"; repo = "stern"; - rev = "${version}"; + rev = version; sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n"; }; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 67346d45b9f4..89eef9cae4c4 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,15 +4,13 @@ with pythonPackages; buildPythonApplication rec { 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 - # to the online r2e.1 + version = "3.10"; propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5"; + sha256 = "1yjgbgpq9jjmpywwk6n4lzb2k7mqgdgfgm4jckv4zy0fn595pih1"; }; outputs = [ "out" "man" "doc" ]; @@ -30,14 +28,12 @@ buildPythonApplication rec { # copy documentation mkdir -p $doc/share/doc/rss2email - cp AUTHORS COPYING CHANGELOG README $doc/share/doc/rss2email/ + cp AUTHORS COPYING CHANGELOG README.rst $doc/share/doc/rss2email/ ''; - # The tests currently fail, see - # https://github.com/rss2email/rss2email/issues/14 - # postCheck = '' - # env PYTHONPATH=.:$PYTHONPATH python ./test/test.py - # ''; + postCheck = '' + env PATH=$out/bin:$PATH python ./test/test.py + ''; meta = with lib; { description = "A tool that converts RSS/Atom newsfeeds to email."; diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index f16b6337d71a..4a4c93128dfe 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "gdrive"; version = "2.1.0"; - rev = "${version}"; + rev = version; goPackagePath = "github.com/prasmussen/gdrive"; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index c5cf7a7c2ee9..1d2756de7e69 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.21"; - previewVersion = "2.2.0rc4"; + previewVersion = "2.2.0rc5"; 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 = "14fzjaanaxya97wrya2lybxz6qv72fk4ws8i92zvjz4jkvjdk9n3"; + sha256Hash = "0x4sp6yjnvzpk8cxdqlf51njckmvvkijdb7rvcb4hvqq1ab6gb2x"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "03s2kq5f8whk14rhprg9yp3918641b1cwj6djcbjw8xpz0n3w022"; + sha256Hash = "0inj6fac0683s1sxaba3ljia90cfach0y42xylzgzza36wpyqpqg"; }; } diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 8de098b85e78..e6e589944737 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation { - name = "dino-unstable-2019-03-07"; + name = "dino-unstable-2019-09-12"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "ff6caf241c4d57d3ef124a8b7c3144a09f320ea0"; - sha256 = "1gjxfnywlypi3slvxb91b2mycrsqjinmafnkkngahyikr7gmqgnf"; + rev = "c8f2b80978706c4c53deb7ddfb8188c751bcb291"; + sha256 = "17lc6xiarb174g1hgjfh1yjrr0l2nzc3kba8xp5niwakbx7qicqr"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 67d5e56a021f..09273b7caa50 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; }; diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index ff260c9161b8..3b3b0c2fd661 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "oysttyer"; repo = "oysttyer"; - rev = "${version}"; + rev = version; sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index bb51adfbfee0..3555e5a7197b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/dreadatour/pidgin-mra"; - rev = "${version}"; + rev = version; sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index 9f73dba2d99d..a2e59f0c0ff2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchhg { url = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; - rev = "${version}"; + rev = version; sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index df2665d8ce8f..ef298883b1b4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : let - version = "1.3.0"; + version = "1.3.1"; in stdenv.mkDerivation rec { pname = "telegram-purple"; @@ -9,10 +9,12 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/majn/telegram-purple"; - rev = "0340e4f14b2480782db4e5b9242103810227c522"; - sha256 = "1xb7hrgisbpx00dsrm5yz934bdd7nfzicd7k855iynk3hjzqj7k5"; + rev = "v${version}"; + sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin libwebp libgcrypt gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index bd88962c40df..02be3c24e512 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; - rev = "${version}"; + rev = version; sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z"; }; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index b77407bd0c83..16fb1bbab1ed 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; - rev = "${version}"; + rev = version; sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q"; }; diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index 58cc7a220b92..903d8e60d6d5 100644 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - rev = "e2a6a9cd9da70175881ab991220c86aa87179509"; - version = "2019-07-26"; + rev = "f760176c6e133667ce73aeecba8b0c0eb8822941"; + version = "2019-09-11"; pname = "slack-theme-black"; src = fetchgit { inherit rev; url = "https://github.com/laCour/slack-night-mode"; - sha256 = "1jwxy63qzgvr83idsgcg7yhm9kn0ybfji1m964c5c6ypzcm7j10v"; + sha256 = "1kx8nx7mhrabs5wxqgvy86s5smy5hw49gv6yc95yxwx6ymwpgbzj"; }; dontUnpack = true; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 020fdb2fb2c4..26b858aa3b86 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -8,7 +8,7 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.8.4"; + version = "1.8.8"; # Note: Due to our strong dependency on the Arch patches it's probably best # to also wait for the Arch update (especially if the patches don't apply). @@ -17,7 +17,7 @@ mkDerivation rec { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1q6y05kb6jjarb690qq28fqkv6kfkxdmfx0va1qi7aqxlhd5rvyl"; + sha256 = "1aj1pnzc6bz8jbdrfwdj2r54jhw9z7b5fd1095r007zmlnzs51lv"; fetchSubmodules = true; }; @@ -25,8 +25,8 @@ mkDerivation rec { archPatches = fetchsvn { url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - rev = "498563"; - sha256 = "0g2y6impygqhfiqnyxc1ivxwl8j82q9qcnkqcjn6mwj3cisyxwnl"; + rev = "509240"; + sha256 = "1sf4mspbsqsnjzp9ys9l0asrx1bhj273d163i2bv1zhl4mmgpl3k"; }; privateHeadersPatch = fetchpatch { url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch"; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index af253a5e03f9..869dcb9d29bd 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -18,13 +18,13 @@ let pname = "wire-desktop"; version = { - "x86_64-linux" = "3.10.2904"; - "x86_64-darwin" = "3.10.3133"; + x86_64-linux = "3.10.2904"; + x86_64-darwin = "3.10.3133"; }.${system} or throwSystem; sha256 = { - "x86_64-linux" = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn"; - "x86_64-darwin" = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9"; + x86_64-linux = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn"; + x86_64-darwin = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b9791cbfbac1..933badccf631 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/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.287250.0828"; + version = "3.0.291715.0908"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0k4h43wydbcyx7b7gwxkmvbph8qc6kjpcypd7vwz8rph1l7kl1y1"; + sha256 = "1f2fcwf0p86bxcnfdhij6hvgizd7n7gjcccwzdm2jv0dbqskad2f"; }; }; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 54943533b85f..db325cf13877 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "ipfs"; - version = "0.4.21"; + version = "0.4.22"; rev = "v${version}"; - goPackagePath = "github.com/ipfs/go-ipfs"; - src = fetchFromGitHub { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "0jlj89vjy4nw3x3j45r16y8bph5ss5lp907pjgqvad0naxbf99b0"; + sha256 = "1drwkam2m1qdny51l7ja9vd33jffy8w0z0wbp28ajx4glp0kyra2"; }; - modSha256 = "0d9rq0hig9jwv9jfajfyj2111arikqzdnyhf5aqkwahcblpx54iy"; + modSha256 = "0jbzkifn88myk2vpd390clyl835978vpcfz912y8cnl26s6q677n"; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 0792aefe25f5..249fdc958c80 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" "-Wno-error=format-truncation" ]; meta = { description = "An IRC proxy (bouncer)"; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index b37e0b00ce76..89231939bfbc 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mailpile"; repo = "Mailpile"; - rev = "${version}"; + rev = version; sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj"; }; diff --git a/pkgs/applications/networking/mailreaders/sup/.bundix/cache b/pkgs/applications/networking/mailreaders/sup/.bundix/cache deleted file mode 100644 index 5894e96022c8..000000000000 --- a/pkgs/applications/networking/mailreaders/sup/.bundix/cache +++ /dev/null @@ -1,4 +0,0 @@ ---- -gem: - https://rubygems.org/downloads/mini_portile-0.6.0.gem: 09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn - https://rubygems.org/downloads/gpgme-2.0.7.gem: 1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile b/pkgs/applications/networking/mailreaders/sup/Gemfile deleted file mode 100644 index bc37456ae58e..000000000000 --- a/pkgs/applications/networking/mailreaders/sup/Gemfile +++ /dev/null @@ -1,9 +0,0 @@ -source "https://rubygems.org" - -gem 'rake' -gem 'sup' -gem 'gpgme' - -# Sup tries to `xapian-ruby` in its extconf instead of listing it as a -# dependency. -gem 'xapian-ruby', "~> 1.2.22" diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock deleted file mode 100644 index bd0f051c104d..000000000000 --- a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock +++ /dev/null @@ -1,41 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - chronic (0.9.1) - gpgme (2.0.18) - mini_portile2 (~> 2.3) - highline (2.0.2) - locale (2.1.2) - lockfile (2.1.3) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) - mini_portile2 (2.4.0) - ncursesw (1.4.10) - rake (12.3.2) - rmail-sup (1.0.1) - sup (0.22.1) - chronic (~> 0.9.1) - highline - locale (~> 2.0) - lockfile - mime-types (> 2.0) - ncursesw (~> 1.4.0) - rmail-sup (~> 1.0.1) - trollop (>= 1.12) - unicode (~> 0.4.4) - trollop (2.9.9) - unicode (0.4.4.4) - xapian-ruby (1.2.22) - -PLATFORMS - ruby - -DEPENDENCIES - gpgme - rake - sup - xapian-ruby (~> 1.2.22) - -BUNDLED WITH - 1.17.2 diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix deleted file mode 100644 index ccd092ba63cc..000000000000 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, bundlerApp, bundlerUpdateScript }: - -bundlerApp { - pname = "sup"; - gemdir = ./.; - exes = [ - "sup" - "sup-add" - "sup-config" - "sup-dump" - "sup-import-dump" - "sup-psych-ify-config-files" - "sup-recover-sources" - "sup-sync" - "sup-sync-back-maildir" - "sup-tweak-labels" - ]; - - passthru.updateScript = bundlerUpdateScript "sup"; - - meta = with lib; { - description = "A curses threads-with-tags style email client"; - homepage = http://sup-heliotrope.github.io; - license = licenses.gpl2; - maintainers = with maintainers; [ cstrahan lovek323 manveru nicknovitski ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/mailreaders/sup/gemset.nix b/pkgs/applications/networking/mailreaders/sup/gemset.nix deleted file mode 100644 index 023374932cb2..000000000000 --- a/pkgs/applications/networking/mailreaders/sup/gemset.nix +++ /dev/null @@ -1,155 +0,0 @@ -{ - chronic = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk"; - type = "gem"; - }; - version = "0.9.1"; - }; - gpgme = { - dependencies = ["mini_portile2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m"; - type = "gem"; - }; - version = "2.0.18"; - }; - highline = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g0zpalfj8wvca86hcnirir5py2zyqrhkgdgv9f87fxkjaw815wr"; - type = "gem"; - }; - version = "2.0.2"; - }; - locale = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; - type = "gem"; - }; - version = "2.1.2"; - }; - lockfile = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr"; - type = "gem"; - }; - version = "2.1.3"; - }; - mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; - type = "gem"; - }; - version = "3.2.2"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; - type = "gem"; - }; - version = "3.2019.0331"; - }; - mini_portile2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; - type = "gem"; - }; - version = "2.4.0"; - }; - ncursesw = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nc14wls1yiigz593vw7580hb99lf4n485axapiz6sqpg1jnlhcr"; - type = "gem"; - }; - version = "1.4.10"; - }; - rake = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; - type = "gem"; - }; - version = "12.3.2"; - }; - rmail-sup = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g"; - type = "gem"; - }; - version = "1.0.1"; - }; - sup = { - dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi"; - type = "gem"; - }; - version = "0.22.1"; - }; - trollop = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "074h7lns72kg1dl5gvz5apl3xz1i0axbnbc01pf2kbw4q0lkpnp4"; - type = "gem"; - }; - version = "2.9.9"; - }; - unicode = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk"; - type = "gem"; - }; - version = "0.4.4.4"; - }; - xapian-ruby = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15"; - type = "gem"; - }; - version = "1.2.22"; - }; -} \ No newline at end of file diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 776255e7a12c..42950f23a843 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "DanielAdolfsson"; repo = "ndppd"; - rev = "${version}"; + rev = version; sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0"; }; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 002f142a53ed..3a72ae8ce5f9 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; - rev = "${version}"; + rev = version; sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa"; }; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 6e3b8a7293e0..63218f1c2ffc 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python + libtorrentRasterbar.dev libtorrentRasterbar.python setuptools ]; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 6dd2fc343550..535991312f1d 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "ktorrent"; - version = "${libktorrent.mainVersion}.0"; + version = "${libktorrent.mainVersion}"; src = fetchurl { url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "18w6qh09k84qpzaxxb76a4g59k4mx5wk897vqp1wwv80g0pqhmrw"; + sha256 = "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534"; }; nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; @@ -22,24 +22,6 @@ stdenv.mkDerivation rec { libktorrent taglib libgcrypt kplotting ]; - patches = [ - # Fix build with CMake 3.11 - (fetchpatch { - url = "https://cgit.kde.org/ktorrent.git/patch/?id=672c5076de7e3a526d9bdbb484a69e9386bc49f8"; - sha256 = "1cn4rnbhadrsxqx50fawpd747azskavbjraygr6s11rh1wbfrxid"; - }) - - # Fix build against Qt 5.11 - (fetchpatch { - url = "https://cgit.kde.org/ktorrent.git/patch/?id=7876857d204188016a135a25938d9f8530fba4e8"; - sha256 = "1wnmfzkhf6y7fd0z2djwphs6i9lsg7fcrj8fqmbyi0j57dvl9gxl"; - }) - (fetchpatch { - url = "https://cgit.kde.org/ktorrent.git/patch/?id=36d112e56e56541d439326a267eb906da8b3ee60"; - sha256 = "1d41pqniljhwqs6awa644s6ks0zwm9sr0hpfygc63wyxnpcrsw2y"; - }) - ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index bcaea5eb6dcd..bec0507e4a58 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "transmission-remote-gtk"; repo = "transmission-remote-gtk"; - rev = "${version}"; + rev = version; sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk"; }; diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index 8d6d5e2a4f94..349c4f5e799e 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -11,7 +11,7 @@ let }; binary = appimageTools.wrapType2 { - name = "${pname}"; + name = pname; inherit src; }; # we only use this to extract the icon diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b5cfefd78209..f5f53e10496b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -279,7 +279,7 @@ in stdenv.mkDerivation rec { ''; configureFlags = [ - "${if withHelp then "" else "--without-help"}" + (if withHelp then "" else "--without-help") "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" "--with-beanshell-jar=${bsh}" diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 9f04cd83c10d..eb774a309416 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -279,7 +279,7 @@ in stdenv.mkDerivation rec { ''; configureFlags = [ - "${if withHelp then "" else "--without-help"}" + (if withHelp then "" else "--without-help") "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" "--with-beanshell-jar=${bsh}" diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index ce8910d76d45..08b01a4a051b 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -2,7 +2,7 @@ let jdk = libreoffice.jdk; in -(runCommand "${libreoffice.name}" { +(runCommand libreoffice.name { inherit dbus libreoffice jdk bash; } '' mkdir -p "$out/bin" diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 655a10d3a942..a7b0afe0754c 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation { ''; dontStrip = true; - dontPatchElf = true; + dontPatchELF = true; updateScript = import ./update.nix { inherit writeScript runtimeShell; }; diff --git a/pkgs/applications/office/paperless/withConfig.nix b/pkgs/applications/office/paperless/withConfig.nix index aafdfe67adb4..652d1478c0ca 100644 --- a/pkgs/applications/office/paperless/withConfig.nix +++ b/pkgs/applications/office/paperless/withConfig.nix @@ -39,7 +39,7 @@ let PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume"; PAPERLESS_MEDIADIR = "${dataDir}/media"; PAPERLESS_STATICDIR = "${dataDir}/static"; - PAPERLESS_DBDIR = "${dataDir}"; + PAPERLESS_DBDIR = dataDir; }) // config; envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 3e4ca0ae975f..199f17afda79 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { repo = "wordgrinder"; owner = "davidgiven"; - rev = "${version}"; + rev = version; sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal"; }; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 9b475b04511d..5f25402c3eb6 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; - rev = "${version}"; + rev = version; sha256 = "04ir7yg7psnnb48s1qfppvvx6lak4s8f6fqdg721y2kd9129jm82"; }; diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index f624359c1632..c0f189686ac9 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "EliasOenal"; repo = "multimon-ng"; - rev = "${version}"; + rev = version; sha256 = "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8"; }; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index a1c1f625bea1..a00ec6c47eb8 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "kantooon"; repo = "qradiolink"; - rev = "${version}"; + rev = version; sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi"; }; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index b3ff0f51f118..4b5c2c683444 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "${uhdVer}"; + rev = uhdVer; sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy"; }; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index d1a990a5eb28..834d2497e8df 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk, vtk }: stdenv.mkDerivation rec { _name = "ANTs"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q"; }; + patches = [ + # Fix build with gcc8 + (fetchpatch { + url = "https://github.com/ANTsX/ANTs/commit/89af9b2694715bf8204993e032fa132f80cf37bd.patch"; + sha256 = "1glkrwa1jmxxbmzihycxr576azjqby31jwpj165qc54c91pn0ams"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ itk vtk ]; diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index c9a9b55c31e6..e11f4ebf77c5 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -7,7 +7,7 @@ python27Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "eggnogdb"; repo = "eggnog-mapper"; - rev = "${version}"; + rev = version; sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv"; }; diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 7b482d82e2fa..1fc387fcc66d 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -13,8 +13,8 @@ let description = "A Python-enhanced molecular graphics tool"; desktopItem = makeDesktopItem { - name = "${pname}"; - exec = "${pname}"; + name = pname; + exec = pname; desktopName = "PyMol Molecular Graphics System"; genericName = "Molecular Modeler"; comment = description; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 6f0d8e51448f..3d169f501043 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "KiCad"; repo = "kicad-${name}"; - rev = "${version}"; + rev = version; inherit sha256 name; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix index 85e35736d030..0899c93602b9 100644 --- a/pkgs/applications/science/math/sage/flask-oldsessions.nix +++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mitsuhiko"; repo = "flask-oldsessions"; - rev = "${version}"; + rev = version; sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn"; }; diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix index f5cb39603c32..092a340bb5b5 100644 --- a/pkgs/applications/science/math/sage/pybrial.nix +++ b/pkgs/applications/science/math/sage/pybrial.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; - rev = "${version}"; + rev = version; sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg"; }; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index d6e3f05e0e13..610d7494ed80 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; let - optionOnOff = option: "${if option then "on" else "off"}"; + optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 83f8b88ba318..234bbdab3158 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; - rev = "${version}"; + rev = version; sha256 = "1dlifm9wm1jcw2zwal3fnzzl41ng08c7v48w6hx2mz84zljg1nsj"; }; diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index ecbf0c703f19..fe5f8790f38f 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "ArduPilot"; repo = "apm_planner"; - rev = "${version}"; + rev = version; sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd"; }; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index b73825737dff..477b628c4d7b 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "ghq"; version = "0.12.6"; - goPackagePath = "github.com/motemen/ghq"; - src = fetchFromGitHub { owner = "motemen"; repo = "ghq"; @@ -13,7 +11,7 @@ buildGoPackage rec { sha256 = "14rm7fvphr7r9x0ys10vhzjwhfhhscgr574n1i1z4lzw551lrnp4"; }; - goDeps = ./deps.nix; + modSha256 = "1y2v8ir7kc2avgri06nagfyaxqr3xrg4g5pxl9rwzq9dyzm6ci5z"; buildFlagsArray = '' -ldflags= @@ -21,9 +19,17 @@ buildGoPackage rec { ''; postInstall = '' - install -m 444 -D ${src}/zsh/_ghq $bin/share/zsh/site-functions/_ghq + install -m 444 -D ${src}/zsh/_ghq $out/share/zsh/site-functions/_ghq ''; + patches = [ + (fetchpatch { + # remove once the commit lands in a release. + url = "https://github.com/motemen/ghq/commit/38ac89e60e60182b5870108f9753c9fe8d00e4a6.patch"; + sha256 = "1z8yvzmka3sh44my6jnwc39p8zs7mczxgvwc9z0pkqk4vgvaj8gj"; + }) + ]; + meta = { description = "Remote repository management made easy"; homepage = https://github.com/motemen/ghq; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix deleted file mode 100644 index dde1b19b4c3b..000000000000 --- a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix +++ /dev/null @@ -1,138 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/Songmu/gitconfig"; - fetch = { - type = "git"; - url = "https://github.com/Songmu/gitconfig"; - rev = "v0.0.2"; - sha256 = "0w1xd1mzxzwh755l6lgpn6psjp959kvx89l39zhc8lag9jh7rc44"; - }; - } - { - goPackagePath = "github.com/daviddengcn/go-colortext"; - fetch = { - type = "git"; - url = "https://github.com/daviddengcn/go-colortext"; - rev = "186a3d44e920"; - sha256 = "18piv4zzcb8abbc7fllz9p6rd4zhsy1gc6iygym381caggmmgxgk"; - }; - } - { - goPackagePath = "github.com/golangplus/bytes"; - fetch = { - type = "git"; - url = "https://github.com/golangplus/bytes"; - rev = "45c989fe5450"; - sha256 = "1fpwg1idakpbvkmk8j8yyhv9g7mhr9c922kvff6kj4br4k05zyzr"; - }; - } - { - goPackagePath = "github.com/golangplus/fmt"; - fetch = { - type = "git"; - url = "https://github.com/golangplus/fmt"; - rev = "2a5d6d7d2995"; - sha256 = "1242q05qnawhv0klzy1pbq63q8jxkms5hc7421992hzq2m40k5yn"; - }; - } - { - goPackagePath = "github.com/golangplus/testing"; - fetch = { - type = "git"; - url = "https://github.com/golangplus/testing"; - rev = "af21d9c3145e"; - sha256 = "1g83sjvcavqbh92vyirc48mrqd18yfci08zya0hrgk840cr94czc"; - }; - } - { - goPackagePath = "github.com/motemen/go-colorine"; - fetch = { - type = "git"; - url = "https://github.com/motemen/go-colorine"; - rev = "45d19169413a"; - sha256 = "1mdy6q0926s1frj027nlzlvm2qssmkpjis7ic3l2smajkzh07118"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "3ec191127204"; - sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "3ee3066db522"; - sha256 = "12xyaa116bq9zy25fwk7zzi83v8aab9lm91pqg0c3jrfkjdbr255"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 6945e24ee46b..545fc77168e9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -21,8 +21,8 @@ in buildPythonApplication rec { doCheck = false; postFixup = '' - wrapQtApp bin/git-cola - wrapQtApp bin/git-dag + wrapQtApp $out/bin/git-cola + wrapQtApp $out/bin/git-dag ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index c1a40b12cdea..1da8f2a4a5ed 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "git-secrets"; - rev = "${version}"; + rev = version; sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7"; }; diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index afd90ba49690..b6659b5f539f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -18,7 +18,7 @@ in buildEnv { name = "gitweb-${stdenv.lib.getVersion git}"; ignoreCollisions = true; - paths = stdenv.lib.optional gitwebTheme "${gitwebThemeSrc}" + paths = stdenv.lib.optional gitwebTheme gitwebThemeSrc ++ [ "${git}/share/gitweb" ]; meta = git.meta // { diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index d0d60b193437..5c4ece7c9e51 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -7,7 +7,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; - rev = "${version}"; + rev = version; sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap"; }; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 3a7f8632d2cc..c48f455a64a3 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) - PBR_VERSION = "${version}"; + PBR_VERSION = version; src = fetchFromGitHub { owner = "openstack-infra"; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 35ac8a18c451..fb18fb7941e6 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -7,7 +7,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; inherit ruby; - gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}"; + gemdir = ./rubyEnv- + (if gitlabEnterprise then "ee" else "ce"); gemset = let x = import (gemdir + "/gemset.nix"); in x // { diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 8b68dddfceb4..ea34617dc8b1 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "buildinspace"; repo = "peru"; - rev = "${version}"; + rev = version; sha256 = "0p4j51m89glx12cd65lcnbwpvin0v49wkhrx06755skr7v37pm2a"; }; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index aed5cb807dc7..66b785e43b17 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; - rev = "${version}"; + rev = version; sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6"; }; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index dad52ccb9a7c..1900bf3634ce 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -487,7 +487,7 @@ let self = rec { src = fetchFromGitHub { owner = "peak3d"; repo = "inputstream.adaptive"; - rev = "${version}"; + rev = version; sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index cdcdea3dd26d..5e7cf9353b25 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -42,7 +42,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; - rev = "${version}"; + rev = version; sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz"; }; diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index b7c8e6feeba4..95f89e0eda5a 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { [ imagemagick ffmpeg swig python3 unittest-cpp cppzmq czmqpp qtbase qtmultimedia ]; - LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}"; + LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; doCheck = false; diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index f0c3776a4336..cd6416032da2 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchbzr, python3, rtmpdump, makeWrapper }: +{ mkDerivation, lib, fetchbzr, python3, rtmpdump }: let - pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]); -in stdenv.mkDerivation { + pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]); +in mkDerivation { name = "qarte-4.6.0"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4; @@ -10,28 +10,33 @@ in stdenv.mkDerivation { sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn"; }; - buildInputs = [ makeWrapper pythonEnv ]; + buildInputs = [ pythonEnv ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mv qarte $out/bin/ substituteInPlace $out/bin/qarte \ --replace '/usr/share' "$out/share" - wrapProgram $out/bin/qarte \ - --prefix PATH : "${rtmpdump}/bin" mkdir -p $out/share/man/man1/ mv qarte.1 $out/share/man/man1/ mkdir -p $out/share/qarte mv * $out/share/qarte/ + runHook postInstall + ''; + + postFixup = '' + wrapQtApp $out/bin/qarte \ + --prefix PATH : ${rtmpdump}/bin ''; meta = { homepage = https://launchpad.net/qarte; description = "A recorder for Arte TV Guide and Arte Concert"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ vbgl ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index a5efddc9f1a8..e33610ac4163 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; - rev = "${version}"; + rev = version; sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33"; }; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix new file mode 100644 index 000000000000..7dddc3b533b4 --- /dev/null +++ b/pkgs/applications/virtualization/crun/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, go-md2man, pkgconfig +, libcap, libseccomp, python3, systemd, yajl }: + +stdenv.mkDerivation rec { + pname = "crun"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = version; + sha256 = "1anvlgw373031w0pp0b28l10yrnyhbj192n60bbbjahw487dk2fi"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ autoreconfHook go-md2man pkgconfig python3 ]; + + buildInputs = [ libcap libseccomp systemd yajl ]; + + enableParallelBuilding = true; + + # the tests require additional permissions + doCheck = false; + + meta = with lib; { + description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; + license = licenses.gpl3; + platforms = platforms.linux; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 72b885b79e7d..027404439cd5 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -201,9 +201,9 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_09 = makeOverridable dockerGen { - version = "18.09.8"; - rev = "0dd43dd87fd530113bf44c9bba9ad8b20ce4637f"; - sha256 = "07ljxdqylbfbq1939hqyaav966ga7ds5b38dn7af1h0aks86y2s3"; + version = "18.09.9"; + rev = "039a7df9ba8097dd987370782fcdd6ea79b26016"; + sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; @@ -213,9 +213,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.1"; - rev = "74b1e89e8ac68948be88fe0aa1e2767ae28659fe"; - sha256 = "1m7bq7la29d8piwiq5whzcyrm7g3lv497wnri0lh6gxi10nwv06h"; + version = "19.03.2"; + rev = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"; + sha256 = "0bghqwxlx4v06bwcv3c2wizbihhf983gvypx5sjcbgmiyd3bgb47"; runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index d64baca2cc7e..5aa1f2e1f553 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.1.0"; name = "qemu-" + stdenv.lib.optionalString xenSupport "xen-" + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-" @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd"; + sha256 = "1bpl6hwiw1jdxk4xmqp10qgki0dji0l2rzr10dyhyk8d85vxxw29"; }; nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ]; @@ -78,11 +78,6 @@ stdenv.mkDerivation rec { ./no-etc-install.patch ./fix-qemu-ga.patch ./9p-ignore-noatime.patch - (fetchpatch { - url = "https://git.qemu.org/?p=qemu.git;a=patch;h=d52680fc932efb8a2f334cc6993e705ed1e31e99"; - name = "CVE-2019-12155.patch"; - sha256 = "0h2q71mcz3gvlrbfkqcgla74jdg73hvzcrwr4max2ckpxx8x9207"; - }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 37c12ddbfeb7..57e190f5ae79 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,25 +1,13 @@ -From 98b3e5993bbdb0013b6cc1814e0ad9555290c3af Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 23 Apr 2019 21:31:45 -0500 -Subject: [PATCH] no install localstatedir - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/Makefile b/Makefile -index 04a0d45050..5dc82d0eb7 100644 +index 85862fb8..ed52c5ec 100644 --- a/Makefile +++ b/Makefile -@@ -786,7 +786,7 @@ endif +@@ -841,7 +841,7 @@ endif ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 --install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir -+install: all $(if $(BUILD_DOCS),install-doc) install-datadir +-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \ ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir \ + $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ + recurse-install ifneq ($(TOOLS),) - $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) - endif --- -2.21.GIT - diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 5a98e71c9166..5b2b33d6adf3 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -11,7 +11,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; - rev = "${version}"; + rev = version; sha256 = "1z2kq88lljvr24z1kizvg3h7ckf545h4kjhhrjggkr0w4wjjwr43"; }; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 574e42cc8481..661ca013e240 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; - rev = "${version}"; + rev = version; sha256 = "0ji7m2npkdg27gm33b19rxr50km0gm1h9czi1f425vxq65mlkl4y"; }; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index b39585092edd..69b2e6ceb50f 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/stumpwm/stumpwm"; - rev = "${versionSpec.rev}"; - sha256 = "${versionSpec.sha256}"; + rev = versionSpec.rev; + sha256 = versionSpec.sha256; }; # NOTE: The patch needs an update for the next release. |