diff options
Diffstat (limited to 'pkgs/applications')
76 files changed, 957 insertions, 466 deletions
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index c28754e471a9..47945de78330 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -32,10 +32,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q"; + cargoSha256 = "1dlbdxsf9p2jzrsclm43k95y8m3zcd41qd9ajg1ii3fpnahi58kd"; nativeBuildInputs = [ meson diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 7f86e2c20716..bc508f92e3b5 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; + # Somehow this does not get set automatically + cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ]; + meta = with stdenv.lib; { description = "Music tracker application, similar to Fasttracker II"; homepage = http://milkytracker.org; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index b40ab6d4f7a5..d6cf17c159f4 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.2.3"; + version = "2.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16"; + sha256 = "0msdnp6wh97lnm3m084jsvbp95h5d35y5fm71j64cgf4g39zp5ds"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 6164c1cfe933..d1c981de2d5d 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,21 +2,23 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, redland -, qmake, rubberband, serd, sord, vampSDK, fftwFloat +, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland +, rubberband, serd, sord, vampSDK, fftwFloat +, capnproto, liboggz, libfishsound, libid3tag, opusfile +, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "sonic-visualiser"; - version = "2.4.1"; + version = "4.0.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz"; - sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz"; + sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6"; }; buildInputs = - [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband + [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord @@ -26,23 +28,22 @@ stdenv.mkDerivation rec { libpulseaudio libmad libogg # ? - # fishsound + libfishsound liblo libX11 + capnproto + liboggz + libid3tag + opusfile ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; - configurePhase = '' - for i in sonic-visualiser svapp svcore svgui; - do cd $i && qmake PREFIX=$out && cd ..; - done - ''; + enableParallelBuilding = true; - installPhase = '' - mkdir -p $out/{bin,share/sonic-visualiser} - cp sonic-visualiser $out/bin/ - cp -r samples $out/share/sonic-visualiser/ + # comment out the tests + preConfigure = '' + sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro ''; meta = with stdenv.lib; { @@ -51,6 +52,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index a6af8c5208e5..db54055def40 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -11,13 +11,11 @@ rustPlatform.buildRustPackage rec { sha256 = "06xqj83m4hz00p8796m0df7lv9875p8zc1v6l9yqbiak1h95lq7h"; }; - legacyCargoFetcher = false; - cargoSha256 = "1pc4n6lm1w0660ivm0kxzicpckvb351y62dpv0cxa7ckd3raa5pr"; nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isLinux libxcb + ++ stdenv.lib.optional stdenv.isLinux libxcb ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index e61a2879d474..263fe986df31 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -15,8 +15,6 @@ rustPlatform.buildRustPackage rec { sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8"; }; - legacyCargoFetcher = false; - cargoSha256 = "0200apqbx769ggjnjr0m72g61ikhml2xak5n1il2pvfx1yf5nw0n"; cargoBuildFlags = [ diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index f6c9fee7a1c5..0add60cc19e4 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "053e43bbe71564e9be8b2b56346a88986646ef6849a0af67cece01858b93306a"; + sha256 = "079d3yx7yr7qrilqgaayvn18lxl8h6a1gwwbsgm5xsyxj4vdlz7r"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index fd18b3fa3997..dd45746c8df5 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.8.1-beta"; + version = "0.9.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0f9fx2y66l3wxiax2vl2966avamjarkv3vbn9dy0wbxkwg4pfayb"; + sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9"; }; - modSha256 = "1i6xw2amkg4azvzybcl4pqxif9c0mv8ayrhz9hm8x85bz7i6a787"; + modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; meta = with lib; { description = "Lightning Network Daemon"; diff --git a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch new file mode 100644 index 000000000000..94c70da276c9 --- /dev/null +++ b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch @@ -0,0 +1,8 @@ +diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt +index 4909ff1..02fa145 100644 +--- a/src/she/CMakeLists.txt ++++ b/src/she/CMakeLists.txt +@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND) + add_definitions(-DUSE_MOUSE_POLLER) ++ add_definitions(-DALLEGRO_NO_FIX_ALIASES) + endif() diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 170fde7b9caf..6e6d7db81770 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -6,12 +6,16 @@ , cmark }: +# Unfree version is not redistributable: +# https://dev.aseprite.org/2016/09/01/new-source-code-license/ +# Consider supporting the developer: https://aseprite.org/#buy + let skia = callPackage ./skia.nix {}; in stdenv.mkDerivation rec { pname = "aseprite"; - version = if unfree then "1.2.11" else "1.1.7"; + version = if unfree then "1.2.16.3" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,7 +23,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "1illr51jpg5g6nx29rav9dllyy5lzyyn7lj2fhrnpz1ysqgaq5p8" + then "16yn7y9xdc5jd50cq7bmsm320gv23pp71lr8hg2nmynzc8ibyda8" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; @@ -36,7 +40,9 @@ stdenv.mkDerivation rec { skia libGL ]; - patches = lib.optionals unfree [ + patches = if !unfree then [ + ./allegro-glibc-2.30.patch + ] else [ (fetchpatch { url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix index 8bf2adf484e2..c89ebd4ad0c1 100644 --- a/pkgs/applications/editors/aseprite/skia.nix +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja -, fontconfig, expat, icu58, libjpeg, libpng, libwebp, zlib +, fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib , mesa, libX11 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ python2 gn ninja ]; buildInputs = [ - fontconfig expat icu58 libjpeg libpng libwebp zlib + fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib mesa libX11 ]; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 91f048320a72..48cd58570f8a 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -12,7 +12,6 @@ rustPlatform.buildRustPackage { }; cargoSha256 = "06ghcd4j751mdkzwb88nqwk8la4zdb137y0iqrkpykkfx0as43x3"; - legacyCargoFetcher = false; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 485f1d0dca3d..e5ee1da75801 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.0013"; + version = "8.2.0227"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "00sc9zdjdww6f3svwf0nxpx8q2zp1n1r978h7ijapgvn2ysx2z1f"; + sha256 = "1yi7l2yd214iv6i8pr52m272mlzps5v3h6xdgr1770xfz4y1yc0h"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index b6861a9023f8..cd3e5676e8c7 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,15 +11,15 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1bb7icdjzprrsxllx2q478m1p3qf5sbs3rs3bavvb3hzyyf4bifn"; - x86_64-darwin = "1hqpfmp5s135kb9777s96sr0zbls002h1980qbgf7r2hmc0mpnx0"; + x86_64-linux = "0c067qp3aa5kqya3y8pzc9cvyzsafizhgjp9dsibnfl08lvz9hbs"; + x86_64-darwin = "0vi94nk8p3vp30nx60mwqcmfqbrmrqwvfdjbah0zm480dcjzz7dv"; }.${system}; in callPackage ./generic.nix rec { # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.42.0"; + version = "1.42.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index d4676d421d0e..eafe1718c2fe 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 = "0f6ic24w6s9wfirzk5rvysn96gj1naj6b81al9743mllaf32ad5q"; - x86_64-darwin = "0fgyhb2wxkvrc90zzw5w2k3ggwbinmax286gbff3sjlrzbs5sj64"; + x86_64-linux = "1pac3rv7ps23ymynvy8dwd5k2154aln33ksr75z1d8w859x3f1dy"; + x86_64-darwin = "1imzgqynbd65c7gbfp2gb1cxjbazx7afvbdvbqnm5qg7pvq22rni"; }.${system}; sourceRoot = { @@ -25,7 +25,7 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.42.0"; + version = "1.42.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index f15804038e71..c5c29459b453 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0f4cmai2d1x7wbqllxp9na6gxgqfxqav8n4g9azyvm6ymd8zjnx8"; + sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 2b3b992d24b5..d3950c06c339 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -36,7 +36,7 @@ , libmypaint , gexiv2 , harfbuzz -, mypaint-brushes +, mypaint-brushes1 , libwebp , libheif , libgudev @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { xorg.libXpm glib-networking libmypaint - mypaint-brushes + mypaint-brushes1 ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 1acaf4850ebe..5ebbee0e4d6f 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -7,59 +7,81 @@ , libpng , librsvg , gobject-introspection +, libmypaint +, mypaint-brushes , gdk-pixbuf , pkgconfig -, python2 -, scons +, python3 , swig , wrapGAppsHook }: let - inherit (python2.pkgs) pycairo pygobject3 numpy; -in stdenv.mkDerivation { + inherit (python3.pkgs) pycairo pygobject3 numpy buildPythonApplication; +in buildPythonApplication rec { pname = "mypaint"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mypaint"; repo = "mypaint"; - rev = "bcf5a28d38bbd586cc9d4cee223f849fa303864f"; - sha256 = "1zwx7n629vz1jcrqjqmw6vl6sxdf81fq6a5jzqiga8167gg8s9pf"; + rev = "v${version}"; + sha256 = "180kyilhf81ndhwl1hlvy82gh6hxpcvka2d1nkghbpgy431rls6r"; fetchSubmodules = true; }; nativeBuildInputs = [ intltool pkgconfig - scons swig wrapGAppsHook gobject-introspection # for setup hook ]; - buildInputs = [ gtk3 gdk-pixbuf + libmypaint + mypaint-brushes json_c lcms2 libpng librsvg pycairo pygobject3 - python2 ]; propagatedBuildInputs = [ numpy + pycairo + pygobject3 ]; - postInstall = '' - sed -i -e 's|/usr/bin/env python2.7|${python2}/bin/python|' $out/bin/mypaint + checkInputs = [ + gtk3 + ]; + + buildPhase = '' + runHook preBuild + + ${python3.interpreter} setup.py build + + runHook postBuild ''; - preFixup = '' - gappsWrapperArgs+=(--prefix PYTHONPATH : $PYTHONPATH) + installPhase = '' + runHook preInstall + + ${python3.interpreter} setup.py managed_install --prefix=$out + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + + HOME=$TEMPDIR ${python3.interpreter} setup.py test + + runHook postCheck ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch deleted file mode 100644 index 46722ff5fba0..000000000000 --- a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt -index 99f7dbf..03e953b 100644 ---- a/resources/CMakeLists.txt -+++ b/resources/CMakeLists.txt -@@ -45,7 +45,6 @@ add_subdirectory( imap ) - if (Libkolabxml_FOUND) - add_subdirectory( kolab ) - endif() --add_subdirectory( facebook ) - add_subdirectory( maildir ) - - add_subdirectory( openxchange ) diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 6d7bd0daa96b..65719514f96b 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -14,7 +14,6 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes @@ -22,6 +21,4 @@ mkDerivation { kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns ]; - # Attempts to build some files before dependencies have been generated - enableParallelBuilding = false; } diff --git a/pkgs/applications/kde/kdepim-runtime/series b/pkgs/applications/kde/kdepim-runtime/series deleted file mode 100644 index cc3e104775ff..000000000000 --- a/pkgs/applications/kde/kdepim-runtime/series +++ /dev/null @@ -1 +0,0 @@ -00-no-facebook.patch diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 34d2b510a03a..a4d777151992 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -62,10 +62,7 @@ in buildRustPackage rec { sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1kc9n10kb4j87x337pzl6wpi0qj5ib2mqmrjag2yld3138dag71n"; + cargoSha256 = "182j8ah67b2gw409vjfml3p41i00zh0klx9m8bwfkm64y2ki2bip"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 98aebc32dba1..e5590bfe8556 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "6.3.4"; + version = "6.3.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1b4ac7vsfz3c9vk7yv33pcfflcxl5fcnbzfdva1yfq63v28g38gk"; + sha256 = "1ssxgnd23cy6br7sbfszvx283c5vz9hgfhx0vqyvm13wyr67hk45"; }; installPhase = '' diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index fbe21dd9a5b2..da36e89db1fa 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: +{ stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: -stdenv.mkDerivation { +mkDerivation { pname = "doomseeker"; version = "2018-03-05"; @@ -13,13 +13,10 @@ stdenv.mkDerivation { patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; - buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; + buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index efdfbaadd3da..e5826c09d77d 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -38,6 +38,7 @@ buildPythonApplication rec { substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" ''; propagatedBuildInputs = [ + boto3 # needed for caches service pillow pyyaml pyproj diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix new file mode 100644 index 000000000000..b108d1a5647e --- /dev/null +++ b/pkgs/applications/misc/mbutil/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonApplication, fetchFromGitHub, nose }: + +buildPythonApplication rec { + pname = "mbutil"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = pname; + rev = "v${version}"; + sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z"; + }; + + checkInputs = [ nose ]; + checkPhase = "nosetests"; + + meta = with lib; { + description = "An importer and exporter for MBTiles"; + homepage = "https://github.com/mapbox/mbutil"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index e734e44a2e04..e3154b7cd1cd 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -1,36 +1,44 @@ -{ stdenv, fetchurl -, libusb1, pkgconfig, qmake, qtbase, qttools, qtwebsockets +{ lib, mkDerivation, fetchFromGitHub +, libusb1 +, pkg-config +, qmake +, qtbase +, qttools +, qtwebsockets }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "moolticute"; - version = "0.30.8"; + version = "0.42.32-testing"; - src = fetchurl { - url = "https://github.com/mooltipass/moolticute/archive/v${version}.tar.gz"; - sha256 = "1qi18r2v0mpw1y007vjgzhiia89fpgsbg2wirxgngl21yxdns1pf"; + src = fetchFromGitHub { + owner = "mooltipass"; + repo = pname; + rev = "v${version}"; + sha256 = "1kx1p2h65dilj1pbzf36d1mxwym19kvln1sqg8fb7na8q7lk4b05"; }; + outputs = [ "out" "udev" ]; + + nativeBuildInputs = [ pkg-config qmake qttools ]; + buildInputs = [ libusb1 qtbase qtwebsockets ]; + preConfigure = "mkdir -p build && cd build"; - nativeBuildInputs = [ pkgconfig qmake qttools ]; qmakeFlags = [ "../Moolticute.pro" ]; - outputs = [ "out" "udev" ]; preInstall = '' mkdir -p $udev/lib/udev/rules.d sed -n '/^ \+cat > "$tmpfile" <<- EOF$/,/^EOF$/p' ../data/moolticute.sh | sed '1d;$d' > $udev/lib/udev/rules.d/50-mooltipass.rules ''; - - buildInputs = [ libusb1 qtbase qtwebsockets ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI app and daemon to work with Mooltipass device via USB"; longDescription = '' To install udev rules, add `services.udev.packages == [ moolticute.udev ]` into `nixos/configuration.nix`. ''; - homepage = https://github.com/mooltipass/moolticute; + homepage = "https://github.com/mooltipass/moolticute"; license = licenses.gpl3Plus; maintainers = [ maintainers.kirikaza ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 426c5162500d..7b070e32ca56 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0"; + cargoSha256 = "1hkqahsrhmgcpgp0pvfpc0wmwqivnqylsxzjrz63k1s9ssdv9syy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index a66f4c9a2cf0..4f63ed057b78 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk"; + cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl"; meta = with stdenv.lib; { description = "A simple terminal clock written in Rust"; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 69c2e37e3520..645ed7433b32 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, cmake, avahi-compat +{ stdenv, lib, fetchFromGitHub, cmake, openssl , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver -, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, openssl +, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat , withGUI ? true, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -35,20 +35,19 @@ stdenv.mkDerivation rec { chmod -R +w ext/ ''; - cmakeFlags = lib.optionals stdenv.isDarwin [ - "-DOSX_TARGET_MAJOR=10" - "-DOSX_TARGET_MINOR=7" - ] ++ lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"; + cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"; nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook; dontWrapQtApps = true; buildInputs = [ - openssl avahi-compat + openssl ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Carbon Cocoa CoreServices ScreenSaver - ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; + ] ++ lib.optionals stdenv.isLinux [ + xlibsWrapper libX11 libXi libXtst libXrandr xinput avahi-compat + ]; installPhase = '' mkdir -p $out/bin @@ -56,10 +55,15 @@ stdenv.mkDerivation rec { '' + lib.optionalString withGUI '' cp bin/synergy $out/bin/ wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]} + '' + lib.optionalString stdenv.isLinux '' mkdir -p $out/share/icons/hicolor/scalable/apps cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ mkdir -p $out/share/applications substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/ + mv bundle/Synergy.app $out/Applications/ + ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS ''; doCheck = true; diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 1eb4123a4cc0..bf9770acacd8 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg"; + cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; meta = with lib; { homepage = https://crates.io/crates/taizen; diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index d4321e3b88e3..f55b3852e5bf 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id"; + cargoSha256 = "1vyc230a2b0dry2057mkdkrjb7s9d0p43fnz4q67aqrpyr4jxwx2"; checkPhase = "cargo test --features=integration_tests"; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix new file mode 100644 index 000000000000..cb0ee20f555f --- /dev/null +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf +, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat +, udev, libpulseaudio, utillinux, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "todoist-electron"; + version = "1.19"; + + src = fetchurl { + url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb"; + sha256 = "1w0l7k7wmbhwzv71cffsir0q7zg9m0617fmyvd4a01b6flpxrpfx"; + }; + + desktopItem = makeDesktopItem { + name = "Todoist"; + exec = "todoist"; + desktopName = "Todoist"; + categories = "Utility;Productivity"; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = let + libPath = lib.makeLibraryPath ([ + stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus + nss nspr alsaLib libpulseaudio cups expat udev utillinux + ] ++ (with xorg; [ + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb + libXrender libX11 libXtst libXScrnSaver + ])); + in '' + mkdir -p "$out/bin" + mv opt "$out/" + + # Patch binary + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:\$ORIGIN" \ + $out/opt/Todoist/todoist + + # Hacky workaround for RPATH problems + makeWrapper $out/opt/Todoist/todoist $out/bin/todoist \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio udev ]} + + # Desktop item + mkdir -p "$out/share" + ln -s "${desktopItem}/share/applications" "$out/share/applications" + ''; + + meta = with lib; { + homepage = "https://github.com/KryDos/todoist-linux"; + description = "The Linux wrapper for Todoist web version"; + platforms = [ "x86_64-linux" ]; + license = licenses.isc; + maintainers = with maintainers; [ i077 ]; + }; +} diff --git a/pkgs/applications/misc/zola/cargo-lock.patch b/pkgs/applications/misc/zola/cargo-lock.patch deleted file mode 100644 index b9d97e3c328a..000000000000 --- a/pkgs/applications/misc/zola/cargo-lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index df5fef3..80f071a 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2158,12 +2158,12 @@ version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -- "sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "sass-sys" --version = "0.4.13" -+version = "0.4.15" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -3410,7 +3410,7 @@ dependencies = [ - "checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" - "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" - "checksum sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd" --"checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972" -+"checksum sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "304b6f9501d1da13f17404aeee85486d7383d06074906669b3ea032f81e83d22" - "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" - "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index be00070d2a50..201a3eda3cc7 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, CoreServices }: rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "13kbgxh7r6124d1fjdf0x599j1kpgixp1y9d299zb5vrd6rf5wy5"; + sha256 = "112aqv21gy1fbly5v2x3ph32pr82d1mwh0q57yfaaqygz2madypb"; }; - cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + cargoSha256 = "0hqa60bx8pxhgad7x6r4zbwddrkcspnnp53bl94zbf3j47p10ggz"; - cargoSha256 = "03rwf5l1l3ap03qi0xqcxsbyvpg3cqmr50j8ql6c5v55xl0ki9w8"; - - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; @@ -32,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A fast static site generator with everything built-in"; - homepage = https://www.getzola.org/; + homepage = "https://www.getzola.org/"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c4a09c8063db..e600d134e9c0 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.314"; + version = "32.0.0.330"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "05xcscpzglpfpiiqc3ngs5snxli99irjk18g5vdhw91jk9808gnl"; + sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index dd9222fef034..2a5a82aed6ad 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -16,10 +16,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "73.0"; + ffversion = "73.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2da2jn3gwck6qys3ys146jsjl9fgq10s3ii62y4ssnhl76ryir8f1mv9i1d6hyv8381hplasnxb553d5bgwnq87ymgqabakmr48n2p1"; + sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 5ecb6bfb0766..3d711f92d1c9 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.314"; + version = "32.0.0.330"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "076l93wjcy15sic88cyq6msp87gdhcvbk4ym2vbvvjz2bav2z456" + "1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b" else - "0kxr8d6fh00akqgk3lwv0z6rk7xswislicsbh9b9p33f19mj7c8a" + "0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b" else if arch == "x86_64" then - "0a3hvp0qmqlann8k875ajf0i70cv0an1a3mr8kbgji46dxqvwjxz" + "1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj" else - "0jyywas2z7ssgzng82qgnp01gy6nccqavkbx9529m07xrclvqbxn"; + "1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 353aff7e707e..b003a1b3f5c0 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.314"; + version = "32.0.0.330"; 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 - "0zlin94rip13rn58m7v5l6m20ylnw59l77rbg5j5qyxkr53zawdz" + "0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84" else - "0pfrm02iwa01pqx3adqj0sw27p1ddlz9knjky6x248ak8zywsqr2"; + "08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c"; }; nativeBuildInputs = [ unzip ]; 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 c925483147ba..4fafe19b3792 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -90,19 +90,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.0.4"; + version = "9.0.5"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "14zlf02i447hcdr4qap8af1k4aziznfp9m2ygqz05zsy8icm1j2k"; + sha256 = "1d4c3mrvqd6v086mwn3rnv776y2j3y45agnd0k5njqnmr53ybn2s"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1bmih91gsh698fp2mbnjcq8vmwhg822wanmn99r0xhkmgpi4zw2s"; + sha256 = "040nh79hjkg5afvzshzhp7588dbi1pcpjsyk8phfqaapds74ma8y"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ce3530728aa2..d2de889bf7bd 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.33-1"; + version = "2.11.1811.38-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1z0cscvmhxh1wjs7r0sjdr3f3mcg8i6avpal6spp0ymkxp2rn0h3"; + sha256 = "0nz7yhxp7fxv6pj1i2684di1wgk4k78hw4icfjqzjwmvc3i710jw"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index ddeb5851037b..49f55370bc42 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "terragrunt"; - version = "0.17.4"; + version = "0.21.11"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "13hlv0ydmv8gpzgg6bfr7rp89xfw1bkgd0j684armw8zq29cmv3a"; + sha256 = "1w64skk67i0sxjd2mkyqh3nglc32wc7schk7h8fwszpa1rw4dfcn"; }; goDeps = ./deps.nix; @@ -18,6 +18,7 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; preBuild = '' + find go/src -name vendor | xargs -I % sh -c 'echo Removing %; rm -rf %' buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") ''; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 8432a8366b7a..51cb455ce7c9 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -1,129 +1,453 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/aws/aws-sdk-go"; + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "28a4bc8c44b3acbcc482cff0cdf7de29a4688b61"; + sha256 = "0j40msxm72m8gs87rpwkk19iagjj387r42xwxszmrna7il8g0sbl"; + }; + } + { + goPackagePath = "github.com/agext/levenshtein"; + fetch = { + type = "git"; + url = "https://github.com/agext/levenshtein"; + rev = "0ded9c86537917af2ff89bc9c78de6bd58477894"; + sha256 = "19d7q69yhcg7gl81j038rkbjz8yjb4qwnsqrmxa4zvhgzlc7d130"; + }; + } + { + goPackagePath = "github.com/apparentlymart/go-cidr"; + fetch = { + type = "git"; + url = "https://github.com/apparentlymart/go-cidr"; + rev = "b1115bf8e14a60131a196f908223e4506b0ddc35"; + sha256 = "0r938rb18c9cr2k417cwwd4pfq74aabpjp9pzvk4qkxc5279igl3"; + }; + } + { + goPackagePath = "github.com/apparentlymart/go-textseg"; + fetch = { + type = "git"; + url = "https://github.com/apparentlymart/go-textseg"; + rev = "fb01f485ebef760e5ee06d55e1b07534dda2d295"; + sha256 = "0n9xcyj7p5y8mbqilk9zprfyqvgm2y9f1g440wqw9dnn3s4fi1k4"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "25253087ea42da08900c4c1fc34c04bdb4a97d5a"; - sha256 = "0p6mf53f4l9b26yc4qlm1s7yls73hsw8klyfhmnxhk2mq8k6ix4m"; + rev = "572908275ed4e38fef7ccb7d507f2faacaa7ab36"; + sha256 = "07bn3v0c4pd38qdp0a0kgmsvh7q30f14qp7pbbls3jzmvpxh49zs"; }; } { - goPackagePath = "github.com/bgentry/go-netrc"; + goPackagePath = "github.com/bgentry/go-netrc"; fetch = { type = "git"; url = "https://github.com/bgentry/go-netrc"; - rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; + rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; }; } { - goPackagePath = "github.com/go-errors/errors"; + goPackagePath = "github.com/bmatcuk/doublestar"; + fetch = { + type = "git"; + url = "https://github.com/bmatcuk/doublestar"; + rev = "2437321e1473408f122a95f65df3d8841fec4fba"; + sha256 = "0z1jg4l746825qs95sffbc69av1yj0l37n8rjmmnwf7hxh5glxzp"; + }; + } + { + goPackagePath = "github.com/creack/pty"; + fetch = { + type = "git"; + url = "https://github.com/creack/pty"; + rev = "3a6a957789163cacdfe0e291617a1c8e80612c11"; + sha256 = "1v52599qq76dwq742mffakzj6mxqqccv2szn3hjicjld56nmd2d3"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; fetch = { type = "git"; url = "https://github.com/go-errors/errors"; - rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; + rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; }; } { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "6f77996f0c42f7b84e5a2b252227263f93432e9b"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "beaecbbdd8af86aa3acf14180d53828ce69400b2"; + sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm"; + }; + } + { + goPackagePath = "github.com/gruntwork-io/terratest"; + fetch = { + type = "git"; + url = "https://github.com/gruntwork-io/terratest"; + rev = "a02960d4ef0711ae95ae2651271b4e073f88da4e"; + sha256 = "0mywsimj8if8j2jbp8sf4igl5lcdlj81hd3lif86fsmyrma090vw"; + }; + } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "8a6fb523712970c966eefc6b39ed2c5e74880354"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; - sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; + rev = "eda1e5db218aad1db63ca4642c8906b26bcf2744"; + sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; }; } { - goPackagePath = "github.com/hashicorp/go-getter"; + goPackagePath = "github.com/hashicorp/go-getter"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "64040d90d4ab861e7e833d689dc76a0f176d8dec"; - sha256 = "0g25nx42z6ykd7jqzlrxf161h8lqrpxpddmbspl4w3a84wphhgms"; + rev = "f9ec369200fd2163b8f452e5e45696d83ae3f4b6"; + sha256 = "1h69946nsmpp06iqg85whwvjrfqlk1gf9q7y01f0r3sf0cb28f30"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "886a7fbe3eb1c874d46f623bfa70af45f425b3d1"; + sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-safetemp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-safetemp"; + rev = "c9a55de4fe06c920a71964b53cfe3dd293a3c743"; + sha256 = "0gydks8bkq88adlzmv8qj3rvljx15j94c8lyrp88ji2jn6dvv643"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; }; } { - goPackagePath = "github.com/hashicorp/go-version"; + goPackagePath = "github.com/hashicorp/go-version"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-version"; - rev = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"; - sha256 = "056zs67diq3m7skmmq3pnz6wymfcg55dfs5zf86xkfqqpj10kyf7"; + rev = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd"; + sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; }; } { - goPackagePath = "github.com/hashicorp/hcl"; + goPackagePath = "github.com/hashicorp/hcl2"; fetch = { type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "f40e974e75af4e271d97ce0fc917af5898ae7bda"; - sha256 = "1w5w3m40xv85gngw8g1kjbcgah1vl4ardbpg2cxgj1svf80zazxx"; + url = "https://github.com/hashicorp/hcl2"; + rev = "318e80eefe28c3aa01b434c61bcf4c83a0cc6b25"; + sha256 = "1wlm47qk84ggn6lanafirc49kaq998r1nw2xdcv4ghdxy2ijc0rj"; }; } { - goPackagePath = "github.com/mattn/go-zglob"; + goPackagePath = "github.com/hashicorp/terraform"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/terraform"; + rev = "abec0acf40d8e31ac612a244cf3886fb3bcce0bb"; + sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3"; + sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; - sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; + rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1"; + sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz"; }; } { - goPackagePath = "github.com/mitchellh/go-homedir"; + goPackagePath = "github.com/mitchellh/go-homedir"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; }; } { - goPackagePath = "github.com/mitchellh/go-testing-interface"; + goPackagePath = "github.com/mitchellh/go-testing-interface"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-testing-interface"; - rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28"; - sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx"; + rev = "6d0b8010fcc857872e42fc6c931227569016843c"; + sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; }; } { - goPackagePath = "github.com/mitchellh/mapstructure"; + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"; + sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; - sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; - sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; + rev = "ffdc059bfe9ce6a4e144ba849dbedead332c6053"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { - goPackagePath = "github.com/ulikunitz/xz"; + goPackagePath = "github.com/ulikunitz/xz"; fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; - sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; + rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; + sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; }; } { - goPackagePath = "github.com/urfave/cli"; + goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; - sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "github.com/zclconf/go-cty"; + fetch = { + type = "git"; + url = "https://github.com/zclconf/go-cty"; + rev = "6fd39ad70c3a6bbdb1b4e47444e4cce72f901200"; + sha256 = "0mb0ws70jg93vlamzhdvyvyfq6x0s0ll5gf44yanb1dhlz6i1f90"; + }; + } + { + goPackagePath = "github.com/zclconf/go-cty-yaml"; + fetch = { + type = "git"; + url = "https://github.com/zclconf/go-cty-yaml"; + rev = "bc34c981dadb5ed30af852693e3aba8fb6546f42"; + sha256 = "0dams5g61n88rk7zq7sy0yap873ksjafhf81hn2fg2dpfjhcd3y2"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "9c377598961b706d1542bd2d84d538b5094d596e"; + sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5c40567a22f818bd14a1ea7245dad9f8ef0691aa"; + sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; + sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; + sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "890e5eb51fe205e56dc55eb68d63e82039730816"; + sha256 = "05r2wsjnmszsz4y59w8q6qknc7zq1mc56kya61i2133dqxyc55ai"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; + sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "eb0b1bdb6ae60fcfc41b8d907b50dfb346112301"; + sha256 = "0g00wfxd4z886bglyszcvfpgzak0476axqyfaqv3va62ndbqpk90"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "501c41df7f472c740d0674ff27122f3f48c80ce7"; + sha256 = "0hla9rjvyi6wjak4cw39ic8jkdcd0lsymhrz9sa52bfybxsczf38"; }; } -] +] \ No newline at end of file diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index a509d9be3294..4361679fc884 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.21"; + version = "3.1.26"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "ea2c9225bbf565215fc97eed97e718f426b4b7b3c8628bbd8edcc96e7bfe7e4e"; + sha256 = "0bd8ccc9ae8e9fd9d5aa4f61a1a5d8b62ff30257fc0f5b2ec61b2f4b26275eee"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 9e052c101ad3..896ca4f38a61 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -35,10 +35,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv"; + cargoSha256 = "10fgw9m6gdazrca73g43sgvsghhac7xc3bg7hr0vpynzqyfigwa9"; nativeBuildInputs = [ cargo diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index c49934b96f77..11e2cf5c7e45 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.6", + "version": "1.5.9", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 9b6f591bd42d..bf0feda42780 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.5.6"; + version = "1.5.9"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "148rg6wc84xy53bj16v5riw78s999ridid59x6v9jas827l0bdpk"; + sha256 = "13bskp8nj1h44y7x4dibnfa8sdnzl744x4xckcw5lxnlkccfr69m"; }; in mkYarnPackage rec { @@ -29,7 +29,6 @@ in mkYarnPackage rec { # resources mkdir -p "$out/share/riot" ln -s '${riot-web}' "$out/share/riot/webapp" - cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator" cp -r './deps/riot-web' "$out/share/riot/electron" cp -r './deps/riot-web/img' "$out/share/riot" rm "$out/share/riot/electron/node_modules" diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2156214db6b0..ea8626d6b06e 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,27 +1,30 @@ -{ lib, stdenv, fetchurl, writeText, conf ? null }: +{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: # Note for maintainers: # Versions of `riot-web` and `riot-desktop` should be kept in sync. -stdenv.mkDerivation rec { +let + noPhoningHome = { + disable_guests = true; # disable automatic guest account registration at matrix.org + piwik = false; # disable analytics + }; + configOverrides = writeText "riot-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); + +in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx"; + sha256 = "1qibbgjzhiwn1lnfm3pbfn6jahphgyf6625mp4v0ah2is75x16ys"; }; - installPhase = let - configFile = if (conf != null) - then writeText "riot-config.json" conf - else "$out/config.sample.json"; - in '' + installPhase = '' runHook preInstall mkdir -p $out/ cp -R . $out/ - ln -s ${configFile} $out/config.json + ${jq}/bin/jq -s '.[0] * .[1]' "config.sample.json" "${configOverrides}" > "$out/config.json" runHook postInstall ''; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 4ec37dc5b54f..d673c75764a3 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -40,11 +40,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2019.10"; + version = "2020.2"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq"; + sha256 = "4f5970714684a86fba44b742d77f9bbe1147a111330e487d160d9844f34ae3d5"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 86ef850e291e..da7c5d4af741 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -19,7 +19,9 @@ let pname = overrides.type; version = source.version; - patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; + patches = (source.patches or []) + ++ optional jackSupport ./mumble-jack-support.patch + ++ [ ./fix-rnnoise-argument.patch ]; nativeBuildInputs = [ pkgconfig python qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); diff --git a/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch new file mode 100644 index 000000000000..78e8ed24d58f --- /dev/null +++ b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch @@ -0,0 +1,16 @@ +nixpkgs has a more recent rnnoise than the one used by mumble, and rnnoise +changed the argument rnnoise_create[1], + +[1] https://github.com/xiph/rnnoise/commit/231b9c02d14a74cb449a98004cb7a2cf1bdeca2f + +--- old/src/mumble/AudioInput.cpp 2020-02-18 22:55:32.000000000 -0500 ++++ new/src/mumble/AudioInput.cpp 2020-02-18 22:58:08.000000000 -0500 +@@ -106,7 +106,7 @@ + #endif + + #ifdef USE_RNNOISE +- denoiseState = rnnoise_create(); ++ denoiseState = rnnoise_create(NULL); + #endif + + qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize); diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index c362de2daa35..53d073caee47 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "1adicl0msjwbvvi0nxqb1zmka51nn2b88plsynrap5fm0xp40j39"; + sha256 = "17w1bx305w656jkiv55lwncxwdly8rf2dsisqw3c9bc7vz19l6p8"; }; patches = [ diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 51ab54b10f92..65cf21c1611c 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h"; + cargoSha256 = "0lhhdzq4sadnp2pnbq309d1mb7ggbf24k5ivlchrjhllbim1wmdz"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix index 00edcd411fd5..fb2020f0d3a2 100644 --- a/pkgs/applications/networking/sync/rclone/browser.nix +++ b/pkgs/applications/networking/sync/rclone/browser.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase }: +{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: stdenv.mkDerivation rec { pname = "rclone-browser"; - version = "1.2"; + version = "1.8.0"; src = fetchFromGitHub { - owner = "mmozeiko"; + owner = "kapitainsky"; repo = "RcloneBrowser"; rev = version; - sha256 = "1ldradd5c606mfkh46y4mhcvf9kbjhamw0gahksp9w43h5dh3ir7"; + sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 021eadb64768..88da2442ecf2 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.1.0"; + version = "9.1.1"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "06431nmz2k1d7vdpnyr88j777sfaa0vrfvxbr9zikn65176mkw7k"; + sha256 = "0mdf4ybp0a6c816210g76lx901qwxw727ipyiph5kbdzl4jlrpgm"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 683cddde5ec8..3cda543eda12 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.3.1"; + name = "homebank-5.3.2"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "119lyr8c33n8sa3s4l8s33ajwhyv0qgpmaigkyaqnccbkw1qdhhv"; + sha256 = "1fr4060yqlciay98dypvifmfvr8y2kbpj89d86mcvq9gb00vij2b"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8bb58d29213..a7d8f4c7d40f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -57,23 +57,11 @@ in (stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"; + NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal" + + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; patches = [ ./xdg-open-brief.patch - - # Poppler-0.82 compatibility - # https://gerrit.libreoffice.org/81545 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch"; - sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n"; - }) - # Poppler-0.83 compatibility - # https://gerrit.libreoffice.org/84384 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch"; - sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2"; - }) ]; tarballPath = "external/tarballs"; @@ -235,7 +223,6 @@ in (stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" @@ -296,7 +283,6 @@ in (stdenv.mkDerivation rec { "--enable-python=system" "--enable-dbus" "--enable-release-build" - (lib.enableFeature kdeIntegration "kde4") "--enable-epm" "--with-jdk-home=${jdk.home}" "--with-ant-home=${ant}/lib/ant" @@ -310,8 +296,6 @@ in (stdenv.mkDerivation rec { "--with-system-openldap" "--with-system-coinmp" - "--with-alloc=system" - # Without these, configure does not finish "--without-junit" @@ -349,6 +333,7 @@ in (stdenv.mkDerivation rec { "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" + "--without-system-qrcodegen" "--without-system-xmlsec" ]; @@ -390,4 +375,4 @@ in (stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; -}).overrideAttrs ((importVariant "override.nix") args) +}).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; })) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 4df8ce1059b4..bc329e5a8f89 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -1,10 +1,10 @@ [ { - name = "libabw-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; - sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; + name = "libabw-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; - md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; + md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; @@ -147,11 +147,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; - sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + name = "expat-2.2.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; - md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; + md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -336,11 +336,11 @@ md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-2.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; - sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; + name = "harfbuzz-2.6.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; + sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; md5 = ""; - md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; + md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -364,18 +364,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-63_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; - sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; + name = "icu4c-65_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz"; + sha256 = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948"; md5 = ""; - md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; + md5name = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948-icu4c-65_1-src.tgz"; } { - name = "icu4c-63_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; - sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; + name = "icu4c-65_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-65_1-data.zip"; + sha256 = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6"; md5 = ""; - md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; + md5name = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6-icu4c-65_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -462,11 +462,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-04-03.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; - sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; + name = "language-subtag-registry-2019-09-16.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; + sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; md5 = ""; - md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; + md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -511,6 +511,13 @@ md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { + name = "libffi-3.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; + sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; + md5 = ""; + md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; + } + { name = "libgpg-error-1.27.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; @@ -546,18 +553,18 @@ md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { - name = "libxml2-2.9.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; - sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; + name = "libxml2-2.9.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; - md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; + md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { - name = "libxslt-1.1.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; - sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; + name = "libxslt-1.1.34.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; - md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; + md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -581,11 +588,11 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; - sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; + name = "mdds-1.5.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2"; + sha256 = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d"; md5 = ""; - md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; + md5name = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d-mdds-1.5.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -623,11 +630,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.45-with-nspr-4.21.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; - sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; + name = "nss-3.47.1-with-nspr-4.23.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; + sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; md5 = ""; - md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; + md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -658,18 +665,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2r.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; - sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; + name = "openssl-1.0.2t.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; - md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; + md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { - name = "liborcus-0.14.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; - sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; + name = "liborcus-0.15.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz"; + sha256 = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2"; md5 = ""; - md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; + md5name = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2-liborcus-0.15.3.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -686,11 +693,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3794.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; - sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; + name = "pdfium-3963.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2"; + sha256 = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895"; md5 = ""; - md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; + md5name = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895-pdfium-3963.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -707,11 +714,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.74.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; - sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; + name = "poppler-0.82.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; - md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; + md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -721,11 +728,18 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; - sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; + name = "Python-3.7.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz"; + sha256 = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"; + md5 = ""; + md5name = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f-Python-3.7.6.tar.xz"; + } + { + name = "QR-Code-generator-1.4.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; + sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; md5 = ""; - md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; + md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -805,11 +819,11 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; - sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; + name = "libvisio-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; - md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; + md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index 464965121d97..60e08735d2e6 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -1,4 +1,10 @@ -{ stdenv, ... }: -attrs: { - NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; +{ stdenv, kdeIntegration, ... }: +attrs: +{ + postConfigure = attrs.postConfigure + '' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + ''; + configureFlags = attrs.configureFlags ++ [ + (stdenv.lib.enableFeature kdeIntegration "kf5") + ]; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 28bf127c3988..ec7f9e52bbba 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "6"; - minor = "3"; - patch = "0"; - tweak = "4"; + minor = "4"; + patch = "1"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -17,19 +17,19 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; + sha256 = "03fqpkilz4yi35l447hb9r8gjwj23l61bpdkwg21jm8blm8kkvyj"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; + sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; + sha256 = "1hfllrdyxrg5mgqry3dcrhjbdrd0d27k5mvv4sfj7nwjlmjh8rqq"; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index b5a721b5679b..78482326be23 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -1,10 +1,10 @@ [ { - name = "libabw-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; - sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; + name = "libabw-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; - md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; + md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_66_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; - sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + name = "boost_1_69_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; + sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; md5 = ""; - md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; + md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; } { name = "breakpad.zip"; @@ -147,11 +147,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; - sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + name = "expat-2.2.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; - md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; + md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -231,11 +231,11 @@ md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { - name = "source-serif-font-2.007R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; - sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; + name = "source-serif-pro-3.000R.tar.gz"; + url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; - md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; @@ -308,11 +308,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.8.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; - sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + name = "freetype-2.9.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; - md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; + md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -329,18 +329,18 @@ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.10.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; - sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; + name = "graphite2-minimal-1.3.13.tgz"; + url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; + sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; md5 = ""; - md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; + md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-1.8.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; - sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; + name = "harfbuzz-2.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; + sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; md5 = ""; - md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; + md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -462,11 +462,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-04-03.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; - sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; + name = "language-subtag-registry-2019-09-16.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; + sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; md5 = ""; - md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; + md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -539,25 +539,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.27.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; - sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; + name = "xmlsec1-1.2.28.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; + sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; md5 = ""; - md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; + md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { - name = "libxml2-2.9.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; - sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; + name = "libxml2-2.9.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; - md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; + md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { - name = "libxslt-1.1.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; - sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; + name = "libxslt-1.1.34.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; - md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; + md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -602,11 +602,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.14.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; - sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; + name = "libmwaw-0.3.15.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; + sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; md5 = ""; - md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; + md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -623,11 +623,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.45-with-nspr-4.21.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; - sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; + name = "nss-3.47.1-with-nspr-4.23.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; + sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; md5 = ""; - md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; + md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -658,11 +658,11 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2r.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; - sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; + name = "openssl-1.0.2t.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; - md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; + md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { name = "liborcus-0.14.1.tar.gz"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3550.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; - sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; + name = "pdfium-3794.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; + sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; md5 = ""; - md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; + md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -707,11 +707,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.74.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; - sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; + name = "poppler-0.82.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; - md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; + md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -721,11 +721,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; - sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; + name = "Python-3.5.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"; + sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049"; md5 = ""; - md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; + md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -805,11 +805,11 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; - sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; + name = "libvisio-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; - md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; + md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 7192af019496..c0880aa3ecb1 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,6 +1,12 @@ -{ stdenv, ... }: +{ stdenv, kdeIntegration, ... }: attrs: { - configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; + postConfigure = attrs.postConfigure + '' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + ''; + configureFlags = stdenv.lib.remove "--without-system-qrcodegen" + (attrs.configureFlags ++ [ + (stdenv.lib.enableFeature kdeIntegration "kde5") + ]); meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index a27087a1b051..d3da7d09b704 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -7,8 +7,8 @@ rec { }; major = "6"; - minor = "2"; - patch = "6"; + minor = "3"; + patch = "5"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,18 +17,19 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; + sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz"; }; + # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; + sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; + sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6"; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 30569512129b..fa2c67709fb9 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "19.12.15"; + version = "20.2.5"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: - # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "11i3cn1j365nwinaksfpi1hn7j6bqgjzhawkl6c294lzahngba9w"; + # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256 + sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index 73a7d9bd35bc..ed4903d64743 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "softmaker-office"; - version = "972"; + version = "974"; edition = "2018"; suiteName = "SoftMaker Office"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; - sha256 = "06kgkmqg5269a4vm14i89mw8m1x9yy9ajw0dhfcvjizadyzmlqn1"; + sha256 = "0z1g76lhja92s25x6y0h55wmqza2d3pjbshn5b9rn2784gjgj7hn"; }; archive = "office${edition}.tar.lzma"; diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index e8241ede96cd..ecb9403be36e 100644 --- a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Libraries required for the higher-level Qubes daemons and tools"; homepage = "https://qubes-os.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ "0x4A6F" ]; + maintainers = [ maintainers."0x4A6F" ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 0ea406aca817..0f6dea75c6fb 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,6 +44,10 @@ let git-fame = callPackage ./git-fame {}; + git-filter-repo = callPackage ./git-filter-repo { + pythonPackages = python3Packages; + }; + gita = python3Packages.callPackage ./gita {}; # The full-featured Git. diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix new file mode 100644 index 000000000000..af21296cffa4 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pythonPackages }: + +stdenv.mkDerivation rec { + pname = "git-filter-repo"; + version = "2.25.0"; + + src = fetchurl { + url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "1772if8ajaw80dsdw4ic6vjw24dq0b9w87qlkn0iw4b8r9yxp37a"; + }; + + buildInputs = [ pythonPackages.python ]; + + dontBuild = true; + + installPhase = '' + install -Dm755 -t $out/bin git-filter-repo + install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1 + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/newren/git-filter-repo"; + description = "Quickly rewrite git repository history (filter-branch replacement)"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index ff0f702269c2..4e6e450657d2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "git-remote-gcrypt"; - version = "1.2"; + version = "1.3"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "0isfg0vlmcphxzj4jm32dycprhym26ina1b28jgc4j57kiqqrdcy"; + sha256 = "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 61e3e1e3eef0..b93163e239ad 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -17,8 +17,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1z4cb7rcb7ldj16xxynrjh4hg872rj39rbbp0vy15kdp3ifyi466"; - legacyCargoFetcher = false; - buildInputs = with stdenv; lib.optional isDarwin Security; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index c2df8c971b0e..c6c0f0a52f4b 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -20,8 +20,18 @@ in rustPlatform.buildRustPackage rec { sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; + cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v"; + + # N.B. The cargo depfile checker expects us to have unpacked the src tarball + # into the standard dirname "source". + cargoDepsHook = '' + ln -s ${pname}-${version} source + ''; + + # TODO: Delete once pijul fixes upstream: + # https://nest.pijul.com/pijul_org/pijul/discussions/447 postPatch = '' - pushd ../${pname}-${version}-vendor/thrussh/ + pushd ../${pname}-${version}-vendor.tar.gz/thrussh/ patch -p1 < ${./thrussh-build-fix.patch} substituteInPlace .cargo-checksum.json --replace \ 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ @@ -45,11 +55,6 @@ in rustPlatform.buildRustPackage rec { doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k"; - meta = with stdenv.lib; { description = "A distributed version control system"; homepage = https://pijul.org; diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix new file mode 100644 index 000000000000..82774ada09eb --- /dev/null +++ b/pkgs/applications/video/jftui/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, fetchpatch, clang, + pkg-config, curl, mpv, yajl }: + +stdenv.mkDerivation rec { + pname = "jftui"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "Aanok"; + repo = pname; + rev = "v${version}"; + sha256 = "0g93w8ahyh2v0cv2fyj5a7v6qyznavwk0dcxx1qw4kczdgmlxnkx"; + }; + + patches = [ + # Remove this patch with next version + (fetchpatch { + name = "curl-capability-check-fix"; + url = "https://github.com/Aanok/jftui/commit/d63996b8bc0d2ac4b04c5de4169bc7f8ec9b2a30.patch"; + sha256 = "1d595mkzgx3carq2cykxpvmf5klgdlyaq94fk9wj8812yswqlsr7"; + }) + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + clang + curl + mpv + yajl + ]; + + installPhase = '' + install -Dm555 build/jftui $out/bin/jftui + ''; + + meta = with stdenv.lib; { + description = "Jellyfin Terminal User Interface "; + homepage = "https://github.com/Aanok/jftui"; + license = licenses.unlicense; + maintainers = [ maintainers.nyanloutre ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index c5bbab39643f..f046e0e44b2c 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx"; + cargoSha256 = "088drkpkgq8psv5j6igxyhfvvbalzg6nd98r9z0nxkawck5i2clz"; meta = with stdenv.lib; { description = "A container debugging tool based on FUSE"; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index f976ede79c46..9eaf2d6c5c24 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "crun"; - version = "0.12.1"; + version = "0.12.2.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0dj6lf5yflbsybv7qkx19xvcfy5pv46k9mys7imr7akr9r1bcl5s"; + sha256 = "16hjkkr1fp542ycyp87pj626mzfrza5mcb82hhkp4a8m8bqmpzp4"; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 53489eca3a06..0e57643c64d3 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight and efficient window manager for X11"; homepage = "https://github.com/leahneukirchen/cwm"; - maintainers = with maintainers; [ "0x4A6F" mkf ]; + maintainers = with maintainers; [ maintainers."0x4A6F" mkf ]; license = licenses.isc; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index e5c478987df4..731555ce9f8c 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.17.1"; + version = "4.18"; releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "02jpvwmfwv58dfdwvcvkdfcyca7l7zw7hx18aj4cqm3gg0r5pmqh"; + sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; |