diff options
Diffstat (limited to 'pkgs/applications')
342 files changed, 3398 insertions, 2445 deletions
diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 192bf041c64..8f70f632cd6 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -6,7 +6,7 @@ , gettext , glib , gtk3 -, libhandy +, libhandy_0 , meson , ninja , pango @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { dbus glib gtk3 - libhandy + libhandy_0 pango ]; diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 194514c65b5..83b359b1b1c 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ stdenv, fetchFromGitLab, fetchpatch }: stdenv.mkDerivation { name = "aacgain-1.9.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "mulx"; repo = "aacgain"; rev = "7c29dccd878ade1301710959aeebe87a8f0828f5"; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index a26431a82ed..f1f97de256e 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , qmake , qtbase -, qtmultimedia , qttools , alsaSupport ? stdenv.hostPlatform.isLinux , alsaLib @@ -19,20 +18,20 @@ let in mkDerivation rec { pname = "bambootracker"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "rerrahkr"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc"; + sha256 = "0ibi0sykxf6cp5la2c4pgxf5gvy56yv259fbmdwdrdyv6vlddf42"; }; sourceRoot = "source/BambooTracker"; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase qtmultimedia ] + buildInputs = [ qtbase ] ++ optional alsaSupport alsaLib ++ optional pulseSupport libpulseaudio ++ optional jackSupport libjack2; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 4f4ad4b8c5b..53adb3f146f 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -94,7 +94,7 @@ mkDerivation rec { homepage = "https://github.com/falkTX/Cadence/"; description = "Collection of tools useful for audio production"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ genesis worldofpeace ]; + maintainers = with stdenv.lib.maintainers; [ worldofpeace ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 20618e3c5d5..05f24d84e35 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.37"; + version = "1.40"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "1lhpzd46mpr3bq13qhd0bq724db5fhc8jplfb684c2q7sc4v92nk"; + sha256 = "0qc3hai6fhn4amk5ixmxx3yswsi25qpax0r9nvvnyhbcb6crqcs1"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index c7df55118c7..cf3a8ae4197 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -10,7 +10,7 @@ , python3 , pkgconfig , glib -, libhandy +, libhandy_0 , gtk3 , dbus , openssl @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ glib gtk3 - libhandy + libhandy_0 dbus openssl sqlite diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 405217675a3..14cda8a81b5 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2, alsaLib }: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }: -stdenv.mkDerivation { - name = "jackmix-0.5.2"; - src = fetchurl { - url = "https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz"; - sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; +mkDerivation rec { + pname = "jackmix"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "kampfschlaefer"; + repo = "jackmix"; + rev = version; + sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h"; }; patches = [ ./no_error.patch ]; nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ]; buildInputs = [ - qt4 + qtbase lash jack alsaLib @@ -21,11 +25,11 @@ stdenv.mkDerivation { install -D jackmix/jackmix $out/bin/jackmix ''; - meta = { + meta = with lib; { description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; - homepage = "http://www.arnoldarts.de/jackmix/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/kampfschlaefer/jackmix"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ kampfschlaefer ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/applications/audio/jackmix/no_error.patch index d1a714ded9c..593800134e1 100644 --- a/pkgs/applications/audio/jackmix/no_error.patch +++ b/pkgs/applications/audio/jackmix/no_error.patch @@ -1,13 +1,13 @@ diff --git a/SConstruct b/SConstruct -index 4290fa5..0a7a679 100644 +index 8bf6517..a432aa9 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ env = Environment( - env.Replace( LIBS="" ) - env.Replace( LIBPATH="" ) - --env.MergeFlags( ['-Wall', '-Werror', '-g', '-fpic'] ) -+env.MergeFlags( ['-g', '-fpic'] ) - - tests = { } - tests.update( env['PKGCONFIG_TESTS'] ) + env.Replace(LIBS="") + env.Replace(LIBPATH="") + +-env.MergeFlags(['-Wall', '-Werror', '-g', '-fpic', '-std=c++11']) ++env.MergeFlags(['-g', '-fpic', '-std=c++11']) + + tests = {} + tests.update(env['PKGCONFIG_TESTS']) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index f325185920d..14ab2aaf2d0 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -7,6 +7,7 @@ , python3 , gtk3 , gst_all_1 +, libhandy , libsecret , libsoup , appstream-glib @@ -24,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.3.2"; + version = "1.4.5"; format = "other"; doCheck = false; @@ -33,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "14854j1dhq67s1vzs0lqy345vbl6f5w8nb36n4i33fmpva2flsk3"; + sha256 = "1i5qcpp3fpkda08g6nkiiff8lsjmv5xsvpa0512kigq5z0lsagrx"; }; nativeBuildInputs = [ @@ -57,6 +58,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly gstreamer gtk3 + libhandy libsoup pango totem-pl-parser diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 8870a144c9f..4a2ae29f36a 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { pname = "musescore-darwin"; version = concatStringsSep "." versionComponents; + # The disk image contains the .app and a symlink to /Applications. + sourceRoot = "${appName}.app"; + src = fetchurl { url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; sha256 = "19xkaxlkbrhvfip6n3iw6q7463ngr6y5gfisrpjqg2xl2igyl795"; diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 8fc0616ff73..c6d1a264a9c 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.93.1"; + version = "0.95.0"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "05qsxyr7x8l0vlmn4yjg4gglxvcw9raf6vfzvblsl2ngsdsrnizy"; + sha256 = "16ksr4yjkg88bpij1i49dzi07ffhqq8b36r090y4fq5czrc420rc"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 19f6d7bfb5a..0de043d35db 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.9.2"; + version = "3.9.5"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "1fvpba3dnzb7sm6gp0znbrima02ckfiy2zwb66x1gr05y9a56inv"; + sha256 = "13hvdfydlgp2qf49ddhdzghz5jkyx1rhnsj8sf8khfxf9k8phkjd"; }; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 0646407582e..91bf47dddd6 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.2"; + version = "0.5.3"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1cwpc4j90dpxa2siia68rg9qwwm2xk6bhxnslfjj364507jy6s4l"; + sha256 = "1f155yf5v57dwhzb7z0kh67lckr3yq4x8040dm54qgbxw582la77"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index 85890d8e83b..da4db5f159a 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.3.4.1"; + version = "0.3.5"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "0rjyhxfad864w84n0bxyhc1jjxhzwwdx26r6psba2582g90cv024"; + sha256 = "0mgn7lkpgj72hsybnnj0kpfyls4aha1qvv4nhdyclqdfbb6mldxg"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 556dd5f1061..42e780af098 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -18,8 +18,12 @@ let pulseSources = runCommand "pulseaudio-sources" {} '' mkdir $out - tar -xf ${pulseaudio.src} - mv pulseaudio*/* $out/ + if [ -d ${pulseaudio.src} ]; then + ln -s ${pulseaudio.src}/* $out/ + else + tar -xf ${pulseaudio.src} + mv pulseaudio*/* $out/ + fi ''; in stdenv.mkDerivation rec { @@ -61,7 +65,7 @@ in stdenv.mkDerivation rec { # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version} - substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version} + substituteInPlace CMakeLists.txt --replace '${"\${PULSE_DIR}"}' ${pulseaudio.pulseDir} # Fraunhofer recommends to enable afterburner but upstream has it set to false by default substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \ @@ -72,7 +76,7 @@ in stdenv.mkDerivation rec { for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ + --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/${pulseaudio.pulseDir}/modules:$orig_rpath" \ "$so" done ''; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch index 3c498fe8af1..7cdb7de4dd1 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch +++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch @@ -8,4 +8,4 @@ index 8d20dbf..63fe7ba 100644 module-bluetooth-policy - LIBRARY DESTINATION ${PulseAudio_modlibexecdir}) - -+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PULSE_DIR}/modules/) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 84ff9f787d5..e6f41711fdf 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.4.1"; + name = "qmmp-1.4.2"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "0p18r2ri75vbyjzfa7bcl1dm372m6jvn9zj2p5ia2rh1g77fbm9a"; + sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 2975e6464e1..961314088d1 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.15"; + version = "0.9.18"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx"; + sha256 = "121vmygdzp37p6f93f8dbbg2m2r55j7amyiapzkqgypgn4vfdbwr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 86f8f666d80..17b3f1c3745 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }: +{ mkDerivation, lib, fetchurl, pkgconfig, libjack2 +, alsaLib, liblo, libsndfile, lv2, qtbase, qttools +, rubberband +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "samplv1"; - version = "0.9.13"; + version = "0.9.18"; src = fetchurl { url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; - sha256 = "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m"; + sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4="; }; - buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; + nativeBuildInputs = [ qttools pkgconfig ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; homepage = "http://samplv1.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 055694fb40f..3572bbf88ab 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -8,7 +8,7 @@ , glib , gst_all_1 , gtk3 -, libhandy +, libhandy_0 , meson , ninja , openssl @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { gdk-pixbuf glib gtk3 - libhandy + libhandy_0 openssl sqlite ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/applications/audio/spotify-cli-linux/default.nix new file mode 100644 index 00000000000..da41fb6b64e --- /dev/null +++ b/pkgs/applications/audio/spotify-cli-linux/default.nix @@ -0,0 +1,29 @@ +{ stdenv, python3Packages, dbus }: +python3Packages.buildPythonApplication rec { + pname = "spotify-cli-linux"; + version = "1.6.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0slyc3jfrj3rwq8rv6p5aqkw487aw7a87kmf1fb6n4vnvcf08v7w"; + }; + + preBuild = '' + substituteInPlace spotifycli/spotifycli.py \ + --replace dbus-send ${dbus}/bin/dbus-send + ''; + + disabled = !python3Packages.isPy3k; + propagatedBuildInputs = with python3Packages; [ lyricwikia dbus-python ]; + + # upstream has no code tests, but uses its "tests" for linting and formatting checks + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://pwittchen.github.io/spotify-cli-linux/"; + maintainers = [ maintainers.kmein ]; + description = "A command line interface to Spotify on Linux."; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 6fd52834b00..ff44f14476f 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -10,14 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.42.622.gbd112320-37"; + version = "1.1.46.916.g416cacf1"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "42"; + rev = "43"; deps = [ alsaLib @@ -78,7 +78,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "06371c6a285aba916a779cd9f2a933f97db8fb38393545baa94c8984302e003c559af7b1b35afd7df5f2c35e379e2cb80c00facf527bc22df09061cdb67d9d7a"; + sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1"; }; buildInputs = [ squashfsTools makeWrapper ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 121f9cbc960..dcb5737afa6 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { description = "An open source Spotify client running as a UNIX daemon"; homepage = "https://github.com/Spotifyd/spotifyd"; license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ anderslundstedt filalex77 marsam ]; + maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index fa6ee383c9e..9243bc66544 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-tJcpjviCXA1Y/PX1jlXphXZZMWBAAg3kdbsj41tmunE="; + sha256 = "0v3rbpaz6pqkam0cj86ydq8gc2rhas8mhwgvy31djvxng9nv3h5j"; }; buildInputs = [ diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 0f8e5143883..d5b67819cb0 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -1,37 +1,24 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub, autoreconfHook, popt }: stdenv.mkDerivation { pname = "svox"; - version = "2017-07-18"; + version = "2018-02-14"; - src = fetchgit { - url = "https://android.googlesource.com/platform/external/svox"; - rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb"; - sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r"; + # basically took the source code from android and borrowed autotool patches from debian + src = fetchFromGitHub { + owner = "naggety"; + repo = "picotts"; + rev = "e3ba46009ee868911fa0b53db672a55f9cc13b1c"; + sha256 = "0k3m7vh1ak9gmxd83x29cvhzfkybgz5hnlhd9xj19l1bjyx84s8v"; }; postPatch = '' cd pico ''; - buildPhase = '' - cd lib - for i in *.c; do - $CC -O2 -fPIC -c -o ''${i%.c}.o $i - done - $CC -shared -o libttspico.so *.o - cd .. - ''; - - installPhase = '' - install -Dm755 lib/libttspico.so $out/lib/libttspico.so - mkdir -p $out/include - cp lib/*.h $out/include - mkdir -p $out/share/pico/lang - cp lang/*.bin $out/share/pico/lang - ''; + buildInputs = [ popt ]; - NIX_CFLAGS_COMPILE = "-include stdint.h"; + nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { description = "Text-to-speech engine"; diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index 62ae1d2c049..dfae5d40e11 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, cmake, pkgconfig, alsaLib, libjack2, qt4 }: +{ mkDerivation, lib, fetchurl, cmake, pkg-config +, qttools, qtx11extras, drumstick +, docbook-xsl-nons +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "vmpk"; - version = "0.5.1"; + version = "0.7.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc"; + sha256 = "5oLrjQADg59Mxpb0CNLQAE574IOSYLDLJNaQ/9q2cMQ="; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ]; - buildInputs = [ alsaLib libjack2 qt4 ]; + buildInputs = [ qtx11extras drumstick ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual MIDI Piano Keyboard"; homepage = "http://vmpk.sourceforge.net/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index ad4fc9728be..e4898baca54 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -12,7 +12,7 @@ , coreutils , libsoup , libsecret -, libhandy +, libhandy_0 , wrapGAppsHook , libgpgerror , json-glib @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "42.4"; + version = "42.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "c4E6mHYVb8TWVTVlmHidcLa9ebHJ27iStsNNLJhY8vY="; + sha256 = "1xgsd9a9y36lv6f2vjw2nxi9zj2zl1gv6rcyzkqajf91vgmxwf8k"; }; patches = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { glib gtk3 libsecret - libhandy + libhandy_0 libgpgerror json-glib ]; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 706acebba55..6b686d0b2d6 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "0bxzpwwb42bppqli3zggx3lah7g6kwmy6k6k6dinypj6x0bafqcg"; + sha256 = "1zi559ixjxxsrpvvjbxa1d0g96px3h9amjvy149sfhp7b8w5hhk3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index c48cd7bb49c..5630cb20d4d 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.10.23"; + version = "20.11.10"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "083hcxljqg36ilpy6xa4j455ngpc775qgam0dbj26kg7sh33dz2c"; + sha256 = "1a7qrh5mdkqpz5cpk5jdq0s2cfrvn7ja76r5cmhs70ba1xnzd8rq"; }; sourceRoot = "."; diff --git a/pkgs/applications/blockchains/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix deleted file mode 100644 index cc28fff96c4..00000000000 --- a/pkgs/applications/blockchains/freicoin.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, qt4, qmake4Hook }: - -stdenv.mkDerivation rec { - version = "0.8.6-2"; - pname = "freicoin"; - - src = fetchFromGitHub { - owner = "freicoin"; - repo = "freicoin"; - rev = "v${version}"; - sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h"; - }; - - enableParallelBuilding = false; - - qmakeFlags = ["USE_UPNP=-"]; - - # I think that openssl and zlib are required, but come through other - # packages - - preBuild = "unset AR"; - - installPhase = '' - mkdir -p $out/bin - cp freicoin-qt $out/bin - ''; - - nativeBuildInputs = [ qmake4Hook ]; - buildInputs = [ db boost gmp mpfr qt4 ]; - - meta = with stdenv.lib; { - description = "Peer-to-peer currency with demurrage fee"; - homepage = "http://freicoi.in/"; - license = licenses.mit; - maintainers = [ maintainers.viric ]; - platforms = platforms.linux; - - # upstream doesn't support newer openssl versions, use 1.0.1 for testing - broken = true; - }; -} diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 8e932195067..b0f464cbfdc 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.23"; + version = "1.9.24"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0w65sln5l3sxwzxwjvyaial0m1kxhivhw8xwl5faxxxlk50rs4wm"; + sha256 = "0nrx5fwfij9wajd3lj76hh1yv4zg4q3jc76a76m22djn1njl0n5j"; }; runVend = true; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index da0449f41d1..4c4f3f2b29e 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.15.0"; + version = "2.16.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "06sm4ah05j0f3bxb1sbdi8mazmxk166y2gaycll6p2xhd105ins3"; + sha256 = "16z2cy41vxbrvjblj09in6669pks1p9y3rgx8b7afjwf102ba9yi"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 8cd03f34286..6275a26118f 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,5 +1,6 @@ { stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub +, fetchpatch , cmake, qttools, pkgconfig , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns @@ -27,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.1"; + version = "0.17.1.4"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx"; + sha256 = "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng"; }; nativeBuildInputs = [ @@ -58,7 +59,14 @@ stdenv.mkDerivation rec { chmod -R +w source/monero ''; - patches = [ ./move-log-file.patch ]; + patches = [ + ./move-log-file.patch + # fix build failure due to invalid use of CMAKE_PREFIX_PATH + (fetchpatch { + url = "https://github.com/monero-project/monero-gui/commit/ef2be82c21b0934522ad8e110805b66f5948da1f.patch"; + sha256 = "1rhazk2xwa5dv1cmkrkq8yr08qxslg4k929cvlliabrx20kbr5z5"; + }) + ]; postPatch = '' # set monero-gui version diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 29acbd0f37b..1010da81da3 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.1"; + version = "0.17.1.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "18x27dm24k04vx0yz57zi02rk0wrmbn4wr8alqf48dq6z9wr0fhp"; + sha256 = "1ddkdfd8i5q509qziwcx1f6nm8axs4a1ppzv2y5lgsqpq375if6j"; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 7d5acc62050..563b2378f84 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -5,23 +5,23 @@ , llvmPackages , openssl , pkg-config +, stdenv , systemd +, darwin }: rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "08dkcrga1x18csh6pw6f54x5xwijppyjhg46cf4p452xc1l3a6ir"; + sha256 = "cs84Zz0nhagGDu5sDFTaFZF3SPEgJU8F4vGX7KLihOM="; }; - cargoSha256 = "1xliragihwjfc5qmfm0ng519bw8a28m1w1yqcl9mpk8zywiybaah"; - - cargoPatches = [ ./lock.patch ]; + cargoSha256 = "6suNkHw1BbISb0MkYkUaD+mpUal+kn3y1SFVqzJFqJc="; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ @@ -31,7 +31,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ openssl systemd ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isLinux [ systemd ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; cargoBuildFlags = [ "--features final" ]; @@ -43,6 +45,6 @@ rustPlatform.buildRustPackage rec { homepage = "http://parity.io/ethereum"; license = licenses.gpl3; maintainers = with maintainers; [ akru xrelkd ]; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/blockchains/openethereum/lock.patch b/pkgs/applications/blockchains/openethereum/lock.patch deleted file mode 100644 index 66709480bb7..00000000000 --- a/pkgs/applications/blockchains/openethereum/lock.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /nix/store/hv764a65zmfzw5scjhz5839agv10da6x-source/Cargo.lock 1969-12-31 16:00:01.000000000 -0800 -+++ ./Cargo.lock 2020-07-31 21:30:31.146750066 -0700 -@@ -3113,7 +3113,7 @@ - - [[package]] - name = "openethereum" --version = "3.0.0" -+version = "3.0.1" - dependencies = [ - "ansi_term", - "atty", -@@ -3562,7 +3562,7 @@ - - [[package]] - name = "parity-version" --version = "3.0.0" -+version = "3.0.1" - dependencies = [ - "parity-bytes", - "rlp", diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 16ea2dc43e7..5a59bb4b7de 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { Zero Knowledge cryptography proofs for industry-leading transaction anonymity. ''; license = licenses.mit; - homepage = "https://www.dash.org"; + homepage = "https://pivx.org"; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 19382544551..866adeea278 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.26"; + version = "0.8.26-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "1bvma6k3gsjqh8w76k4kf52sjg8wxn1b7a409kmnmmvmd9j6z5ia"; + sha256 = "17ji1gjrx3gzw4msaz9kgvm132y14wgh8z183l3mfw1cj44a6kqk"; }; - cargoSha256 = "0pacmmvvjgzmaxgg47qbfhqwl02jxj3i6vnmkjbj9npzqfmqf72d"; + cargoSha256 = "07zwlwx02xw1y20br2c4grwv7bprhynqy7gav4qh3vw117ijpiqk"; nativeBuildInputs = [ clang ]; diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix index 5a525dec999..eb98777c587 100644 --- a/pkgs/applications/blockchains/quorum.nix +++ b/pkgs/applications/blockchains/quorum.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, git, which }: +{ stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: buildGoPackage rec { pname = "quorum"; @@ -25,6 +25,12 @@ buildGoPackage rec { cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin ''; + # fails with `GOFLAGS=-trimpath` + allowGoReference = true; + preFixup = '' + find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' + + ''; + meta = with stdenv.lib; { description = "A permissioned implementation of Ethereum supporting data privacy"; homepage = "https://www.goquorum.com/"; diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix new file mode 100644 index 00000000000..eae1b812a3d --- /dev/null +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "turbo-geth"; + version = "2020.11.02"; + + src = fetchFromGitHub { + owner = "ledgerwatch"; + repo = pname; + rev = "v${version}"; + sha256 = "1bfywbg6mm3q4wd0mslcv5sj779277izzlqawqvqy3yxnpb6cwj5"; + }; + + vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr"; + runVend = true; + + subPackages = [ + "cmd/tg" + "cmd/restapi" + "cmd/rpcdaemon" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ledgerwatch/turbo-geth/"; + description = "Ethereum node and geth fork focused on scalability and modularity"; + license = with licenses; [ lgpl3 gpl3 ]; + maintainers = with maintainers; [ xwvvvvwx ]; + }; +} diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 3b4ec1c49c4..e566661d36a 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.12"; + version = "1.1.12.2"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4"; + sha256 = "0nl7n24nsy3gyzrxa6llx81pvsjqcwi0a4qdv34dpcq483aclp2r"; }; dontBuild = true; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index cca7b0b2f41..51c7ebcc907 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,9 +9,9 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.1.0.19"; # "Android Studio 4.1.0" - build = "201.6858069"; - sha256Hash = "sha256-S5Uh/EpjE61l/z4UsPP7UEJ9Rk/hQidVVWX0bg/60gI="; + version = "4.1.1.0"; # "Android Studio 4.1.1" + build = "201.6953283"; + sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os="; }; betaVersion = { version = "4.1.0.18"; # "Android Studio 4.1 RC 3" diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index c7ac671c15b..48c83b05310 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "bluefish-2.2.11"; + name = "bluefish-2.2.12"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1zy2ppdg3nq9iy3zgfhnw93bq5zbbhyampf7bk3grpfvq5zqfk25"; + sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 218fbe8fc1f..0282dc95f72 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,6 +1,6 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender , zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk -, makeWrapper, ... }: +, makeWrapper, perl, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }: @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications mkdir -p $out/share/pixmaps ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm + + # ensure eclipse.ini does not try to use a justj jvm, as those aren't compatible with nix + ${perl}/bin/perl -i -p0e 's|-vm\nplugins/org.eclipse.justj.*/jre/bin\n||' $out/eclipse/eclipse.ini ''; # */ meta = { diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 87ac29b58e9..0afbecb84cf 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -10,13 +10,16 @@ assert stdenv ? glibc; # https://download.eclipse.org/eclipse/downloads/ is the main place to # find the downloads needed for new versions +# +# to test: +# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done let platform_major = "4"; - platform_minor = "16"; + platform_minor = "17"; year = "2020"; - month = "06"; - timestamp = "${year}${month}040540"; + month = "09"; + timestamp = "${year}${month}021800"; gtk = gtk3; in rec { @@ -34,7 +37,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "0vfxzsvfv9zmd0ckrdpziijzskh13g8kgk8ibkwmhmqmj14a3visk6yvn5q2s0knkswl1zy9arinw0mxvqh72dfj63vwc01vhp06lyr"; + sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh"; }; }; @@ -46,7 +49,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "29nr1x3fgdw5ygrppfma6yi1iaqvad24jyb58sag735z1nz4ymajcwakg52mlv3s19d4w8cxpskh1r459mwz7j769qplymspqifvlkd"; + sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y"; }; }; @@ -58,7 +61,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2pm4xam0jn9x34k1hr5rn67fpvc6snlkpcfn4bzdcf2xjv9f3dr2039mkcrhri5nv2bj6fkbai6aga6fmmrb3na33b7ir7sqlqqn61b"; + sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9"; }; }; @@ -83,7 +86,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "195c07yabmi2a42qxfmpbv6ychpj15bbpgyp40s1pcdb3p875vcqjinq9dqy2sixzwjhfdrggpvwihav87rkih9arzmk2s4cm31mjqd"; + sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k"; }; }; @@ -95,7 +98,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3n8jllgxarrxgz16n7zb4bgaqxk0m9frcxrgdxvy25ar2iw8js4q4ir3cc20y4ri3ii74rf3jy6n4ndhm57miwqh4p2wqzhfjlinirb"; + sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q"; }; }; @@ -107,7 +110,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "1l0gc7srpvn3r0yrbrp1pjv1a3n1y7q5fqww5fmzyw1d6j3hjkqj74c9bff16579cpf7z6d4wmj6kr7z89p0ignrx319gc8p0hivi1y"; + sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1"; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 4edb7a7ebc4..cdf36bc3c21 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "9.11.1"; + version = "10.0.1"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.11/${name}/${name}.zip"; - sha256 = "00cpaal6jm9xb4nbkljrf381r3lf1rb1p06vrbn4l0lxnbckb9df"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip"; + sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5"; }; meta = with stdenv.lib; { @@ -475,12 +475,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.16"; + version = "4.17"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202006040540/org.eclipse.jdt-${version}.zip"; - sha256 = "0g349hg2nv1y628daxf84396wpf33z52wxv0gawlgrirbbizaznd"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip"; + sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index f2904f3e012..2de45d03dd6 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -22,6 +22,7 @@ , srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el , nativeComp ? false +, withImageMagick ? lib.versionOlder version "27" && (withX || withNS) , toolkit ? ( if withGTK2 then "gtk2" else if withGTK3 then "gtk3" @@ -101,7 +102,8 @@ in stdenv.mkDerivation { ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft gconf cairo ] - ++ lib.optionals (withX || withNS) [ imagemagick librsvg ] + ++ lib.optionals (withX || withNS) [ librsvg ] + ++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] @@ -126,6 +128,7 @@ in stdenv.mkDerivation { "--with-gif=no" "--with-tiff=no" ]) ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-nativecomp" + ++ lib.optional withImageMagick "--with-imagemagick" ; installTargets = [ "tags" "install" ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index d56e5acc71b..124d4ee0417 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "geany"; - version = "1.37"; + version = "1.37.1"; outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://download.geany.org/${pname}-${version}.tar.bz2"; - sha256 = "dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51"; + sha256 = "060sachn33xpx3a609f09y97qq5ky17gvv686zbvrn618ij7bi8q"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 1dc140f3e09..0ba13c99671 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; license = licenses.mit; - maintainers = with maintainers; [ ehmry filalex77 penguwin ]; + maintainers = with maintainers; [ ehmry Br1ght0ne penguwin ]; }; } diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index a94ab58a78f..6704702837a 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.36.1"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17pvmd5jypar8dkr6w56hvf7jnq4l1wih2wwgkrv7sblr7rkkar2"; + sha256 = "06wcyfrwcjyj2vcqyw0z3sy1r4qxpcdpwqq1qmpsaphpz8acycjn"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 695a13eecab..ffdeb21de7f 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let - version = "3.36.0"; + version = "3.38.0"; pname = "gnome-latex"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1869kr1zhcp04mzbi67lwgk497w840dbbc7427i9yh9b9s7j6mqn"; + sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/applications/editors/lite/default.nix index 908ecf2bdd7..2f439723498 100644 --- a/pkgs/applications/editors/lite/default.nix +++ b/pkgs/applications/editors/lite/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "A lightweight text editor written in Lua"; homepage = "https://github.com/rxi/lite"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 6909af712fa..04bd6c7b4b8 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,10 +1,6 @@ -{ stdenv, fetchurl, fetchFromGitHub -, ncurses -, texinfo -, gettext ? null -, enableNls ? true -, enableTiny ? false -}: +{ stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript +, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests +, gettext ? null, enableNls ? true, enableTiny ? false }: assert enableNls -> (gettext != null); @@ -44,13 +40,42 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + tests = { inherit (nixosTests) nano; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + git + nixfmt + nix + coreutils + gnused + ] + } + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git://git.savannah.gnu.org/nano.git '*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + + if [ ! "$oldVersion" = "$latestTag" ]; then + update-source-version ${pname} "$latestTag" --version-key=version --print-changes + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix" + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + meta = { homepage = "https://www.nano-editor.org/"; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ - joachifm - ]; + maintainers = with maintainers; [ joachifm nequissimus ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 869c20c1d6c..eb026f6dca3 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -24,6 +24,10 @@ mkDerivation rec { python3Packages.lxml ]; + prePatch = '' + sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install + ''; + dontWrapQtApps = true; preFixup = '' diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 32892c7c26e..9c37d00c9ee 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, callPackage, fetchurl, fetchpatch, +{ lib, mkDerivation, callPackage, fetchFromGitHub, guile_1_8, qtbase, xmodmap, which, freetype, libjpeg, sqlite, @@ -16,7 +16,7 @@ let pname = "TeXmacs"; - version = "1.99.14"; + version = "1.99.15"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; @@ -24,9 +24,11 @@ in mkDerivation { name = "${pname}-${version}"; - src = fetchurl { - url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "1zbl1ddhppgnn3j213jl1b9mn8zmwnknxiqswm25p4llj0mqcgna"; + src = fetchFromGitHub { + owner = "texmacs"; + repo = "texmacs"; + rev = "v${version}"; + sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 77d7ca983cd..aa8120470d1 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,5 +1,5 @@ { source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext -, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby +, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -62,8 +62,6 @@ let common = callPackage ./common.nix {}; - isPython3 = python.isPy3 or false; - in stdenv.mkDerivation rec { pname = "vim_configurable"; @@ -106,9 +104,10 @@ in stdenv.mkDerivation rec { "--with-luajit" ] ++ stdenv.lib.optionals pythonSupport [ - "--enable-python${if isPython3 then "3" else ""}interp=yes" - "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib" - "--disable-python${if (!isPython3) then "3" else ""}interp" + "--enable-python3interp=yes" + "--with-python3-config-dir=${python3}/lib" + # Disables Python 2 + "--disable-pythoninterp" ] ++ stdenv.lib.optional nlsSupport "--enable-nls" ++ stdenv.lib.optional perlSupport "--enable-perlinterp" @@ -134,7 +133,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ] ++ stdenv.lib.optional luaSupport lua - ++ stdenv.lib.optional pythonSupport python + ++ stdenv.lib.optional pythonSupport python3 ++ stdenv.lib.optional tclSupport tcl ++ stdenv.lib.optional rubySupport ruby; @@ -163,7 +162,7 @@ in stdenv.mkDerivation rec { ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' - wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" + wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' rewrap () { diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ce6122bddc4..70f62117710 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "18fx2nsgn09l2gzgr1abi0cp4g8z2v9177sdl2rqr0yvmwk5i3p0"; - x86_64-darwin = "14qdfz8q1dz0skkcgpamksgdvgsid2mcm9h09cvkh4z3v458100r"; + x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n"; + x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.51.0"; + version = "1.51.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 6cfcb491afe..b8ca7e3f262 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 = "0qims8qypx6aackw1b47pb7hkf0lffh94c69bm5rld2swzczcfnj"; - x86_64-darwin = "1i96qhynjl1ihycq25xjakqlyvszindg5g8kgyhd6ab0q0zhmxqy"; + x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb"; + x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.51.0"; + version = "1.51.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/gis/saga/clang_patch.patch b/pkgs/applications/gis/saga/clang_patch.patch deleted file mode 100644 index e6af8d13051..00000000000 --- a/pkgs/applications/gis/saga/clang_patch.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e92b250968e9656084ab5984689747ca615ff6e7 -Author: Volker Wichmann <wichmann@laserdata.at> -Date: Sun Mar 5 13:49:53 2017 +0100 - - saga_api, CSG_Table::Del_Records(): bug fix, check record count correctly - -diff --git a/src/saga_core/saga_api/table.cpp b/src/saga_core/saga_api/table.cpp -index 76a1d8d..fa1a66f 100644 ---- a/src/saga_core/saga_api/table.cpp -+++ b/src/saga_core/saga_api/table.cpp -@@ -901,7 +901,7 @@ bool CSG_Table::Del_Record(int iRecord) - //--------------------------------------------------------- - bool CSG_Table::Del_Records(void) - { -- if( m_Records > 0 ) -+ if( m_nRecords > 0 ) - { - _Index_Destroy(); - diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index aa418148209..50df22c186c 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,4 +1,6 @@ { stdenv +, mkDerivation +, lib , fetchurl # native , autoreconfHook @@ -28,13 +30,13 @@ , fftw }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "saga"; - version = "7.7.0"; + version = "7.8.1"; src = fetchurl { - url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${stdenv.lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "1nmvrlcpcm2pas9pnav13iydnym9d8yqqnwq47lm0j6b0a2wy9zk"; + url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; + sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM="; }; nativeBuildInputs = [ @@ -68,7 +70,7 @@ stdenv.mkDerivation rec { ] # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ Cocoa unixODBC poppler @@ -76,16 +78,11 @@ stdenv.mkDerivation rec { sqlite ]; - patches = [ - # See https://sourceforge.net/p/saga-gis/bugs/280/ - ./opencv4.patch - ]; - enableParallelBuilding = true; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "System for Automated Geoscientific Analyses"; homepage = "http://www.saga-gis.org"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/gis/saga/finite.patch b/pkgs/applications/gis/saga/finite.patch deleted file mode 100644 index 7f60743534b..00000000000 --- a/pkgs/applications/gis/saga/finite.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/saga-gis/src/modules/imagery/imagery_maxent/me.cpp b/saga-gis/src/modules/imagery/imagery_maxent/me.cpp -index c5da854..d3e9cff 100755 ---- a/src/modules/imagery/imagery_maxent/me.cpp -+++ b/src/modules/imagery/imagery_maxent/me.cpp -@@ -21,7 +21,7 @@ - #ifdef _SAGA_MSW - #define isinf(x) (!_finite(x)) - #else --#define isinf(x) (!finite(x)) -+#define isinf(x) (!isfinite(x)) - #endif - - /** The input array contains a set of log probabilities lp1, lp2, lp3 diff --git a/pkgs/applications/gis/saga/opencv4.patch b/pkgs/applications/gis/saga/opencv4.patch deleted file mode 100644 index 0b26192bf09..00000000000 --- a/pkgs/applications/gis/saga/opencv4.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/tools/imagery/imagery_opencv/Makefile.am -+++ b/src/tools/imagery/imagery_opencv/Makefile.am -@@ -7,9 +7,9 @@ - - if HAVE_CV - DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD --CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv -+CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags` - AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS) --AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs` -+AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs` - pkglib_LTLIBRARIES = libimagery_opencv.la - libimagery_opencv_la_SOURCES =\ - MLB_Interface.cpp\ diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index 4038d653a3d..4d0cc46bb59 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Native Linux Design application built in Vala and GTK"; homepage = "https://github.com/akiraux/Akira"; license = licenses.gpl3; - maintainers = with maintainers; [ filalex77 neonfuz ] ++ pantheon.maintainers; + maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 5c76e523c02..2d630c8ccbd 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.7.9"; + version = "13.9.5"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "1h0baxh9gvshdfqb77x5m8v95lw4lw4djj3gwrna0jjpfhmcs4vq"; + sha256 = "1glklqpbx28ssi41cdshckgvix24wkqmsw0rgf964vjc28qgfy1s"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 025f97b54e6..4ba7cb8eb03 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -163,8 +163,10 @@ in stdenv.mkDerivation rec { # The declarations for `gimp-with-plugins` wrapper, # used for determining plug-in installation paths majorVersion = "${lib.versions.major version}.0"; - targetPluginDir = "lib/gimp/${majorVersion}/plug-ins"; - targetScriptDir = "share/gimp/${majorVersion}/scripts"; + targetLibDir = "lib/gimp/${majorVersion}"; + targetDataDir = "share/gimp/${majorVersion}"; + targetPluginDir = "${targetLibDir}/plug-ins"; + targetScriptDir = "${targetDataDir}/scripts"; # probably its a good idea to use the same gtk in plugins ? gtk = gtk2; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 97c0429a996..84f5abfce06 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -1,33 +1,51 @@ -# install these packages into your profile. Then add -# ~/.nix-profile/gimp-version-plugins to your plugin list you can find at -# preferences -> Folders -> Plug-ins -# same applies for the scripts +# Use `gimp-with-plugins` package for GIMP with all plug-ins. +# If you just want a subset of plug-ins, you can specify them explicitly: +# `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`. + +{ config, lib, pkgs }: + +let + inherit (pkgs) stdenv fetchurl pkg-config intltool glib fetchFromGitHub; +in + +lib.makeScope pkgs.newScope (self: -{ config, pkgs, gimp }: let - inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub; - inherit (gimp) targetPluginDir targetScriptDir; + # Use GIMP from the scope. + inherit (self) gimp; - pluginDerivation = a: let - name = a.name or "${a.pname}-${a.version}"; + pluginDerivation = attrs: let + name = attrs.name or "${attrs.pname}-${attrs.version}"; in stdenv.mkDerivation ({ prePhases = "extraLib"; extraLib = '' installScripts(){ - mkdir -p $out/${targetScriptDir}/${name}; - for p in "$@"; do cp "$p" -r $out/${targetScriptDir}/${name}; done + mkdir -p $out/${gimp.targetScriptDir}/${name}; + for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done } installPlugins(){ - mkdir -p $out/${targetPluginDir}/${name}; - for p in "$@"; do cp "$p" -r $out/${targetPluginDir}/${name}; done + mkdir -p $out/${gimp.targetPluginDir}/${name}; + for p in "$@"; do cp "$p" -r $out/${gimp.targetPluginDir}/${name}; done } ''; + + # Override installation paths. + PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}"; + PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}"; } - // a + // attrs // { name = "gimp-plugin-${name}"; - buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); - nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []); + buildInputs = [ + gimp + gimp.gtk + glib + ] ++ (attrs.buildInputs or []); + + nativeBuildInputs = [ + pkg-config + intltool + ] ++ (attrs.nativeBuildInputs or []); } ); @@ -35,10 +53,11 @@ let phases = [ "extraLib" "installPhase" ]; installPhase = "installScripts ${src}"; } // attrs); - in +{ + # Allow overriding GIMP package in the scope. + inherit (pkgs) gimp; -stdenv.lib.makeScope pkgs.newScope (self: with self; { gap = pluginDerivation { /* menu: Video @@ -49,10 +68,6 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; NIX_LDFLAGS = "-lm"; - patchPhase = '' - sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ - -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure - ''; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; @@ -99,7 +114,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { version = "2.0.3"; buildInputs = with pkgs; [ fftw ]; nativeBuildInputs = with pkgs; [ autoreconfHook ]; - makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/lib/gimp/2.0" ]; + makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/${gimp.targetLibDir}" ]; src = fetchFromGitHub { owner = "bootchk"; repo = "resynthesizer"; @@ -127,24 +142,25 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { name = "wavelet-sharpen-0.1.2"; NIX_LDFLAGS = "-lm"; src = fetchurl { - url = "http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; + url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; }; installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? }; - lqrPlugin = pluginDerivation { + lqrPlugin = pluginDerivation rec { /* menu: Layer/Liquid Rescale */ - name = "lqr-plugin-0.6.1"; + pname = "lqr-plugin"; + version = "0.7.2"; buildInputs = with pkgs; [ liblqr1 ]; - src = fetchurl { - url = "http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2"; - sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; + src = fetchFromGitHub { + owner = "carlobaldassi"; + repo = "gimp-lqr-plugin"; + rev = "v${version}"; + sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo="; }; - #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"''; - installPhase = "installPlugins src/gimp-lqr-plugin"; }; gmic = pkgs.gmic-qt.override { @@ -196,37 +212,8 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { lightning = scriptDerivation { name = "Lightning"; src = fetchurl { - url = "http://registry.gimp.org/files/Lightning.scm"; + url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/Lightning.scm"; sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49"; }; }; - - /* space in name trouble ? - - rainbowPlasma = scriptDerivation { - # http://registry.gimp.org/node/164 - name = "rainbow-plasma"; - src = fetchurl { - url = "http://registry.gimp.org/files/Rainbow Plasma.scm"; - sha256 = "34308d4c9441f9e7bafa118af7ec9540f10ea0df75e812e2f3aa3fd7b5344c23"; - name = "Rainbow-Plasma.scm"; # nix doesn't like spaces, does it? - }; - }; - */ - - /* doesn't seem to be working :-( - lightningGate = scriptDerivation { - # http://registry.gimp.org/node/153 - name = "lightning-gate"; - src = fetchurl { - url = "http://registry.gimp.org/files/LightningGate.scm"; - sha256 = "181w1zi9a99kn2mfxjp43wkwcgw5vbb6iqjas7a9mhm8p04csys2"; - }; - }; - */ - -} // stdenv.lib.optionalAttrs (config.allowAliases or true) { - - resynthesizer2 = resynthesizer; - }) diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 841728d3a29..7e8ce913f02 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -2,7 +2,7 @@ let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); -selectedPlugins = if plugins == null then allPlugins else plugins; +selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins); extraArgs = map (x: x.wrapArgs or "") selectedPlugins; versionBranch = stdenv.lib.versions.majorMinor gimp.version; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 337b8f4cba6..0d4b06c8c6d 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , at-spi2-core , babl , dbus @@ -35,17 +36,32 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.34.2"; + version = "3.38.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w"; + sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6"; }; patches = [ ./installed-tests-path.patch + + # Port to Tracker 3 + # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch"; + sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch"; + sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch"; + sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index b7a1a8c4a6f..b8b21e71c93 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 zlib libtool libwebp - ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ]; - nativeBuildInputs = [ xz ]; + nativeBuildInputs = [ xz ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 27e8e00bdb3..7dbe03d9f28 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j7cxp4hhkvkckyvll6pmqkv5rwrknlzq9j1my0grb01b8wzhw9y"; + sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 3f8d507e992..e53c36b59cd 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -7,24 +7,24 @@ let bgrabitmap = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgrabitmap"; - rev = "v11.2.4"; - sha256 = "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md"; + rev = "v11.2.5"; + sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1"; }; bgracontrols = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgracontrols"; - rev = "v6.9"; - sha256 = "0hwjlqlwqs4fqxlgay84hccs1lm3c6i9nmq9sxzrip410mggnjyw"; + rev = "v7.0"; + sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy"; }; in stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.1.4"; + version = "7.1.5"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; rev = "v${version}"; - sha256 = "19b0wrjjyvz3g2d2gdsz8ihc1clda5v22yb597an8j9sblp9m0nf"; + sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5"; }; nativeBuildInputs = [ lazarus fpc makeWrapper ]; @@ -56,10 +56,6 @@ in stdenv.mkDerivation rec { # Python is needed for scripts makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \ --prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]} - - substituteInPlace $out/share/applications/lazpaint.desktop \ - --replace /usr/share/pixmaps/lazpaint.png $out/share/pixmaps/lazpaint.png \ - --replace /usr/share/lazpaint/lazpaint $out/bin/lazpaint ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index da5caeff3a0..6d5e9d9b947 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.16"; + version = "0.9.18"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "0xmpglfzff3jpxbr304czsa24fbp497b69yd8kjkjdp2cd0l70qc"; + sha256 = "0inl6zmc1726gmj85jbvq3ra4zphd2ikhrnqphgy2b0c72yh4pf7"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 2c3e9fa865a..3f91fae0beb 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "0cbbbf93gxx768fs6pldy25xk46k7mc8k94r3f7cd83f1qd3s5zn"; + sha256 = "13b1ncpx189ca0h70j5cdp0jwlj95kasysryz1l6g13cwn9n6mii"; }; - vendorSha256 = "1i0w4284icbl40yrjny9qd5iqrq18x63lrs7p1gz58nybc606azx"; + vendorSha256 = "11w9i1829hk1qb9w24dyxv1bi49358a274g60x11fp5x5cw7bqa7"; # No tests doCheck = false; diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix new file mode 100644 index 00000000000..d8080e6fbb4 --- /dev/null +++ b/pkgs/applications/graphics/qvge/default.nix @@ -0,0 +1,39 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, substituteAll +, qmake +, qtx11extras +, graphviz +}: + +mkDerivation rec { + pname = "qvge"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "ArsMasiuk"; + repo = pname; + rev = "v${version}"; + sha256 = "0j4ih03nl6iihhnxrfldkarg9hvxb62lpr58xspn417d3gj6xjll"; + }; + + prePatch = "cd src"; + + patches = (substituteAll { + src = ./set-graphviz-path.patch; + inherit graphviz; + }); + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtx11extras ]; + + meta = with lib; { + description = "Qt Visual Graph Editor"; + homepage = "https://github.com/ArsMasiuk/qvge"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/graphics/qvge/set-graphviz-path.patch b/pkgs/applications/graphics/qvge/set-graphviz-path.patch new file mode 100644 index 00000000000..d18eb81c5d0 --- /dev/null +++ b/pkgs/applications/graphics/qvge/set-graphviz-path.patch @@ -0,0 +1,13 @@ +diff --git i/commonui/CNodeEditorUIController.cpp w/commonui/CNodeEditorUIController.cpp +index 7dacd48..64983e4 100644 +--- i/commonui/CNodeEditorUIController.cpp ++++ w/commonui/CNodeEditorUIController.cpp +@@ -123,7 +123,7 @@ CNodeEditorUIController::CNodeEditorUIController(CMainWindow *parent) : + QString pathToGraphviz = QCoreApplication::applicationDirPath() + "/../tools/graphviz"; + m_optionsData.graphvizPath = QFileInfo(pathToGraphviz).absoluteFilePath(); + #else +- m_optionsData.graphvizPath = ""; ++ m_optionsData.graphvizPath = "@graphviz@/bin"; + #endif + m_gvController->setPathToGraphviz(m_optionsData.graphvizPath); + diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index b6f25795665..001616ab41d 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qview"; - version = "3.0"; + version = "4.0"; src = fetchFromGitHub { owner = "jurplel"; repo = "qView"; rev = version; - sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7"; + sha256 = "15n9cq7w3ckinnx38hvncxrbkv4qm4k51sal41q4y0pkvhmafhnr"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 53e8109fef5..9350d7c5cd7 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { description = "Modern and extensible pixel editor implemented in Rust"; homepage = "https://rx.cloudhead.io/"; license = licenses.gpl3; - maintainers = with maintainers; [ minijackson filalex77 ]; + maintainers = with maintainers; [ minijackson Br1ght0ne ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/vuescan/default.nix b/pkgs/applications/graphics/vuescan/default.nix deleted file mode 100644 index 142e8f0b69f..00000000000 --- a/pkgs/applications/graphics/vuescan/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ stdenv -, fetchurl -, gnutar -, autoPatchelfHook -, glibc -, gtk2 -, xorg -, libgudev -, undmg -}: - -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - pname = "vuescan"; - - # Minor versions are released using the same file name - version = "9.7"; - versionString = builtins.replaceStrings ["."] [""] version; - - src = let - base = "https://www.hamrick.com/files/"; - in { - x86_64-darwin = fetchurl { - url = "${base}/vuex64${versionString}.dmg"; - sha256 = "045ihd2pj0zmzjfwn2qmv5114yvs9vf6mw6sf4x3hwcdmpk40sfh"; - }; - i686-darwin = fetchurl { - url = "${base}/vuex32${versionString}.dmg"; - sha256 = "0nny1jm3s1nr7xm03mcy3zgxvslznnvc8a5gn93gjww6gwg9rcn6"; - }; - x86_64-linux = fetchurl { - url = "${base}/vuex64${versionString}.tgz"; - sha256 = "0jkj92w3y66dcxwq3kkg7vhqxljwf9dqs563xbkh1r7piyjfwycm"; - }; - i686-linux = fetchurl { - url = "${base}/vuex32${versionString}.tgz"; - sha256 = "03qac9c0sg21jwz91nzzwk3ml8byv06ay9wiq00dl62nmhs20r5m"; - }; - aarch64-linux = fetchurl { - url = "${base}/vuea64${versionString}.tgz"; - sha256 = "17viy7kcb78j0p3ik99psabmkgpwpmgvk96wjhn9aar48gpyr1wj"; - }; - armv6l-linux = fetchurl { - url = "${base}/vuea32${versionString}.tgz"; - sha256 = "0m7sp18bdf2l2yf3q3z6c3i0bm4mq2h4ndm6qfvyknip0h11gv7i"; - }; - }.${system} or throwSystem; - - meta = with stdenv.lib; { - description = "Scanner software supporting a wide range of devices"; - homepage = "https://hamrick.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ evax ]; - platforms = [ - "x86_64-darwin" "i686-darwin" - "x86_64-linux" "i686-linux" - "aarch64-linux" "armv6l-linux" - ]; - }; - - linux = stdenv.mkDerivation rec { - inherit pname version src meta; - - # Stripping the binary breaks the license form - dontStrip = true; - - nativeBuildInputs = [ - gnutar - autoPatchelfHook - ]; - - buildInputs = [ - glibc - gtk2 - xorg.libSM - libgudev - ]; - - unpackPhase = '' - tar xfz $src - ''; - - installPhase = '' - install -m755 -D VueScan/vuescan $out/bin/vuescan - ''; - }; - - darwin = stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = { - x86_64-darwin = "vuex64${versionString}.dmg"; - i686-darwin = "vuex32${versionString}.dmg"; - }.${system} or throwSystem; - - installPhase = '' - mkdir -p $out/Applications/VueScan.app - cp -R . $out/Applications/VueScan.app - ''; - }; -in if stdenv.isDarwin - then darwin - else linux diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 4bf707cd043..35d55787ec7 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,6 +1,5 @@ { mkDerivation, lib , extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info -, qtwebkit , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib @@ -17,8 +16,6 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ - # qt - qtwebkit # kde libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui # formats diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix index b51d0d147e2..93588b241e1 100644 --- a/pkgs/applications/kde/kmahjongg.nix +++ b/pkgs/applications/kde/kmahjongg.nix @@ -14,6 +14,6 @@ mkDerivation { buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ]; meta = { license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ genesis ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix index 3641c1b3332..678c21d5870 100644 --- a/pkgs/applications/kde/ksudoku.nix +++ b/pkgs/applications/kde/ksudoku.nix @@ -13,6 +13,6 @@ mkDerivation { buildInputs = [ libGLU kdeclarative libkdegames ]; meta = { license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ genesis ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix index 4b7b8538290..295b9784268 100644 --- a/pkgs/applications/kde/libkmahjongg.nix +++ b/pkgs/applications/kde/libkmahjongg.nix @@ -9,7 +9,7 @@ mkDerivation { name = "libkmahjongg"; meta = { license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ genesis ]; + maintainers = with lib.maintainers; [ ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons ki18n diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 14e1f64ebeb..bcaf4a3627f 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: let - humioCtlVersion = "0.27.0"; - sha256 = "1h65g10dxcaw4wk0gyyyqj9f94xlphj30lp9w6rsfrk4pi3irzr4"; + humioCtlVersion = "0.28.1"; + sha256 = "0vy07nzafqhc14i179sfrzb795yh4pcyjj3py9fwq0nwnmxndby4"; vendorSha256 = "0anvah2rpqvxgmdrdj73k3vbf8073nmsl3aykgvb1nraf3gz3bpk"; in buildGoModule { name = "humioctl-${humioCtlVersion}"; diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 18dbcc9ce26..90fca4ce28c 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf"; + sha256 = "0yc7xgwb3i4m8m9kg2xspqig3s2qgh2i9bkalvnkziayjb7y59qn"; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 77717ff50a2..472eee65518 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0x6msbbqkwxs6msqacpqw4wlw7c9ilf8n6jqmx297ij6isswgksh"; + sha256 = "0mraraby0s213ay2ahqsdvnyg76awbqllrkkx17mrx9z3ykba62d"; }; subPackages = [ "cmd/cheat" ]; diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index a74a3962996..e57ffd35271 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = "v${version}"; - sha256 = "1gkrwh5g69mywlllszy310xpahr8rz8nghjjpiamd85djf1iz43b"; + sha256 = "051jxa07c58ym1w0mwckwxh60v28gqcpqw5nv8sm5wxil1crcayr"; }; goPackagePath = "github.com/miguelmota/cointop"; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 0e5c33c00b5..d3aff8e6b1b 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.2.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Un9tqODwiWsaw66t2m8NyaDF0+hq/e0tmRFi3/T4LMI="; + sha256 = "sha256-LGrFs9JNb0gjXg6IRkUfUOWS+sr1nukzOEWK4XUfkfw="; }; - vendorSha256 = "sha256:1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; + vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; meta = with stdenv.lib; { description = "Query and update data structures from the command line"; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 95159d1927a..0c731aca713 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ mkDerivation +, lib , autoreconfHook , curl , fetchFromGitHub @@ -7,7 +8,7 @@ , libtool , qrencode , udev -, libusb-compat-0_1 +, libusb1 , makeWrapper , pkgconfig , qtbase @@ -46,18 +47,18 @@ let copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; -in stdenv.mkDerivation rec { +in mkDerivation rec { pname = "digitalbitbox"; - version = "2.2.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "digitalbitbox"; repo = "dbb-app"; rev = "v${version}"; - sha256 = "1r77fvqrlaryzij5dfbnigzhvg1d12g96qb2gp8dy3xph1j0k3s1"; + sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA="; }; - nativeBuildInputs = with stdenv.lib; [ + nativeBuildInputs = with lib; [ autoreconfHook curl git @@ -70,7 +71,7 @@ in stdenv.mkDerivation rec { libevent libtool udev - libusb-compat-0_1 + libusb1 qrencode qtbase @@ -93,6 +94,8 @@ in stdenv.mkDerivation rec { "format" ]; + qtWrapperArgs = [ ''--prefix LD_LIBRARY_PATH : $out/lib'' ]; + postInstall = '' mkdir -p "$out/lib" cp src/libbtc/.libs/*.so* $out/lib @@ -103,9 +106,6 @@ in stdenv.mkDerivation rec { # [RPATH][patchelf] Avoid forbidden reference error rm -rf $PWD - wrapProgram "$out/bin/dbb-cli" --prefix LD_LIBRARY_PATH : "$out/lib" - wrapProgram "$out/bin/dbb-app" --prefix LD_LIBRARY_PATH : "$out/lib" - # Provide udev rules as documented in https://digitalbitbox.com/start_linux mkdir -p "$out/etc/udev/rules.d" ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51} @@ -114,7 +114,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A QT based application for the Digital Bitbox hardware wallet"; longDescription = '' Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices. @@ -138,6 +138,5 @@ in stdenv.mkDerivation rec { vidbina ]; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index 0eeb0d9cab6..0c2f25b2653 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dstask"; - version = "0.23"; + version = "0.23.1"; src = fetchFromGitHub { owner = "naggie"; repo = pname; rev = "v${version}"; - sha256 = "15hr0ivwvm2lzpi8l5y5a3hya3i7r85pxna961m24gd4f8gs4cjl"; + sha256 = "0rfz8jim0xqcwdb5n28942v9r3hbvhjrwdgzvbwc9f9psqg2s8d2"; }; # Set vendorSha256 to null because dstask vendors its dependencies (meaning diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ad26a912e78..f2d779c8a65 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -19,7 +19,7 @@ }: let - version = "4.0.3"; + version = "4.0.4"; # electrum is not compatible with dnspython 2.0.0 yet # use the latest 1.x release instead @@ -43,7 +43,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1r40i0v7nm35m3pzbd0l5z4qphl13s31l9v5njmyvpfjirdmhjbv"; + sha256 = "0bzvyfqnd0r0l8syf95hr3nsh8rmmmcs74bvc7v04v0nm5m0fmf1"; extraPostFetch = '' mv $out ./all @@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0q891fgzxvyzjxfczynx92hvclfs8i3nr5nr9sgbvz13hsg4s6lg"; + sha256 = "03dc5jwgp18sism5v4lbqfyn2zljchng8j2yi07yf8i01ivy2mmv"; }; postUnpack = '' diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/applications/misc/epr/default.nix index f67c15f0a99..478422a1c5c 100644 --- a/pkgs/applications/misc/epr/default.nix +++ b/pkgs/applications/misc/epr/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { description = "CLI Epub Reader"; homepage = "https://github.com/wustho/epr"; license = licenses.mit; - maintainers = [ maintainers.filalex77 ]; + maintainers = [ maintainers.Br1ght0ne ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index b2001c21bf7..defbe7520d7 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "0s1l30y55l45rrqd9lygvp2gzrqw25rmjgnnja6s5rzs79gc668c"; + sha256 = "1nc0i824v2szz0j9a5rwl8gygih15xbxnxpnx9d3wr0yq9057q6q"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/applications/misc/gammu/bashcomp-dir.patch index d41aa432cf3..de402595cd3 100644 --- a/pkgs/applications/misc/gammu/bashcomp-dir.patch +++ b/pkgs/applications/misc/gammu/bashcomp-dir.patch @@ -5,7 +5,7 @@ macro_optional_find_package (BashCompletion) if (NOT BASH_COMPLETION_FOUND) - set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") -+ set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") ++ set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions" CACHE PATH "Location of bash_completion.d") endif (NOT BASH_COMPLETION_FOUND) install ( FILES bash-completion/gammu diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index 17aa7e9aa06..44d4727edba 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -14,15 +14,16 @@ , libdazzle , gnome3 , tracker +, libhandy }: stdenv.mkDerivation rec { pname = "gnome-usage"; - version = "3.33.2"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4"; + sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl"; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { libdazzle libgtop tracker + libhandy ]; postPatch = '' diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 1eca26d7be0..7a096b52314 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jarun/googler"; description = "Google Search, Google Site Search, Google News from the terminal"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ koral filalex77 ]; + maintainers = with maintainers; [ koral Br1ght0ne ]; platforms = python.meta.platforms; }; } diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 1bfe642752b..11b373ac131 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.35"; + version = "7.36"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5"; + sha256 = "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j"; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 09717cd6426..1ef00efaf7b 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, +{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, pango, gobject-introspection, wrapGAppsHook, gettext, # Optional packages: enableOSM ? true, osm-gps-map, @@ -9,11 +9,11 @@ let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { - version = "5.0.1"; + version = "5.1.3"; pname = "gramps"; nativeBuildInputs = [ wrapGAppsHook gettext ]; - buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] + buildInputs = [ intltool gtk3 gobject-introspection pango gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map # Graphviz support @@ -26,7 +26,7 @@ in buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; rev = "v${version}"; - sha256 = "1jz1fbjj6byndvir7qxzhd2ryirrd5h2kwndxpp53xdc05z1i8g7"; + sha256 = "109dwkswz2h2328xkqk2zj736d117s9pp7rz5cc1qg2vxn1lpm93"; }; pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index a4932943fa2..74485e2004a 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.3.4"; + version = "3.4.8"; src = fetchzip { url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "14xr0yqklmm4jvj1hnkj89lj83zzs2l1375ni0jbf12gy31jlb2w"; + sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 58f0bc8978f..5bad48edca1 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.78.0"; + version = "0.78.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0la1c6yj9dq9rqxk6m8n8l4cabgzlk0r3was8mvgd80g3x3zn55v"; + sha256 = "1xjxyx520wa6sgvighjp82qqfi0ykfskp0za5j95167c56ss8lm4"; }; - vendorSha256 = "09fvvs85rvvh0z4px2bj5908xf1mrcslkzsz09p0gy5i3zaqfnp9"; + vendorSha256 = "00jjcw76l12ppx3q1xhly7q10jfi2kx62a8z3r1k7m2593k8c4vq"; doCheck = false; @@ -25,6 +25,6 @@ buildGoModule rec { description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; license = licenses.asl20; - maintainers = with maintainers; [ schneefux filalex77 Frostman ]; + maintainers = with maintainers; [ schneefux Br1ght0ne Frostman ]; }; } diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix index bb6956aaa59..f00433a658f 100644 --- a/pkgs/applications/misc/imag/default.nix +++ b/pkgs/applications/misc/imag/default.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { description = "Commandline personal information management suite"; homepage = "https://imag-pim.org/"; license = licenses.lgpl21; - maintainers = with maintainers; [ filalex77 minijackson ]; + maintainers = with maintainers; [ Br1ght0ne minijackson ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index 6be6e842bde..cfb10cfbe2f 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -1,16 +1,20 @@ -{ lib, python3Packages, fetchFromGitHub, wrapQtAppsHook }: +{ lib +, python3Packages +, fetchFromGitHub +, wrapQtAppsHook +}: with python3Packages; buildPythonApplication rec { pname = "inkcut"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1c0mfdfy9iq4l683f3aa7cm7x2w9px83dyigc7655wvaq3bxi2rp"; + sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index be103f3543a..de68e90a4f1 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.2.6"; + version = "1.3.18"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "14svzfhszb0pnsajbydsic0rdc64zp6csqjp6k2p2i20jf0c0im6"; - x86_64-darwin = "1wdv8idnvn5567xdmsaa3f7skv48i9q6jqd4pgv8pz1zkhiqj0wi"; + x86_64-linux = "1dldy137ia8qxhf7d5xzq5slm12bhnmw4kx7fm37n1ajjdcn5sf7"; + x86_64-darwin = "0zm9vhxlfs1ldd8za4yha54psqwl0al4hzdfxjfp7ir98i9a4cj7"; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index a924bd181c0..069d98111cc 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.7.33634"; + version = "0.7.35160"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "0apbdk4fvmn52w9qyh6hvpk3k0sa810jvvndpsbysnlmi7gv5w62"; + sha256 = "00fzycy199l9y738cj71s88qz96ppczb5sqsk3x9w4jj4m6ks239"; stripRoot = false; }; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 75e467d4cdf..be61a76190a 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -2,7 +2,7 @@ , cmake, pkgconfig, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript -, enableMuPDF ? true, mupdf +, enableMuPDF ? true, mupdf_1_17 , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes , enableTesseract ? true, leptonica, tesseract4 @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/ ''; }; - mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: { + mupdf_modded = mupdf_1_17.overrideAttrs ({ patches ? [], ... }: { patches = patches ++ [ mupdf_patch ]; # This function is missing in font.c, see font-win32.c postPatch = '' diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index f718ab4d804..7df1294874f 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -31,7 +31,7 @@ , withKeePassKeeShare ? true , withKeePassKeeShareSecure ? true , withKeePassSSHAgent ? true -, withKeePassNetworking ? false +, withKeePassNetworking ? true , withKeePassTouchID ? true , withKeePassFDOSecrets ? true }: diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 5f6c679f3ba..60905be3b1b 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch , python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl, makeWrapper, fixDarwinDylibNames +, which, perl, makeWrapper }: mkDerivation rec { pname = "klayout"; - version = "0.26.6"; + version = "0.26.8"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "0z17pdjdc2r2m5yi5bfz504dzzs978z8p6bhlf08v2npvigp8vz1"; + sha256 = "0pkhvxcfk70dnmgczyyq585mxrfwqai44ikshs4c1imh92z25llq"; }; postPatch = '' diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index 6b23d1d0437..f47458f0f3f 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { description = "Save disk space by cleaning unneeded files from software projects"; homepage = "https://github.com/tbillington/kondo"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index f49eebad6b4..4ffd3f6fbf6 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -11,12 +11,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2020.09"; + version = "2020.11"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "12kiw3mw8g8d9fb8ywd4clm2bgblhq2gqcxzadwpmf0wxq7p0v8z"; + sha256 = "15nw8kyjyhqlr742gkpzn1b9906rdm6cssnc6jbbph5pjdlzspc4"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index d7752258df9..c16322ad84f 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, -libGLU, libGL, freetype, xclip, inotify-tools, procps }: +{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, +libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "32"; + version = "33"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; rev = "v${version}"; - sha256 = "1h1zysm5cz8laq8li49djl6929cnrjlflag9hw0c1dcr4zaxk32y"; + sha256 = "0shqzhaflm2yhkx6c0csq9lxp1s1r7lh5kgpx9q5k06xya2a7yvs"; fetchSubmodules = false; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }); nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype ]; + buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; dontStrip = true; diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch index fbc341c8af7..c12828f2d94 100644 --- a/pkgs/applications/misc/llpp/fix-build-bash.patch +++ b/pkgs/applications/misc/llpp/fix-build-bash.patch @@ -1,8 +1,9 @@ diff --git a/build.bash b/build.bash index 7c278b6..41494c5 100755 +with manual adjustments --- a/build.bash +++ b/build.bash -@@ -29,7 +29,6 @@ srcd="$(dirname $0)" +@@ -30,7 +30,6 @@ srcd="$(dirname $0)" mudir=$outd/mupdf muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" @@ -10,25 +11,25 @@ index 7c278b6..41494c5 100755 mkdir -p $outd/{$wsid,lablGL} :>$outd/ordered -@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } - mbt=${mbt:-native} - mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a +@@ -41,12 +40,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } + mulibst="$mudir/build/$mbt/libs" + mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a" -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" --isfresh "$mulibs" "$(eval $keycmd)" || ( +-isfresh "$mulibst" "$(eval $keycmd)" || ( - make -C "$mudir" build=$mbt -j $mjobs libs -- eval $keycmd >$mudir/build/$mbt/libmupdf.a.past +- eval $keycmd >${mulibst}.past -) && vecho "fresh mupdf" - oincs() { local i= local incs1= -@@ -89,34 +82,6 @@ mflags() { +@@ -100,35 +93,6 @@ mflags() { } overs="$(ocamlc -vnum 2>/dev/null)" || overs="" --test "$overs" = "4.10.0" || { -- url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz +-test "$overs" = "4.11.1" || { +- url=https://caml.inria.fr/pub/distrib/ocaml-4.11/ocaml-4.11.1.tar.xz - txz=$outd/$(basename $url) - keycmd="printf $url; digest $txz;" - isfresh $txz "$(eval $keycmd)" || { @@ -48,7 +49,8 @@ index 7c278b6..41494c5 100755 - tar xf $txz -C $outd - bn=$(basename $url) - cd $outd/${bn%.tar.xz} -- ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix +- ./configure --disable-ocamldoc --disable-ocamltest \ +- --enable-debugger=no --prefix=$absprefix - make -j $mjobs world - make install - eval $keycmd >$absprefix/bin/ocamlc.past @@ -58,7 +60,7 @@ index 7c278b6..41494c5 100755 ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \ { read _ c; echo $c; })} -@@ -230,7 +195,7 @@ bobjc() { +@@ -243,7 +208,7 @@ bobjc() { } && vecho "fresh $o" } @@ -67,12 +69,12 @@ index 7c278b6..41494c5 100755 cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" -@@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do +@@ -291,7 +256,7 @@ for m in ml_gl ml_glarray ml_raw; do done libs="str.cma unix.cma" -clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread" -+clibs="-lmupdf -lfreetype -lpthread" ++clibs="-lmupdf -lmupdf-third -lfreetype -lgumbo -ljpeg -lopenjp2 -ljbig2dec -llcms2 -lharfbuzz -lpthread -lz" if $darwin; then mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) clibs="$clibs -framework Cocoa -framework OpenGL" diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index c815a74e019..bc825b94fac 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.44.0"; + version = "0.44.17"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1xlbhx6f1ysx8gka8g67271whzhkzsnkavpq3x58hdxr8v88khby"; + sha256 = "1bqp99n8cqr7kjiffbs39v0dd280f50hid5py3c4zgc7aqj9k0bx"; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix new file mode 100644 index 00000000000..c6243e5f1d6 --- /dev/null +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -0,0 +1,95 @@ +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +, jbig2dec, libjpeg , darwin +, enableX11 ? true, libX11, libXext, libXi, libXrandr +, enableCurl ? true, curl, openssl +, enableGL ? true, freeglut, libGLU +}: + +let + + # OpenJPEG version is hardcoded in package source + openJpegVersion = with stdenv; + lib.versions.majorMinor (lib.getVersion openjpeg); + + +in stdenv.mkDerivation rec { + version = "1.17.0"; + pname = "mupdf"; + + src = fetchurl { + url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; + sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; + }; + + patches = + # Use shared libraries to decrease size + stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch + ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch + ; + + postPatch = '' + sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c + ''; + + makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] + ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] + ++ lib.optionals enableCurl [ curl openssl ] + ++ lib.optionals enableGL ( + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] + else + [ freeglut libGLU ]) + ; + outputs = [ "bin" "dev" "out" "man" "doc" ]; + + preConfigure = '' + # Don't remove mujs because upstream version is incompatible + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} + ''; + + postInstall = '' + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF + prefix=$out + libdir=$out/lib + includedir=$out/include + + Name: mupdf + Description: Library for rendering PDF documents + Version: ${version} + Libs: -L$out/lib -lmupdf -lmupdf-third + Cflags: -I$dev/include + EOF + + moveToOutput "bin" "$bin" + ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf" + mkdir -p $bin/share/applications + cat > $bin/share/applications/mupdf.desktop <<EOF + [Desktop Entry] + Type=Application + Version=1.0 + Name=mupdf + Comment=PDF viewer + Exec=$bin/bin/mupdf-x11 %f + Terminal=false + MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip + EOF + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://mupdf.com"; + repositories.git = "git://git.ghostscript.com/mupdf.git"; + description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ vrthra fpletz ]; + platforms = platforms.unix; + knownVulnerabilities = [ + "CVE-2020-26519: denial of service when parsing JBIG2" + "CVE-2017-5991: NULL pointer dereference" + ]; + }; +} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 61eb32bbd5c..836d970a2b5 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin +, gumbo , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl , enableGL ? true, freeglut, libGLU @@ -13,27 +14,43 @@ let in stdenv.mkDerivation rec { - version = "1.17.0"; + version = "1.18.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; + sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48"; }; patches = - # Use shared libraries to decrease size - stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch - ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch - ; + stdenv.lib.optional stdenv.isDarwin ./darwin.patch ++ [ + (fetchpatch { + name = "pdfocr.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; + sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3"; + }) + (fetchpatch { + name = "pdf-layer.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54"; + sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm"; + }) + (fetchpatch { + name = "pixmap.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; + sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; + }) + ]; postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c ''; + # Use shared libraries to decrease size + buildFlags = [ "shared" ]; + makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 099bcbfb25d..e04669d6896 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { homepage = "https://www.navit-project.org"; description = "Car navigation system with routing engine using OSM maps"; license = licenses.gpl2; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 9ec5018c4e3..81f2f648e5f 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "nnn"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "0lyrpyhzzs2bdgx3ifq1c5dq3s2v30xdiaq0j8zjc64s6bghfxnd"; + sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy"; }; configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jarun/nnn"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau filalex77 ]; + maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; }; } diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 58ea50c3ed1..ae3d9181a3e 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.6"; + version = "0.9.11"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "1n8qc8ssv93xcal9fgbwvkvahzwyn6367v8gbxgc3036l66mira7"; + sha256 = "11z22pglqsqjms1ykxmj7lfdwpcmkbdsd5r812m5gv94xsv38lnr"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index ccb7f3e47c8..29ee6213a65 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.5"; + version = "3.38.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x"; + sha256 = "1vkg6p1dlrgx1yyscmy0m58inaq4ljshbdxw0nhi1nwqk3bpjchw"; }; patches = [ diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index d364074d445..c84c09e59a7 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: +{ stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: -pythonPackages.buildPythonApplication { +python3.pkgs.buildPythonApplication { pname = "pdf-quench"; version = "1.0.5"; @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication { goocanvas2 poppler_gi ]; - propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pypdf2 ]; format = "other"; doCheck = false; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 4e172e5fd7c..fc0bf62f1e9 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { repo = product; owner = product; rev = "v${version}"; - sha256 = "0vh2r32akvasdrghkaq7ard24r2qncp34jfiyshi3zxabm9bhfaa"; + sha256 = "11n925c5jj3yfwnqkgxzqrmsrpqh8ls1g4idmqqzpsanpam1xvna"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index c324a3f8be4..14d9b3015f4 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { having a black belt in shell scripting. ''; license = licenses.mit; - maintainers = with maintainers; [ afldcr filalex77 ]; + maintainers = with maintainers; [ afldcr Br1ght0ne ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/prevo/tools.nix b/pkgs/applications/misc/prevo/tools.nix index 6a85e73bf85..39c54b73b2f 100644 --- a/pkgs/applications/misc/prevo/tools.nix +++ b/pkgs/applications/misc/prevo/tools.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib expat ]; postInstall = '' - installShellCompletion --bash $out/etc/bash_completion.d/prevo-completion + installShellCompletion --bash src/prevo-completion ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index f5c237da440..3cd9d5db006 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,27 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "1ksks8c35q9aq5vnjxh480vqjyaa8c1fz1fb465vngnlyw762b22"; + sha256 = "0rqnbils0r98qglhm2jafw5d119fqdzszmk825yc0bma4icm7xzp"; }; - cargoSha256 = "0v1h4jhrzfb55zmpnbq18188rdvx7a7lvnjqh0w7cy90kvxssian"; + cargoSha256 = "1f3g5i0yh82qll1hyihrvv08pbd4h9vzs6jy6bf94bzabyjsgnzv"; nativeBuildInputs = [ installShellFiles ]; - checkFlagsArray = [ "--skip=test_single_huge_payload" ]; + checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ]; postInstall = '' - # zsh completion generation fails. See: https://github.com/Nukesor/pueue/issues/57 - for shell in bash fish; do + for shell in bash fish zsh; do $out/bin/pueue completions $shell . - installShellCompletion pueue.$shell done + installShellCompletion pueue.{bash,fish} _pueue ''; meta = with lib; { diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 91f23f662af..6a9de9e600f 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl -, wxGTK31, libXext, libXi, libXt, libXtst, xercesc +, wxGTK30, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization , curl, openssl, file }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cmake gettext perl pkgconfig zip ]; buildInputs = [ - libXext libXi libXt libXtst wxGTK31 + libXext libXi libXt libXtst wxGTK30 curl qrencode libuuid openssl xercesc libyubikey yubikey-personalization file diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index b47d8feecf7..452629b6181 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qlcplus"; - version = "4.12.2"; + version = "4.12.3"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "1j0jhgql78p5ghcaz36l1k55447s5qiv396a448qic7xqpym2vl3"; + sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs="; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 86c787df62a..a450b2e3eb7 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -127,13 +127,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "09wqlz3yya955galhs20014qfwm2yk0lxhyqdsw8gwddvcpyprzg"; + sha256 = "1l3x4gnichwzbb0529bhm723xpryn5svhhsfdiwlw122q1vmz2q7"; }; meta = redshift.meta // { diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 05cf15b8acc..455c08fb295 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -17,10 +17,10 @@ let pname = "simplenote"; - version = "1.21.1"; + version = "2.0.0"; sha256 = { - x86_64-linux = "00qx82d17yrrg2mxwhm40av0mpf5hy14j338i5ijhwp79yc8fk8x"; + x86_64-linux = "18alzsl1y9pvd5rs6gfnzv0py8ha0im33ylg7h6dicil5vii4l05"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix new file mode 100644 index 00000000000..a042cc53c05 --- /dev/null +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "spicetify-cli"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "khanhas"; + repo = pname; + rev = "v${version}"; + sha256 = "08rnwj7ggh114n3mhhm8hb8fm1njgb4j6vba3hynp8x1c2ngidff"; + }; + + vendorSha256 = "0k06c3jw5z8rw8nk4qf794kyfipylmz6x6l126a2snvwi0lmc601"; + + # used at runtime, but not installed by default + postInstall = '' + cp -r ${src}/jsHelper $out/bin/jsHelper + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/spicetify-cli --help > /dev/null + ''; + + meta = with lib; { + description = "Command-line tool to customize Spotify client"; + homepage = "https://github.com/khanhas/spicetify-cli/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 94875de7ebc..bf2db296650 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -51,7 +51,12 @@ let cp "${sweethome3dItem}/share/applications/"* $out/share/applications + # MESA_GL_VERSION_OVERRIDE is needed since the update from MESA 19.3.3 to 20.0.2: + # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null" + # exception is thrown on startup. + # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753 makeWrapper ${jre}/bin/java $out/bin/$exec \ + --set MESA_GL_VERSION_OVERRIDE 2.1 \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" ''; @@ -73,14 +78,14 @@ in { application = mkSweetHome3D rec { pname = stdenv.lib.toLower module + "-application"; - version = "6.3"; + version = "6.4.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "1c13g0f73jgbzmjhdm9knqq1kh3vdl04zl3xlp30g9a1n0jkr38i"; - rev = "6896"; + sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4"; + rev = "7504"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index bb4b3ac90ce..beccfe5477b 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "1.0.0"; + version = "1.0.1"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-mB23UOUrOfEmbFfVsAXyi3iod0NAfp/sl7Gkklqfmbo="; + sha256 = "1dln5gh3p8nz9qmg07cw2s0lpzp3rfhyrwdhczj89g27bwk0lr4k"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/applications/misc/tmatrix/default.nix index c03918c4875..e6337056688 100644 --- a/pkgs/applications/misc/tmatrix/default.nix +++ b/pkgs/applications/misc/tmatrix/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/M4444/TMatrix"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ infinisil filalex77 ]; + maintainers = with maintainers; [ infinisil Br1ght0ne ]; }; } diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index 11bf70cb56b..c086cdb9503 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -27,6 +27,6 @@ buildPythonApplication rec { description = "Browse Reddit from your Terminal (fork of rtv)"; homepage = "https://gitlab.com/ajak/tuir/"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 matthiasbeyer ]; + maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 4aeff6c9ec8..7b9e38c87d1 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.1"; + version = "1.2.3"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "0hx61br19dlmc3lay23ww3n9ry06m7b6xrkjx7sk4vrg1422iq99"; + sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i"; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix index d03d78a9fd1..cbca2a33d59 100644 --- a/pkgs/applications/misc/xkbd/default.nix +++ b/pkgs/applications/misc/xkbd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mahatma-kaganovich/xkbd"; description = "onscreen soft keyboard for X11"; license = licenses.gpl2Plus; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix index ecbb205c98e..e84f95e0998 100644 --- a/pkgs/applications/misc/xmenu/default.nix +++ b/pkgs/applications/misc/xmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xmenu"; - version = "4.3.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "phillbush"; repo = "xmenu"; rev = "v${version}"; - sha256 = "0m97w1nwak5drcxxlyisqb73fxkapy2rlph9mg531kbx3k2h30r1"; + sha256 = "1s70zvsaqnsjqs298vw3py0vcvia68xlks1wcz37pb88bwligz1x"; }; buildInputs = [ imlib2 libX11 libXft libXinerama ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A menu utility for X"; homepage = "https://github.com/phillbush/xmenu"; - license = licenses.publicDomain; + license = licenses.mit; maintainers = with maintainers; [ neonfuz ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index d4d93c77ed4..99afc44d2b4 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.11.3"; + version = "6.2.2"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "019g64rp6g0b0w17bm9l4q5lh7szc6ai8r3bfmy98ngi929r4rl7"; + sha256 = "0ph9mrg8i6cv2xjx79118hlm1gcynfavcmp0x2mvvlraxmghfp7a"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index a166ca3b50a..1b8f7941583 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1jh527bcl74018jd0qi32y4pcgmnbm21dyfhj4kg0j0ip15mx9j6"; + sha256 = "0bcbil9b5z95haqbmdqaslckvjflw7h77fqrcdxc6lrn29575nnf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 58b1a81c90f..2fc158daf62 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "zathura"; - version = "0.4.5"; + version = "0.4.7"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c"; + sha256 = "1rx1fk9s556fk59lmqgvhwrmv71ashh89bx9adjq46wq5gzdn4p0"; }; outputs = [ "bin" "man" "dev" "out" ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 32a2ec42011..97f36f82847 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,29 +1,45 @@ { stdenv, lib, meson, ninja, fetchurl, fetchpatch -, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: +, cairo +, girara +, gtk-mac-integration +, gumbo +, jbig2dec +, libjpeg +, mupdf +, openjpeg_2 +, pkgconfig +, zathura_core +}: stdenv.mkDerivation rec { - version = "0.3.5"; + version = "0.3.6"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq"; + sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66"; }; - patches = [ - # compatibility with MuPDF 1.17 - (fetchpatch { - url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/commit/c7f341addb76d5e6fd8c24c666d8fe97c451a4cb.patch"; - sha256 = "12rikx2j7dpngfma9x4i504w58a8xx3rc0gmyz183v19hn54c075"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - zathura_core girara mupdf cairo + cairo + girara + gumbo + jbig2dec + libjpeg + mupdf + openjpeg_2 + zathura_core ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; + mesonFlags = [ + "-Dlink-external=true" + ]; + + # avoid: undefined symbol: gumbo_destroy_output + NIX_LDFLAGS = [ "-lgumbo" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index eaea5f12b87..925cc1a4f91 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "amfora"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "011h5xzwiafh3fdp9wil8n618p45ph9swa66lw6s82ijpiizz79s"; + sha256 = "1f5r12hmdgj26p4ss5pcpfcvqlcn19fr9xvvvk2izckcr48p4fy7"; }; - vendorSha256 = "10f3bh3r3jc1185r8r1ihg8rprdpl8qwg5b6wqwsda96ydkbpi2b"; + vendorSha256 = "0mkk7xxfxxp1w9890mkmag11mzxhy2zmh8v1macpyp1zmzgs21f8"; postInstall = '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index fc4b5521b0d..f0abf2a79fe 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -86,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.15.76"; + version = "1.16.72"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "3b054584c2272a9eeb9029f754cabaf4804db295fd0e6b84ead680b08af38d48"; + sha256 = "0gcmbqkrkdrjj0cc34bp56iqawhyfz46k7q8x82pw9b1rbjp1x6k"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index c44968a4126..d3953da71d2 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -82,6 +82,5 @@ mkChromiumDerivation (base: rec { platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) - broken = channel == "dev"; # Blocked on https://bugs.chromium.org/p/chromium/issues/detail?id=1141896 }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 92403598a03..7e453d6e054 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -152,9 +152,6 @@ let ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi && versionRange "86" "87") [ - # Check for enable-accelerated-video-decode on Linux: - (githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d") ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 0f64b859579..845a4ac3b61 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -15,7 +15,7 @@ , enablePepperFlash ? false , enableWideVine ? false , enableVaapi ? false # Disabled by default due to unofficial support -, useOzone ? false +, useOzone ? true , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" @@ -41,8 +41,7 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { - useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ + # TODO: Cleanup useOzone and useVaapi in common.nix: useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine) }); diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 565f884c510..eb51135a2c6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,21 +1,21 @@ { "stable": { - "version": "86.0.4240.183", - "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma", - "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9", + "version": "87.0.4280.66", + "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19", + "sha256bin64": "09hjhxjihhxq5i2wadpa0g72a6iis0igarr8arrcah4122icdr77", "deps": { "gn": { - "version": "2020-08-07", + "version": "2020-09-09", "url": "https://gn.googlesource.com/gn", - "rev": "e327ffdc503815916db2543ec000226a8df45163", - "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr" + "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", + "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" } } }, "beta": { - "version": "87.0.4280.40", - "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3", - "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41", + "version": "87.0.4280.66", + "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19", + "sha256bin64": "15n01jia8sxv3a7vfbla40rq45x54pyksg0kg14bm0br6m3n65pz", "deps": { "gn": { "version": "2020-09-09", @@ -26,15 +26,15 @@ } }, "dev": { - "version": "88.0.4300.0", - "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b", - "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv", + "version": "88.0.4324.11", + "sha256": "123gqbxrn508wxdj3is0kzccml5zwnf8pfl90xdizvzcm3wy5315", + "sha256bin64": "11bswhxpnw7qi6lagfpgxh4yh56w7l0bc3rqwf975cbq2cnzpjby", "deps": { "gn": { - "version": "2020-09-09", + "version": "2020-11-05", "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", + "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index a69f288be58..431ed105f0d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "82.0.2"; + version = "83.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ach/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ach/firefox-83.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "7850a7cdf7f842d8ebac2d7d24f0823b1743b7fe139987554bc3f54af47c31f9"; + sha256 = "cea6ad61bd402e6c84a81a3f504f1b9292079c9d48d2353b51db4f03a8837fb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/af/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/af/firefox-83.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "c43b0e976a553840da783139ecf2c8a59823da6a31a1d3b5588c496c270260e6"; + sha256 = "d4bd0a9579f38d53f559412cc3cc04f11871ba22c81eee54dd9ab16c56303513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/an/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/an/firefox-83.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "4f9103c6043e2fa7ceb0021e09e8616a4e4484d19641e6fc67cde0b60136d8aa"; + sha256 = "10741a6921210643250013c45e9e21bc295da8e41f2bb5c5fadcd86c0e828c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ar/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ar/firefox-83.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7f8bddc573ca33cd48b6e29709c80d8dd617a46f1435303fa0931ecc413b69e2"; + sha256 = "3fd4aeef281e5aafdda572d4814e70295c018b7fae6d214c40dabcac367ace69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ast/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ast/firefox-83.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d0bac8231fd4e9e777754378ff5b2e697379666b682c512d4d4d17a3bd82ad10"; + sha256 = "237e8ff5b3fbc9d7c4095951ca014a5c26cc076305aee705ca943d81e72541dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/az/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/az/firefox-83.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "3d0a5facfdce39e798ef72d22e737860327a669f1752deee7192877a2635ce97"; + sha256 = "79ca0c798243841cc34281f917aad06c2f546a5e11b443a96e5030aefb8de9b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/be/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/be/firefox-83.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "70606a5e490c3a0dcd1bf9b291c5d16525e044eca667166abbf1d75b58f3922b"; + sha256 = "c15b0f929b3e3c6ad5618ccf6f9f6b143f893b6f77e176b52ecc608ca3157ab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bg/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bg/firefox-83.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "501ba77092a68b32ba6048360f8695f52756593241f4a8d210a072260792cde2"; + sha256 = "fd2094c59a057e8c35054f7d09c31699aeef927cf9688a87559a8ba69a93f600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bn/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bn/firefox-83.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "f465d794e887b6867bae0e9f768e468876ae7f31a78e91725ccc8f7d965ebfd2"; + sha256 = "c9755c408ca1a4f426f1432339020ef3d7c675d426fae9d8697cded4c7d493f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/br/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/br/firefox-83.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "977beb4edf63e823087ce9e62ebb1c1d122991de4a350cfcfc93427b3f381608"; + sha256 = "d47b889d31b945a5b768b3bbb336fdc43d62c9cc86f13916225cbfe68a560972"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bs/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bs/firefox-83.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "3951d25f3f1eeadde330e0a68fd581595fa56fc5e98bb4baa3fa707879377674"; + sha256 = "c36da445560b989ae9cf16a1ec72cd2cae82db670f90d27abe0499f8cc025eee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ca-valencia/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca-valencia/firefox-83.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "466fe1080eac737ed87cd83580f585fe5e685090b0d5b6a4c2c5a01ca33175bc"; + sha256 = "ef5ee80cc0d6b1b299bc8bb6577b8e26f5de8b541530ddda231e2fafa863e6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ca/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca/firefox-83.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6e13af5bdbbe50b8101e60a15d22f9f561d1846e67689a23a933f6fffa73b9ce"; + sha256 = "7c349aa7406899835bc9e70893f28c8109e17ee9ef018e7a723085117f8dd32f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cak/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cak/firefox-83.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a96ca82a2723e90595b76279b3b2a902cf4f121afa448784bf684cf26c514c8c"; + sha256 = "3e7aabe665ce423bd47e7d0474039d7bfeb9958849c18e98c37f28def5fae1aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cs/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cs/firefox-83.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "bfeac431918060b210d35ac74e7333b0c0f851435275c81f2ae76af34e3a05e8"; + sha256 = "97d5e4c255fc87430751c81edc62186e1b4ec901ccf17bfdad7a8ef918077bc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cy/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cy/firefox-83.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "7f81dd91072ff34551394ef969c62baae625c648f5d880f5754862855f71dc74"; + sha256 = "c1856b51dedc5788b40671faee8f8cb996108eb514d1263de998043377f2f7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/da/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/da/firefox-83.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b21dcd0ecd9f0010852a143a38d5d0a77dc9240a49d959b00f101491d3a01e10"; + sha256 = "990da1f47d04ec9200d41fa401b23d9607a8e4c11d7cc78989e81785b9633cb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/de/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/de/firefox-83.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "56429f714fc1bb06efded1c601741ba3cc98788ed54ae345518328f9dcdf7f5d"; + sha256 = "94ad875d88a18f24ae38f20b324d074a367969368e660ea2b4b0645e31300c94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/dsb/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/dsb/firefox-83.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bafc42263929851718a7cf38163aa3c020b0631b0a0e5ce8fe238849f7cd76e2"; + sha256 = "c3edd46c44bae1b00803e587e6f52560b28ddc2fc935c1fe62714bf16fa72d80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/el/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/el/firefox-83.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "e1e8bb8cf866ea69465250a3f760a3cf9e9b06fe15ad03737c6739da5a5df2be"; + sha256 = "3572a260ec17f76631ca627747ed53d1911ee1180d3e574051b3baf0afd9dcd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-CA/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-CA/firefox-83.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f3a252002ceae09c56334010167861abb84840466c939fc87f0ce39aa1537566"; + sha256 = "e3c9363e8b93c625234624ac5c3ab0274055c5b8f4f854da955409b9bdf28d52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-GB/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-GB/firefox-83.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "2f384fdadb06254d12aa1c39b7cff6c26be4b7617d0b845a0efef2c92515cbf0"; + sha256 = "240a732c034bf2ac286cefc33b02b56df205c4e175457cd84adb7666418e0be4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-US/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-US/firefox-83.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d95758297ac2db1a050e6431b637855c4a58222db7d9014c3a8322448083a4d2"; + sha256 = "93ff827fdcba92ddb71851c46ac8192a727ed61402e896c6262943e382f92412"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/eo/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eo/firefox-83.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0591aa9225572cdce7036eff924dd3337b85625bdeb6d59aacdc7a06c5af1f71"; + sha256 = "456933a6c1fb1e6ad5b2217a7e3730bd54ff037d3d718414b2c92557fea3659d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-AR/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-AR/firefox-83.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "455b211bf85363089721803255829e4e7891cb43b2b6f35f85bf8a7242c360b3"; + sha256 = "040e8a4a74b8bc77e1d485c3376690f4c5ba85015b360f679ceacd848b0ca574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-CL/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-CL/firefox-83.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "b5d22bbd082eb5b6df2ab8002b465f64afdfb2c06b352a90c72e491aeab81336"; + sha256 = "80e8189ce09c736af1d9927d4943e08e30bc70e9aa7e116f150f14c0dab3fb15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-ES/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-ES/firefox-83.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "678c9ecf360ad9231f31a8f761a48e793b6438b598d200619e5fd54a3296e1d5"; + sha256 = "f48489abac5358a10d8ed36b77398493b6a9189a8327bf61bec6ceaca51ab696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-MX/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-MX/firefox-83.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "daf28e88dacd3202c759caec279244aa9bf418420df9ea11896658e53c966061"; + sha256 = "0d4805b30f05fb8a65b81a42337a8a3732c7664b322557e844929d2b049d0111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/et/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/et/firefox-83.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c42572576da4d6fd4cfbe5cc518b2c7dc68353141f952eaeadbd9b8679b98d95"; + sha256 = "eb4a463b9271fdde45bddad28ce871953739b55126ae5613963a69a319908fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/eu/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eu/firefox-83.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5945c782ae8d23473ec1d4682d7fc5a0c524e494393e96c98e3202061fa6551a"; + sha256 = "3a662c575554d3a542e65950352c527cc51e82ae7a8f9d7ca1b69e30a683731e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fa/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fa/firefox-83.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8b5f607d7726333fa9f012d5d9e74170350e205717f7ad0bd7aceec60620ab16"; + sha256 = "b5ad3a5d39674d60b6e97cd656c77d7d2fb90943a66a590a29e4d42ec1e18c42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ff/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ff/firefox-83.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "996f0efe4c3eab9152a254077a53e994888fb20345302ed1718f8edba67a9bf0"; + sha256 = "2db83d638474186f52fde5fe1ee25201e84b198e44397074203d7ce50e23e74c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fi/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fi/firefox-83.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2830c7775e54f3adbda827b5fae13fdde7fb4b3c8b37644273a88da33db78f2a"; + sha256 = "98bd9c50b5db43bf5fcdc829aa295975d3ec106bbc598fda3d7f26679c0ba08c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fr/firefox-83.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "bec556a28a30c478e36c3ea1463950039458d1a7442bd7a9807f31cc4ca003fb"; + sha256 = "ab3427f5cf7cc88d5108b8be21806197420bd775f33d3f2dc983f0f4dec44d5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fy-NL/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fy-NL/firefox-83.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "b549eb7900d15f8606face90c521aac596230b25705f7dc459c039e8ef559698"; + sha256 = "9f21d91d1529a05a2da7ba29cc8e875b23ffb4b453077b5e899133cf31813397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ga-IE/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ga-IE/firefox-83.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5a69d9bd67dbae5e8659bf3980d373c485bc67d5719c3b37948d2054f92ecdfe"; + sha256 = "4c22b166cccede0bcea4e75f826e100dfa4f2def01f904fbffcef789d2d61695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gd/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gd/firefox-83.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6d76b0659f3d0b0793cbc963dfbd6d20c7c91aa46aec1ab9cf9192d003eda3dc"; + sha256 = "6ca04d381205121dc695dff78ff646499a21976ae64c110763845eda0598b414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gl/firefox-83.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "4cdfa36bd0d880135ff959a04eed53b958684253f99469c45aea39cb4a25d1ec"; + sha256 = "d08f4ea821af5e38c21364037c17b8c97c775d60f0697eb0817dcfc7c6d4c7dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gn/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gn/firefox-83.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "3cd0ffe9756155181cf68d2fdbc858a93be41104cfbac408adc98b72bcbb215d"; + sha256 = "90a8b2fdf1d3471311671761e81637d6771a61744eb480c0788cf03d295c30ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gu-IN/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gu-IN/firefox-83.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "083ee03240b7b1f4238a464844bfad31334a21a8dd025f1d12a252c2cca1049a"; + sha256 = "bfe65e5c9795ecdff4dc947d2e2e84d01da894b0ae55c08d73f9397c5730ce17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/he/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/he/firefox-83.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "36f8951cb387fb733d689ff2a77b563e8315f76b434c283867aaedc264b227c5"; + sha256 = "2dc01c5a929aa79056a66feb522d50cbbb567bc85589f8106e553c9ddfc02a7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hi-IN/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hi-IN/firefox-83.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6d041154437f97a0dc4b3ec3125f2cbebc10dd2089ed0f98df1c1a6a85b7a536"; + sha256 = "ef2a61dce3ee713a4be3cee5a9dda8498095a7db69304a7d6585ac674970958a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hr/firefox-83.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4c5b7921cba2d915240d6d9b0bf515f9299827e75a84eb089626561cc9042db3"; + sha256 = "ab8357cc1f36965ccbd6f4298ffdbb3d77b09cc4b789a3be708d2c51468402bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hsb/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hsb/firefox-83.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "4123ec9fda1e94d4433107999905d7cca0dc2b6cfa5c5c78d3a1d29983a5960b"; + sha256 = "6a34074a96be7911672b7e83151244f1f963a8cc8930c8d1d113afe8a49c9529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hu/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hu/firefox-83.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4c0afb928ad0b87a3efb26f09da8c5ef1ac415e14ac47b30463663ddb1955376"; + sha256 = "ffec1646df872a757b771a03c00e3e6df3397e7f4af46bd1d6c0fcab242b1721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hy-AM/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hy-AM/firefox-83.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a2676e1450d88ab97b41cb4ee012da2a6240b739eca68e53d9607bbe0f7a313b"; + sha256 = "1b9da538ced466302584fef4ecf415aeae5bee51a87d38bd0a6bb3ea155af66d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ia/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ia/firefox-83.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "8494561d37a9d41d0c8683e793419d51ba3780b8229fe98a819ce675f8dc6aa3"; + sha256 = "5f8582508155f858c7e52e623579daa7da1aa77bb4e41c2c46d3e6ae8ace6b1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/id/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/id/firefox-83.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3bbc1f1acba6fe029ef1a526e3e16f6000cac1ff226be21850e9e52348b5fe49"; + sha256 = "e5690dcc6b933ddbd27fcfb22f8ab9fc4e4c999d935b6088da38c87af2c567d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/is/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/is/firefox-83.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "16fa5428d2a467bbe458c82544a3859386cfd8051de266d7af5656430a408535"; + sha256 = "3776fe6aad623e9b74807a48e105d1619143e78e122906360c4efbc73c2891ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/it/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/it/firefox-83.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "5b891f5a9bd4362c6b00cbcd846d724926f2862887c3db2d6fa55f968c7e0d3f"; + sha256 = "eb54c4596602150c619db6d0d5572a59f7d9c4def68a34cb874cbc6535939e2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ja/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ja/firefox-83.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a3469c0b8fa55dd271768ddd491ddf1730d732d9abd697dbf779fa820f4b6d4b"; + sha256 = "54b70bef0507611ad1ea7560668b46385661b5275c7a0ecaad723db44fd8af88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ka/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ka/firefox-83.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8115d086a7330139f03a25209384651209b0e998a3b754ba1f79f26beddd28ce"; + sha256 = "56e72349133297d61dfdec4933a01c2cd8fa3d0da3d784e0598506c2db05938c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kab/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kab/firefox-83.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c2a7cf201875831fad0eec3b558a4be41c847279f7a66fb8e1006084a385c5d8"; + sha256 = "45f554342449405990c84e910dc6436489046acd00fdc4a0ddabb4b28d7c1284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kk/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kk/firefox-83.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "33aecd099402158a1fd6dc47ccdddc1476f21e31a1f25c6cd8518226de7f5d23"; + sha256 = "3463c4ea5df4e072dfca22e8983fdc016adbe2326bf186a0168ea9ee2c36b3bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/km/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/km/firefox-83.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "060686475df4e47104229d02d42760e5762fc1a9d8d785a8116670a24b7cb897"; + sha256 = "3bb7d2c3e5278d9c51b87d8140096ae01532e99160b866164d1920fb012c085c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kn/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kn/firefox-83.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3b86716fd6da73f439593a3915d24710176d9be1aa3d19313c2554962e55dc51"; + sha256 = "c9086912382dbff66045c79130403385b9f075bf782220aeb84f03f62a563638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ko/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ko/firefox-83.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "5fd1b0b428c57886552aabdaea3f691227f40cc19d18f851a2c880b1a1c8141f"; + sha256 = "6f70169cd58ee1559ab224c3ea6f5309bf75267d9f315e389b7971e8e1feed09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lij/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lij/firefox-83.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "227f8dfd5b861f9e8edf1037c8f374dcae3aceefc61effab0e51907603fc21d8"; + sha256 = "0b089e6f7954f4d99e9e59bd25148c4be620f9486f8d36c3db68fec5ea700d94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lt/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lt/firefox-83.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9ef7177b9fa3965a394dde8a39503fd8975829faca86e281d046f8fed50bdf27"; + sha256 = "b76c545aad6e5b66bd8ab34bf02f7d4f69ecee348381b16c271f4de0243c660d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lv/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lv/firefox-83.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ac98c34657aca401de5943724a7f8607d1370b78f80c211547010911a11be498"; + sha256 = "8504d5c00c5569f008b2e308a9193cf62130e89a6e61b33fc842081e4d504322"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/mk/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mk/firefox-83.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "457fd0ccb4d43e99f39c89db76dc5d4cd79c560a578d1ff3229cd1d49493356d"; + sha256 = "636a421f6238de1fee37014c3af147220af6a1f3c04e2ce6ec9dd17898bc7c20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/mr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mr/firefox-83.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "3bad6fb96f29a3fac72eef3f53b48e9ff10a273da069eda050fa24bdf3ee8ec1"; + sha256 = "1e00d369be11ad8bfb2dda0ceeb3b7b516fd66427d9e85bff4cc1d699ff3659f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ms/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ms/firefox-83.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "20573511691d2615c9095988cea73d7fbb522a0b4ae958da1749ae8ee1ff31d8"; + sha256 = "0590f2bff7e43b9f6c081d57276299f8327df73415a8e2a2243e3c4ec9154200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/my/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/my/firefox-83.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4f4a7abd9a1409ab49ad956cc1cad0adb9254b3203d9d19b7fc967284d051554"; + sha256 = "ae43f0e8d4ff32274b25a1b78e0af44446ea6989edc4eb3c0d9fae36fcf80908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nb-NO/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nb-NO/firefox-83.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c0480f74895deecbad2f58b1b4876fdfc2c920269f4c91143c9cac41d67162f1"; + sha256 = "9c3a74fc7670e2202be1f4f75208f0113c115169ef70614af631cf16879e081f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ne-NP/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ne-NP/firefox-83.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "11fff99c2bf87ce9b5c315ffab4a305bed0d5170ffc4f65d00d5b5b380687214"; + sha256 = "d830f802cccc7351a447fc59ed64562cac1521d281ddf218c84d1c9af8a65cb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nl/firefox-83.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a19b8a18022f9317303e7aba19415f45133b19849fae440ec41ec5e9016a532c"; + sha256 = "ecfd03850a48ebf7c3ec9400838100514826b8f35744b0167f61c9086893ae66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nn-NO/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nn-NO/firefox-83.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "cc68e10b523681110a597c7583ede6ae08d20529bc001fa5059c9056287f3587"; + sha256 = "ad0e4a89afabf1929d441129066dfcbf532d37da31c76bc79108d123cf5cc649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/oc/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/oc/firefox-83.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a54056be66f78421a7f70cd5860ad5e804abd35017b02ca600c459c86c82ef50"; + sha256 = "9b9bbba334c4d7d3907f55a6647cecdf0bb2cd6294569a0008d866cd6eb70a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pa-IN/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pa-IN/firefox-83.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6a64174c90146c52b462a2e8b921880927774b6d9b6478df26ea194735c6eb6c"; + sha256 = "083266958874618042ee8f2a6162184cd71bc725a994aeb68158d59edb0cafaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pl/firefox-83.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "558f08956b019d8046ac6c0e3a9922f79176d9997129e795901f40ce04651e55"; + sha256 = "cb7c72fdc91cd9269a2e53725a26ee94db0e2e608a60ff1120fbe5c1627814bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pt-BR/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-BR/firefox-83.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "bcc8c4d9a55c8669cd378b2f89cfa61da82e54be360fb754be78289c2ab8434f"; + sha256 = "a2a188a222fc6054ca59d24370528e8c8d4d7dc8e4ab18f71510b415dde73d05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pt-PT/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-PT/firefox-83.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "29ef81f9675b589122d311dd0f3075d48c99fb34aee9f9906d490585bd407468"; + sha256 = "528e1893438ead94afd4013d3c4f4f51107a5d0c4b6d6e018a0687f0d25f9e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/rm/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/rm/firefox-83.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "390bd332f1fae6f5a48cc7b8bdd285b282689446977d859e37d8a097920dec9e"; + sha256 = "e4d6e53b642da4de5c7f30297c6fec22b37921a55cb744962dc0d60e26812549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ro/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ro/firefox-83.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1398529679e4220844a0b1880c0ff174fe2faa8b1c30c6041c1cd790d16a83fd"; + sha256 = "04ffa3eda69ea0dfc6251564c4c6bc742d5f8e5dbaf6184b4ee9461226ce5c86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ru/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ru/firefox-83.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a9ba4ded0a67ae842896aa75de3dda2b427d0748244649aa9c2db17dd35a9d02"; + sha256 = "697ddeb8ec024b5459492ebd652a612cfa1911267071b230f5ea6ac78a1e3075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/si/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/si/firefox-83.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a95b03c4085c096207a895d3ad193be7823da4e894793c0378391da5faaf01e5"; + sha256 = "a3256c648ea75ce36009306a3c039af228e645ea2e54361fe239ad0cf0869ead"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sk/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sk/firefox-83.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ce09728fc05f18a549c9083d383c58d4a62371d69a01d30f5aba782a60ec70b6"; + sha256 = "1ae0f898d34c74ea427228d93646ae47990834d14bc4f5563427409dba066f8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sl/firefox-83.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c344aa40296d249f2c6c85718fd6a9b30be0407b7df7eb73f1810cc873f03477"; + sha256 = "9e14b4ad7bd9a8026074e0a3da3d3ba74dbb1be31a2e9cae787802d090c7a965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/son/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/son/firefox-83.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3356b16e9174c90cc8e1deee262b8381fbfc34e9cd03e6f7bd48072861de5be5"; + sha256 = "1b928ca974133a346950ffc663fbed9d1876a4c0bca53fd807d8077d031531d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sq/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sq/firefox-83.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a90e1dada0ef38114f1a8ba7236d8bc97285dc46f81334c86ee7a9a03c8d2b0d"; + sha256 = "7bb9bcfe490bf5d577e55e9b612c932c93ac58252cef592b2af39c17987e700b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sr/firefox-83.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d44891e53c9a41770dffb2fa744e3cea0a655194e218b70881e1f070aef07d69"; + sha256 = "90e496a5fe9c5d8c38dfcf5a1a07ea04be983fe78c68cb13a2b99067b0f02e7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sv-SE/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sv-SE/firefox-83.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e53a4ca8a04d7858c30260999b6acc09b8146ae8a8f4e558d62cca1ce18e7689"; + sha256 = "eab8a1e51a90d36b58901db6175e724f38afb91270b05c51a93c03f8c51fe432"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ta/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ta/firefox-83.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "a89ab7047cbbabde8a03e301f8067b130d37eb0ad7ddaf750051175dd721b6d0"; + sha256 = "bb6d49500393d20134a6f749a77de1fc4cae2feba4e49261862f8a634b4b9276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/te/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/te/firefox-83.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "6f80b934ff3bf696b4753f2cbf146d9151f40def404d6d749cf8de022be194ff"; + sha256 = "a1104e292f949976e423b587fe9728fc741b7a11e276e7d747afd3a93abe3eb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/th/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/th/firefox-83.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c37a9708768ddf723a2423ba0999e88b09a51028d7736234ffcaf8a32f56df8b"; + sha256 = "403e4a86b5f95cb22cdb2100372c55d92fcb4708e3f719da72b643637c711458"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/tl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tl/firefox-83.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "5ab670b24e2ee1c4b4c7fe518e9d3967c85f0e27ea2c7a4ba82bbdaabc6c4fd9"; + sha256 = "993cf86a1b045a477fd4c683e503314fc2aea5a0a52f1faaacd18a0fdc5c7def"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/tr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tr/firefox-83.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7e51ae3fca81e691675196b298a9b03de9e798f4fc032da8e5da295820a7d2c6"; + sha256 = "8e9e96d0b1a2014dc7374ea893fe72bc72f3840742d305a6e73417468dd6245b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/trs/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/trs/firefox-83.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "60263ac369cdc9aa9a8ab0dcb60219f3e14563fed709b99d8352c1b0469e9433"; + sha256 = "3590ebb4c888cf92ebd615df9eda2413fd0a3031293d68809fef74fc92fa759b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/uk/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uk/firefox-83.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "38f8e0ed748427991ee9c45694460d3eee28a5f94ee1ff59eafcf9eb93fab9c3"; + sha256 = "7a3a2bae67ddd2afd2d6953f5f045a831595ea29e5cc6ad7083b8ac89e55917b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ur/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ur/firefox-83.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "65e19c2395ff45bff79beb1aa4d9c18faaceb5a7000c6de672f6c1d6964571e0"; + sha256 = "445a599ba623d8673d71f6ebde70c64a93e28e57b6859e325b0151240f1d49e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/uz/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uz/firefox-83.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d3967c3bbbd0ddd880a7cab3a359b946a7b99515c9b82bba044a33138822d864"; + sha256 = "b63e6c1c6afdc3694ee1d2b21175f4a5603c4454e43f0a08e87ccf800862b6bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/vi/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/vi/firefox-83.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a142d7ddc06c688666811ace6a9c32f28e74006f29eff4aa4aaae105f64a34ac"; + sha256 = "7127340d189ff601f96ba6f5e6a6175d850e822599e10762908d406b2174a256"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/xh/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xh/firefox-83.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a696daecebfb59e8a798dcc6eb241ce10562438a013f243dd60ac8671091f585"; + sha256 = "41772e457eaf385230086a461033854ad214b4160c6f99f7eb6c4df8dd137dc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/zh-CN/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-CN/firefox-83.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "d1167e254dc6c16d5d4e38cd8b98bbc065e369d7bd7414e6871b028c601118a2"; + sha256 = "013fe88aea216fbc4de9fdaaf559d65678ba389049bcff896540dae8d0a9564d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/zh-TW/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-TW/firefox-83.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "453ebd33173b2ae4a5120d73e3e0fdde57b480e3f66ef2fffaba27390ae945ae"; + sha256 = "7e9eea2a326842f652aad4995f796af9550d03c034587d171e4b2a33da934645"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ach/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ach/firefox-83.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c7840623cb65c9c28285d41694a85990e0bda181697e229ad4b71478dec8bf2c"; + sha256 = "9974b19f4f15d9aa33b5432cceea05efe44f31c4123596aca9fb5cd3dd734152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/af/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/af/firefox-83.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "24915613ccc58840ccb1564ebacc906b96c7f171822f722265e02b8ee41b0dca"; + sha256 = "5600ad5fad398648d2e7a2d7bdf7901769fa428f9ef9f79046917133e12a7eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/an/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/an/firefox-83.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d7acf25c0fce89775827a1e8198fccd117b94dafe5fd9820f557cee88379da8b"; + sha256 = "d8e0843dafcaf1b010773b83a665fd593741858b60aaba61d4c308a86f765146"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ar/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ar/firefox-83.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d24c74365c1b9384e8954f9b6ce4f2742bea269de7a20f448971a957f096ecf2"; + sha256 = "952b2ad360662341b9281cfdd93a141fe2efd16f73baa4fc4be1de7b8f12c8c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ast/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ast/firefox-83.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0b858a243143f6afa68bb14f836fbf4a7245cb2856432004222422ceeb4c4d57"; + sha256 = "a7728b09f7e96983a031a32b1b938fa362e1a1e58722b37ec03a4048a152f0b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/az/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/az/firefox-83.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "80ef7662e88c0fc1711bf385443917b325dfa46252b837f043f41fab0139967b"; + sha256 = "c6019a3f7ef56583445acc5ab310770c937b44182a1bb3ed54ac452e6e19f8fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/be/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/be/firefox-83.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "93c087192c67e074ab3b00fdf55d485f39c7b86cba4fd801e61d2f61e511a191"; + sha256 = "12ead04878e308682f04afb6ac9ce9ab134a5a542af328e029cd973c14fe7444"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bg/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bg/firefox-83.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "19afb87d93e3a01305c24b725b8ed764f8ae2e31e72a8ce4132f1d6451589321"; + sha256 = "7134539d5c259cdf6dd316205b857acae87730ca01bd6ef2efcca75f9d06d027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bn/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bn/firefox-83.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e607dd2195d4a19d366de1f084bcdc91d4832287752c4a449d445eb7aaaff463"; + sha256 = "a97524e0d6f6f61045b2573ac2fe98e31fa372429f5f53c25fb4cb4d32a31940"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/br/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/br/firefox-83.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "dbd5fa26f0b9b20933820005022af238a5f72c8688dc10a4aafa0318af67b342"; + sha256 = "4619705703a6878fba4de4227d90143abb92237ba556a8c5f4a51c9701671821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bs/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bs/firefox-83.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "7d3d4e3bc630e69b655f4668365359996266d15864b776fbe2e6a8773e212410"; + sha256 = "2131babd061761fa1119a536ae354145315875c5d8cd300405a35924bbbfcc34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ca-valencia/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca-valencia/firefox-83.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "a14d58cd78c72c29307887a91b534a7553ad2b4e81da5615bfb8a918d4abce60"; + sha256 = "73238eb95ac828f4bc2ac220e4b953b950a75b88600b457bf3bd528245574cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ca/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca/firefox-83.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "2aac2aa56702b1269b5b5755da2663621da1603e6ad956afe07d86ff54d3e64e"; + sha256 = "73e65093a587c89c9a392e3b65375ad2158c88e2905ab116eaf8da7cc5841cda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cak/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cak/firefox-83.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "333cf7d04c22f644f0286102b498727dc448339de26fa1a1cfd353ad1b05a1ae"; + sha256 = "7f2dd3fdf1e0cae21a1517286b60bbbabd310dfc0dc18588fbe21ba671e97dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cs/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cs/firefox-83.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "3d3756f69b0acfc95abd5ab21b9b77cd2272afdcb7056fa4b961c1528e467447"; + sha256 = "5f639cc6d14b06ae62f73fc01b909182efea32710dfd817be60499f4da3eafd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cy/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cy/firefox-83.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "97d16b2b8def95897751397a8f5293931e1620d2b17b6a6f036d47abc79ae822"; + sha256 = "7a3e9921b2e6e407ebeeb22f1ac4b529222a1f5fbdc84c44fc902b8db6aeb1ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/da/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/da/firefox-83.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "f97a2ded9c529e992df15b797afe0622a1d02cdf3e01fa46794b4ddddcfed0ac"; + sha256 = "05dc3274927f692ec3c60f8353a30e2bcb1a36b54f4ddff90407e2818a497a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/de/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/de/firefox-83.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4d9aba854f86075d29772957d7f31804ecdc1bc465315afbf0bd807a40f39bc5"; + sha256 = "c95affb4655b7a0ad6959651cf10090970035c74601ea141366cbb5d44f8a526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/dsb/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/dsb/firefox-83.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "bdf18303c3e67f6bda97c709460214bcad60dc11c35fb996bb628f79bb7d0a9b"; + sha256 = "c9baf7df51fdebbb2521dd10830f759110a9c92dcdb579fad99d0c4112126e66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/el/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/el/firefox-83.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "29e9a29e97fea8cb4eb03c8ad67c8fb37e534199073202f381c6a9c50a9d6572"; + sha256 = "52afcd2037b9cda2c66975dd184276bcccca27833cd7a6da989e32c591a06060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-CA/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-CA/firefox-83.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "7fd41cc61c01491048cd37db223007a568a8470eea693e76e3f3394901b1af5b"; + sha256 = "375d3a11f236560f06397f157209b1ce476197a0e7b327cf187dc2002d053c90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-GB/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-GB/firefox-83.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "818d44931c9ed4b4c258de26b33040409ebfe9a4856eb1f80715d15687ea9fdb"; + sha256 = "610657a623b5680c2ea350a5f3d1ec676e9dac8720e0e67b3e627e37a58b0ad6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-US/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-US/firefox-83.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "54a64c8fbb263df7e05b8532f0d6f50bd34f6b3cf3080ffc99c123b6b7009210"; + sha256 = "ac4df9d78ac0321f6be266e7fbf6b79d80bee7cfdf1b00c433072d2283c5fdf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/eo/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eo/firefox-83.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "87e497515f1a90d315e58f592d9360baef382bb986cc17a1a20e9ea9013550fc"; + sha256 = "f23479cb30cf27fa368e9e04591aad2051eedde5e69d105bfc9ba6168792b44b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-AR/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-AR/firefox-83.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "3306113b2e5249c9bef8cbe3ee30a76855402f39385ef730725fe19c650248fe"; + sha256 = "5657636c105d301474cf5d2707733a35ac5f5687790002d5778dffb32a727adc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-CL/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-CL/firefox-83.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "72fc2f9c4269255c5c9b6c65f11ce8613dd68a1b382c53cab159c56af91d4f12"; + sha256 = "896f2ac45b98eccd487de64b6c5aa98733d97bd4422dd1a16d02883e3a06c132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-ES/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-ES/firefox-83.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "720687e90a863bc08a79e7b98f52439efbf655cc170397095dcf2212839eeb77"; + sha256 = "9d337fc821dae150c4f3ce26c427ad0efa22c53f3b311b4ce7693b33c9ea4d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-MX/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-MX/firefox-83.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "32db50431886cf3e181a440eb40e4d9e93ebb0dd6c7e9eb3f6bb4cb203530d37"; + sha256 = "f9cbd03f9813157835ef7faf9fa2374e488144930ffdec765c370a95a9c72120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/et/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/et/firefox-83.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "21c2de424dad554b4e74509df0b40a49c23b77c406d44c611ea0e08eb98d1886"; + sha256 = "4f33cbb67003da1b4db4dc12ee2e7b9fe942bc6e6d770608361355ce7fcf8214"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/eu/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eu/firefox-83.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "96e3609f488fc8bdf899f07333121893dc5f74f520856536facb1a5b376773f0"; + sha256 = "31970c98d028a83a6198dcee9c5f8191343cd84ec6a7fa032a31730db2cc7b00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fa/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fa/firefox-83.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "572a6fe2bc5c0751077344e327ff11d434eeb26eade478dd79578822bc8ea167"; + sha256 = "1125c534f2067e57701fab7ae3df55c52dc10693b069817021072c74b8b9bdcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ff/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ff/firefox-83.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "08daf54db1c3927ff10c38ae462c806b0968abe89509e2a7251b39e2f3e3e43d"; + sha256 = "ef6c66b0d8a6edce0c982eaee55cd14a4ac4d365478976a0c4f1cd48a6c10c6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fi/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fi/firefox-83.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c2bfa5646d0f39262c79dbae82f2a443e145b0b318d4213e42f265dd378a0a73"; + sha256 = "bcd529c0227bd64403dc023ef91459556fbb186e072c12075b705d50293d86c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fr/firefox-83.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3e8ae367878e625b796e68fdc413ed4fa32a06260db7ecb000f3c089f7755a6d"; + sha256 = "47c56fe2b88054d97622e9c0ff2043323b7a916da1e11541e96cf7b05c3e7d52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fy-NL/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fy-NL/firefox-83.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "29dcf0040b32d2a183cc79f220ff37c6b8059a399fd111b9c4ab8f851b638acc"; + sha256 = "b0ed17e5022b0817d6b4f58ef990ce22774bde875151c60be1f7251ec90cb189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ga-IE/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ga-IE/firefox-83.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "d2f0c91780ef7dd353d58e41e539b917e6c957231579517d1d75cef89769a5b8"; + sha256 = "380aad276cadff8221e4f675751278ba994e08ddb46a0ebde12d87b741c23263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gd/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gd/firefox-83.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1c305c577072a792aee284559202b4ca8108df8f96b1ef17c20d6918498b3599"; + sha256 = "0489ed6e1e9150a0facb4e6fb59bea7673e89669d167806d5651224b939fada5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gl/firefox-83.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "86c829c97c30e5c49081283cc8ff5073d357ab09520194c56df63ab56858b083"; + sha256 = "bc41c2b611ecb4ccdedbbf480138a3bc6326106d6c1641d6a06e40f502427af0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gn/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gn/firefox-83.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "11a41052cb779cd11fa2e9c1f2f4367a190e78e36dce900f2fd84c451a6001be"; + sha256 = "ade8fe9ab75b0a5f75ce80ba0f8065c4b4cbf54d7772f4c3be96886ca166b373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gu-IN/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gu-IN/firefox-83.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6dfb8e60f2225a8db6a2b1ce31b23b51803d5fe9642cb85ff9f440e53c887616"; + sha256 = "bc20ad60eee0e6a3d532e436d9b62175872fcb27dab4c9a5083ed6f4bda5f036"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/he/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/he/firefox-83.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "8d2f9ed875b38e6d19776c0bfb3a66fe030215d43ee247c9f1a5b85c7dcf0105"; + sha256 = "a08862d8ebdfa2d6c4f038b91f264c9abe873537d1a7cd2997a1eb4d73bf6f4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hi-IN/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hi-IN/firefox-83.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "cf160dc3ff74855a206882e045395dc1ddd69d545184d7f02acb20289465842a"; + sha256 = "8ed5b454bdc38f07c79924a1dc08e76e65a48bd671991744a441693185683916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hr/firefox-83.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e62b04dba13d6d8dfada3976f23715cd221d5a9f0c9d2ea9a0b828c87222b8db"; + sha256 = "97356a661d56d51a9210109db8ad75d61e3e00e4c7570d4e824712b52337af27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hsb/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hsb/firefox-83.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "fbf8420109b4b7470bf8e5b889cbb51b5a9d827b9cedb2aeb5089f31e74b0211"; + sha256 = "5706aa76b23161baf24b79d2b45dd706006fb73aeedd06f41f3273f8078f371b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hu/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hu/firefox-83.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "161c7f91df6806310a10631f6d338cf86138f5056d265e4dfcc2823634a1cc79"; + sha256 = "3b894beaef35012df54ba4c7509a06ece1a0cdf741308b3510ddc702c4eb3656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hy-AM/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hy-AM/firefox-83.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a35885c431f6b160716355766c5e8f60ac94dc86675e91905c4781071de6c2a4"; + sha256 = "b2894092de59b7d6bd6dcd2111fa4591b1a4ed054fd107e2093bd0962edb4405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ia/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ia/firefox-83.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e162f166587a94aaaf9a6419fdd9da21f949c7db0d1ad223016d470841e124cc"; + sha256 = "9d9ee7e05a02078b7d4041c3b63e79f91f0a888b919cf726e2e69090ff05f71d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/id/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/id/firefox-83.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "bee0a6a4a0a9fa3c13650bcb4fefaaa07cce21211d2d4fc0030f4f9133781eab"; + sha256 = "13e54589a23323e9043d4dac5586a31e5d43bdde0356b1a00a86f91ee5813eb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/is/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/is/firefox-83.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8994bc2da81e1b17ac112e7ca7a43be9f578c049e879651a4014730937c83283"; + sha256 = "955a8a4ff1c5ba7124593b3c8537201ffb1fe33ea5c3edd6ab30e80e6b28f60a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/it/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/it/firefox-83.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "7fa77ed489b07954543ba117dc3cf67fc70341a5e486d35596cc8f80f630482f"; + sha256 = "23927419191d7aee8b29da29d213ee9c7ff39363f3fc9171c70d801158cb895b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ja/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ja/firefox-83.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "76d299e4d71a82e72bc2e446bcafcc1b1d63b54c57e9aeb7ff11e7bff8611811"; + sha256 = "4ffaf6df345922bcd82942956a0f344c4b52ac49ec64879fef7307a0c34eb8e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ka/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ka/firefox-83.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "6c027f7dbdff43c097a73ecad83aec6c7d623cfc8cdd77049d4dcab70984b403"; + sha256 = "df1027754efd054bae379b35228067799e75820b08ca7e6aff5a527fdaf046a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kab/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kab/firefox-83.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "ebd32284e83a0df7228f34263ea03b5b3f418fa5db193e01d20ef15f7ccc393d"; + sha256 = "6fc1e5d662ce742a48c003145b1b4b58cb296b43a20f718bdcffdc05e386078f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kk/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kk/firefox-83.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "39dcaefc6135f51157802878702debd14950a82a32b57862c9428236425de620"; + sha256 = "52cb3ac3a33da1227c3aa5e47e04620be2cc020bc520fcf013fe11ad74ad6378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/km/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/km/firefox-83.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "30b0fc4885498d9453dd3179a82d7fd12bcdb5a2b1f3d6227d7a7a68123544eb"; + sha256 = "c598fa97bb79f56d01afb30caeff29a2c7dd1f162d2fb49c0632ee259d0fe860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kn/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kn/firefox-83.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "ab0f33c172a47fd5fe1e3caa014938647dc870a97e9db0d1ed7e9b09a3fc920b"; + sha256 = "d6795f3f3c0978dbc399768fd824cceb6a3c1c883c153f65102ef476f74d6408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ko/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ko/firefox-83.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7e20d1d2c16e6278e1e8290c18b39833e23b12cc9bbcfcf3135e52d3c155118d"; + sha256 = "b4d0b62cdfd332d8e9878b75918a0362a7b68db0b62e4e4508dfa176e79b8ed7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lij/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lij/firefox-83.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "5da50a6a54b1ce15af8ca26bdb2756449622f6d441593bae4f558c079ef732ce"; + sha256 = "257eec8bead076119b0c3679feb4f3de34c9cf66bd05215e7d76936e6d3ce052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lt/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lt/firefox-83.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a4bf43fd06f915720f3050750f226629a602aed690b74df728cfd616f8d1d063"; + sha256 = "326925d68306ec6e5b7334eb413cff395ce6a27abf5b0981dee25a7888c64079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lv/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lv/firefox-83.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "8f8eaf80606a140616cfa17fb69bc611ac631a8ec1e4d204fb0de1c073b767aa"; + sha256 = "036264de51a7a81b3d636b8217db571db70631231d485f353e64e9f43f0192f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/mk/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mk/firefox-83.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "869715dd3d72c48db3007557aabc96fee78b73ecdc747ec0f361365eb1072111"; + sha256 = "6d4966ae49ba7746395b17b98c158c07d33293b68a6c648d0238107812ccfc03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/mr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mr/firefox-83.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "ae921995425812eb2b70a479dc1d6bc319d397c7c16e020460d2d1f65cdc9305"; + sha256 = "88a90205bfd157fbcb0697efbd4884772a463f776f5110aae9903dbc1151fcbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ms/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ms/firefox-83.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "55fc6ca427864cd885fa8da786f50f4e88ef2d9adf331e55a6f8e781fe5f7838"; + sha256 = "67d3651739404a73f263251896c129dc121808d4859169b3469b640345433e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/my/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/my/firefox-83.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "26377b5108cd1208d111792dad61cf521fda0f4c4206d17e4907b06e4ab5e7d8"; + sha256 = "d7e9a1fe6d2e0e32c2ab9a773d198de241ac2a7d330d9eddce4f3afb9a67671b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nb-NO/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nb-NO/firefox-83.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "19bcb61803f6d6bbecfd94eb769b3d302a951ac5d7f337b6937f9282cbb8222a"; + sha256 = "66c165884d4397db3e420151d2b6fa3d7bb7c6de790e6d284815cdcc323da3fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ne-NP/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ne-NP/firefox-83.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4575f7730e5964fa5be7ec351907d97794c06bf101bea5a98785238304d1fea9"; + sha256 = "f75832bd74f5ce8db3765201eee058f0386f196f407223e186c0be3d2a665fcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nl/firefox-83.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f22f33b1a1127a4dc91781031c0112b05e8cd5fbbb8c732a6e18b5beeb5627ec"; + sha256 = "beb68fb193dfcccbe22369f9adcbebe701fd4c9ab5943ec685d5d20398a1ea5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nn-NO/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nn-NO/firefox-83.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d59e605d47601c18d12e6a2a57cfb8c8752fea2711e8cb0d822b18a4f7a2c049"; + sha256 = "de2716b8f4c13c6ef76537ef52f1d0529016302ce220a90d9b5062af9becb5b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/oc/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/oc/firefox-83.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "859b0b3b7317a4b94292edcb8f159d4c42404efcf67a170f435131b0b2331422"; + sha256 = "af2a788560a65cb9f3d2ce98acce4ecd3b3105b6c924c6a4de1a9deb6f2a4d42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pa-IN/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pa-IN/firefox-83.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b8553bcc65ce5a075875849508876f34478a0d8166b048b4b8d0b37aacad359e"; + sha256 = "a3575371b20bab63a8bccc110343e0cd0736cffbc5c72dd7aa371c646a057060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pl/firefox-83.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "8428f5438edadd7f3e531aeb905bd46f52a3a624e1a36706b3e0e79d29366b94"; + sha256 = "daa554b493ce1efa90a1b040e78d2f2e7ad8ca70c16ee19312c69ed4a12f00e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pt-BR/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-BR/firefox-83.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "021cb4431781ef19cf7be1f987b6859c2c8b7db67f1428cec475d4de82d38118"; + sha256 = "4f3fe4a1ce0e12383b37832f44b59fbb40b8fb6e95786edc57ea67ea3d5530bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pt-PT/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-PT/firefox-83.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e55fe5ebb512e184e2c67dc6b866a0f727fa89bda6fb2ed763195761b67bc79c"; + sha256 = "c16bcb116b845a6b28b72096ae43d50f19c7b9868c8bbb833db60eaaa70b001d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/rm/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/rm/firefox-83.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "30bc0d66c940ddaeaff516e900f85c652a3dee07d2ede81710efd31c5858e72e"; + sha256 = "334d3dcf333a66f4bd169536f7f3b56ba4b257793dfd0837badff2a77b3668f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ro/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ro/firefox-83.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e467c27dafce634f4e507ba5520ea4dfc3d3fca2f751a8ae55fb3fb26a073b3f"; + sha256 = "1e6ad9735fe0046beaf80ac35d0a1831aade14f388d08991b9bc583135ebd94c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ru/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ru/firefox-83.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "d0ea589f932e1dd4a1f6d12a758210e22213794f5d45ec5bb85621aa1ba206d2"; + sha256 = "a252bcd66f01375fbc4ce040b89c853c34745e8dede116d200303c56d6307f15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/si/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/si/firefox-83.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "6a22d47d1c193a2a048c7535ec49f2198bd2616e123353af0391272db9decd3b"; + sha256 = "ebc5ce83b456f75b671694ac954258ca480caee563e0cb395786692aedf24d88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sk/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sk/firefox-83.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c38f8f2f172c0de6d526be926c874a765116f14af5f50cb65cd7771a46cdcfe0"; + sha256 = "28aac94a71298c459f14949c9c82b379762d3192a16d92e90605ab8925cb31ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sl/firefox-83.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f39c27bb7d334f20e09fed97c3589db6aae988d3e538d7e2dbae690ab4b4e521"; + sha256 = "7fe0eb68a898488bcb697120542fbdcfd1d972c658b4c361bba351a8f5eb76e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/son/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/son/firefox-83.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "7edcdcb248e6cb9a78fd4061a2ab54e03692834f87c6d565ed9b777c952ba5fa"; + sha256 = "f9cb1327834b6a6e41d4abf531410391a40f33a8d168d562dc367faf31d9e042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sq/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sq/firefox-83.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "db3a6edc2a4008c09ba931e965e9853404dd272455ec8d6b20bf86e14a095bea"; + sha256 = "15370cc0527797f451a5a1f47637c6663437c8f49fc5c056ccbc2e7510cd6c94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sr/firefox-83.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "aa6bf3ed3402813f56b6d6c53a70da8c7decad3f9d3c3af66336aadc632e334c"; + sha256 = "c44773c36eb39067e429fb4a4b57676abc7eb9fcf45bd6654d96761f64747c6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sv-SE/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sv-SE/firefox-83.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8ffe039f7ed159150c6ad804e980c597741439dcc339841e464589ebd535eb38"; + sha256 = "aa8d2dc50dce8a53a926c71a4a7a57023a017d5fbd54cd1e446ef74b5eef7dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ta/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ta/firefox-83.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "a46c944cc5b22fefe8503cf079be32cc5aeb2cd1b78e5642f5ec55f8baf28586"; + sha256 = "5fc3e8a048ec24e49c4c4a0e36712b378687e927c30dc8ecb3ec63bcf983062a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/te/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/te/firefox-83.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "a7ce32a838d4add3123116628301fb6642311fd3f6fffe0ca4ed6cb314c162fe"; + sha256 = "ff123410cec64c47d239a432d32eaefa494e7cd7fb0157cc45917fe04b2916ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/th/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/th/firefox-83.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "3ed82ac4d015d397cb53149f30e2842614092413d84dd6add365428b80c40cdd"; + sha256 = "cb7cbf97884a5b4f62c4e0932ead0e5de018c9623590ac3798a86986916258dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/tl/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tl/firefox-83.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "cdd9b16ad2fefdccbdea8bad3863e3177bd166fb595609f74b1afb7d279c4390"; + sha256 = "0d55a23e2c0b7da80a6c042e50fc3c9364c3f24309cf255bfbe55a320ec2cf00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/tr/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tr/firefox-83.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "4b75d68d159ee4463854b53d0f68364648c2b36e6c0fc8937573cf2a1262ad0b"; + sha256 = "bfc1adb570f79b4f095bc87ab5a54c6b5179579840ded61319a10ad5ff39d52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/trs/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/trs/firefox-83.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b0947e9e8f45d848093805ff34a59d6c74a5559df91da5bf2255e2a24d386f95"; + sha256 = "05b5a2252380147ec47561e29514e3f994414b46aae3dd168909f03e7dec16ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/uk/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uk/firefox-83.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a4ff8ded991f00825e10ebe69be7183899d8bca0692eae4e2c60049e80d6710d"; + sha256 = "7e34b52f4d46a735e36f549295d0f9704113024058a7d8d69a8ee6a023d03755"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ur/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ur/firefox-83.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ee50b6ac2818824211c5fb871f19eb0582a5f50c3873139d6aed613d9a853197"; + sha256 = "1d48e536c09f862bc00fcaf9a175eaeffac1e0aaff66d71ca49123c00cc885bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/uz/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uz/firefox-83.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6c530bd3bb2d1a3072513b203afd44affadd4cd3e8f9136f2b7e4e942d7cbd27"; + sha256 = "1f1cf131b3196886aa0f923c5dbaa279b86c3473dc048ce23d58fe811ca1266c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/vi/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/vi/firefox-83.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ebfba78fe1778b0e724822adf1f448f005f4575c4c47eaf4d7347c808d2fe5a2"; + sha256 = "b98507cd809abd28c51514448bf995661dede7c727808ab8c2db46da8da0a164"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/xh/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/xh/firefox-83.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "e9e9b4b5cf377ab18c857242d1915ec0198393d35fd93c4ead4ac1d790db4d97"; + sha256 = "73de4ec29cd09610359909ada39820a119a15c3ae0cc1658c2e9b874801a9015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/zh-CN/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-CN/firefox-83.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c7d8459ff0eaaac129f168c54454af90f9618c8515f9df2a35de578611700372"; + sha256 = "fea085476f4456133c1f0973121319f1c3efadcc50134cbf5ccde351bbe2ff06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/zh-TW/firefox-82.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-TW/firefox-83.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b9a3074700de458cd43721b683597f95f2ad81834a15d5ebde22dfc324d92fb3"; + sha256 = "5aebd374f2e73f83bec4c14239555d9f2771d3379280fc55f90f1ae0909be009"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index a98891df4d1..fd3982a7c62 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -4,7 +4,7 @@ { lib, stdenv, pkgconfig, pango, perl, python2, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg -, freetype, fontconfig, file, nspr, nss, libnotify +, freetype, fontconfig, file, nspr, nss, nss_3_53, libnotify , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification , libvpx_1_8 @@ -106,6 +106,8 @@ let # 78 ESR won't build with rustc 1.47 inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) rustc cargo; + + nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss; in buildStdenv.mkDerivation ({ @@ -116,12 +118,37 @@ buildStdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch - ] ++ lib.optional pipewireSupport + ] ++ + + # there are two flavors of pipewire support + # The patches for the ESR release and the patches for the current stable + # release. + # Until firefox upstream stabilizes pipewire support we will have to continue + # tracking multiple versions here. + lib.optional (pipewireSupport && lib.versionOlder ffversion "83") (fetchpatch { # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; }) + ++ + # This picks pipewire patches from fedora that are part of https://bugzilla.mozilla.org/show_bug.cgi?id=1672944 + lib.optionals (pipewireSupport && lib.versionAtLeast ffversion "83") (let + fedora_revision = "d6756537dd8cf4d9816dc63ada66ea026e0fd128"; + mkPWPatch = spec: fetchpatch { + inherit (spec) name sha256; + url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}"; + }; + in map mkPWPatch [ + { name = "pw1.patch"; sha256 = "1a7zvngn3k7dg886zmi38kmrsdzh2rrr46aw59bhr1gfmq8wlwn0"; } + { name = "pw2.patch"; sha256 = "17irg3yb2mchcy0z0nr4k65mwvkps467cvvczr10fnm06lhkhw1l"; } + { name = "pw3.patch"; sha256 = "12p6ql5ff2lfzlni6xkpz63h2xr6n2a9zf8hhjl99fj56rif6706"; } + { name = "pw4.patch"; sha256 = "0rvysc92rdm98s47w5lvbnrklrf7d299k3918qnldniyb4b9p4mg"; } + { name = "pw5.patch"; sha256 = "0kk2yxq4qkfwc4px6m08jrn18a7a7dhrngfiaw84r9ga6sgn0z00"; } + { name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; } + { name = "pw7.patch"; sha256 = "0afw7cfd48vn62zb9y5kd2l26fg44s3aq1kyg3gm4q3rj34xidf6"; } + ]) + ++ patches; @@ -144,7 +171,7 @@ buildStdenv.mkDerivation ({ # yasm can potentially be removed in future versions # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ - nspr nss + nspr nss_pkg ] ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed @@ -165,14 +192,14 @@ buildStdenv.mkDerivation ({ NIX_CFLAGS_COMPILE = toString [ "-I${glib.dev}/include/gio-unix-2.0" - "-I${nss.dev}/include/nss" + "-I${nss_pkg.dev}/include/nss" ]; MACH_USE_SYSTEM_PYTHON = "1"; postPatch = '' rm -rf obj-x86_64-pc-linux-gnu - '' + lib.optionalString pipewireSupport '' + '' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") '' # substitute the /usr/include/ lines for the libraries that pipewire provides. # The patch we pick from fedora only contains the generated moz.build files # which hardcode the dependency paths instead of running pkg_config. diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e7dd034a8ac..352e7bac5e9 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "82.0.2"; + ffversion = "83.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "25wkgsqnafmq30m1kd1axkm454dhl2bmz6100i3ccqnn31vw3nyy6k3k1apsn62siqswpm55iclzcb10y4dfyyqcszvflim47c8i37k"; + sha512 = "3va5a9471677jfzkhqp8xkba45n0bcpphbabhqbcbnps6p85m3y98pl5jy9q7cpq3a6gxc4ax7bp90yz2nfvfq7i64iz397xpprri2a"; }; patches = [ @@ -26,7 +26,6 @@ rec { broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; - timeout = 28800; # eight hours }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; @@ -36,10 +35,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.4.0esr"; + ffversion = "78.5.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "13640ssp1nq9dsfv8jqfw2paqk3wzwc4r47mvbhb4l9h990gzzb2chhlcjq066b7r3q9s0nq3iyk847vzi7z1yvhrhsnzfgk9g9gpnr"; + sha512 = "20h53cn7p4dds1yfm166iwbjdmw4fkv5pfk4z0pni6x8ddjvg19imzs6ggmpnfhaji8mnlknm7xp5j7x9vi24awvdxdds5n88rh25hd"; }; patches = [ 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 f6f6deb7380..e340e3a052e 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.2"; + version = "10.0.4"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "sha256-JBJDMC44VSh1ekXPxsVvFk5nOB8Ro4UGtD32pG1weP8="; + sha256 = "sha256-2Ye1+mhFnkZnAYQXgKZ5YIOiIVaiunTCyCOM+ZExw2I=="; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "sha256-EanW2Q8TtCPY5FSp8zfgBXMte9+RfKE24fu8ROtArK0="; + sha256 = "sha256-B0WGkIt8KDtma/WGyenQ04ctKE7AantUtYnwsjAZZb0="; }; }; in @@ -231,9 +231,10 @@ stdenv.mkDerivation rec { # Preload extensions by moving into the runtime instead of storing under the # user's profile directory. - mkdir -p "$TBB_IN_STORE/browser/extensions" + # See https://support.mozilla.org/en-US/kb/deploying-firefox-with-extensions + mkdir -p "$TBB_IN_STORE/distribution/extensions" mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \ - "$TBB_IN_STORE/browser/extensions" + "$TBB_IN_STORE/distribution/extensions" # Hard-code paths to geoip data files. TBB resolves the geoip files # relative to torrc-defaults_path but if we do not hard-code them @@ -409,6 +410,5 @@ stdenv.mkDerivation rec { # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. license = licenses.free; - broken = true; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index fd5a8604455..2b8dc83da50 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -344,7 +344,12 @@ let patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" ''; - passthru.updateScript = ./update.py; + passthru = { + updateScript = ./update.py; + chromiumDeps = { + gn = gnChromium; + }; + }; }; # Remove some extraAttrs we supplied to the base attributes already. diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix index 3cd0ec34db1..b02c91c6e23 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -37,26 +37,15 @@ let inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; inherit ungoogled; - # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-07-20"; + inherit (upstream-info.deps.gn) version; src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe"; - sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q"; + inherit (upstream-info.deps.gn) url rev sha256; }; }); } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine) - gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-08-17"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "6f13aaac55a977e1948910942675c69f2b4f7a94"; - sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251"; - }; - }); }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix index abcb2ce391a..73c9796aaa9 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -1,6 +1,6 @@ { - "86.0.4240.111" = { - rev = "86.0.4240.111-1"; - sha256 = "0fkk0lxbvik8q8d5njxmwiam64qz5g74hlb56w24nh5mh1jm59a8"; + "86.0.4240.183" = { + rev = "86.0.4240.183-1"; + sha256 = "0528l2wr5bpl1cwsxzl5zxz1gw91kffkh5j1kzmc5n7m4mscqxyc"; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py index bfc7f0d2478..b404ca555bf 100755 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py @@ -1,13 +1,15 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p python3 nix +#! nix-shell -i python -p python3 nix nix-prefetch-git import csv import json +import re import subprocess import sys from codecs import iterdecode from collections import OrderedDict +from datetime import datetime from os.path import abspath, dirname from urllib.request import urlopen @@ -26,6 +28,30 @@ def nix_prefetch_url(url, algo='sha256'): out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) return out.decode('utf-8').rstrip() +def nix_prefetch_git(url, rev): + print(f'nix-prefetch-git {url} {rev}') + out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev]) + return json.loads(out) + +def get_file_revision(revision, file_path): + url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' + with urlopen(url) as http_response: + return http_response.read() + +def get_channel_dependencies(channel): + deps = get_file_revision(channel['version'], 'DEPS') + gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'" + gn_commit = re.search(gn_pattern, deps).group(1).decode() + gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit) + return { + 'gn': { + 'version': datetime.fromisoformat(gn['date']).date().isoformat(), + 'url': gn['url'], + 'rev': gn['rev'], + 'sha256': gn['sha256'] + } + } + channels = {} last_channels = load_json(JSON_PATH) @@ -58,6 +84,8 @@ with urlopen(HISTORY_URL) as resp: # the next one. continue + channel['deps'] = get_channel_dependencies(channel) + channels[channel_name] = channel with open(JSON_PATH, 'w') as out: diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json index 5fded39c749..565f884c510 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json @@ -1,17 +1,41 @@ { "stable": { - "version": "86.0.4240.111", - "sha256": "05y7lwr89awkhvgmwkx3br9j4ap2aypg2wsc0nz8mi7kxc1dnyzj", - "sha256bin64": "10aqiiydw4i3jxnw8xxdgkgcqbfqc67n1fbrg40y54kg0v5dz8l6" + "version": "86.0.4240.183", + "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma", + "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9", + "deps": { + "gn": { + "version": "2020-08-07", + "url": "https://gn.googlesource.com/gn", + "rev": "e327ffdc503815916db2543ec000226a8df45163", + "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr" + } + } }, "beta": { - "version": "87.0.4280.27", - "sha256": "0w0asxj7jlsw69cssfia8km4q9cx1c2mliks2rmhf4jk0hsghasm", - "sha256bin64": "1lsx4mhy8nachfb8c9f3mrx5nqw2bi046dqirb4lnv7y80jjjs1k" + "version": "87.0.4280.40", + "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3", + "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41", + "deps": { + "gn": { + "version": "2020-09-09", + "url": "https://gn.googlesource.com/gn", + "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", + "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + } + } }, "dev": { - "version": "88.0.4298.4", - "sha256": "0ka11gmpkyrmifajaxm66c16hrj3xakdvhjqg04slyp2sv0nlhrl", - "sha256bin64": "0768y31jqbl1znp7yp6mvl5j12xl1nwjkh2l8zdga81q0wz52hh6" + "version": "88.0.4300.0", + "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b", + "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv", + "deps": { + "gn": { + "version": "2020-09-09", + "url": "https://gn.googlesource.com/gn", + "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", + "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + } + } } } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 29a48939fac..aa4dd7f8e44 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.3.2022.47-1"; + version = "3.4.2066.90-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0lraliqb5r8akh8lfmw2sy90s58sbghcpc598nlz2d89f91yq7vz"; + sha256 = "059vcr2j0vr8szqcxfqnzxwy5i8z53g71fwhm22nc0477jbrsxz1"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 39ad9ef1d15..e57cf810491 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkgconfig -, libhandy +, libhandy_0 , modemmanager , gtk3 , gom @@ -43,13 +43,12 @@ stdenv.mkDerivation rec { buildInputs = [ modemmanager - libhandy + libhandy_0 evolution-data-server folks gom gsound gtk3 - libhandy libpeas ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index d61d32e40e9..738917f3799 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.10.2"; + version = "2020.11.5"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "0ppl74gb46r2x65hl7z1hjdqlr8la0pvhy8af8isk11sbxmprqjj"; + sha256 = "09bjqcrz7s40m7afb80dpx7jncp5prn2p6bksspv5wqc84l2nn5d"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 49b45308ce3..6f2344bd3e7 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.11.6"; + version = "2.11.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "1vlz1f4hyzgz1x9xgzlmpnbjba8xyhpx9ybia0pwilfg7mwfq92r"; + sha256 = "1i7qgghnb39bibnk07f47k64qpkb1k8mi3bbfnx6mxl0jlq335af"; }; vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray"; diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index fe45b9ccb40..c4789661951 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { description = "CLI client for Flux, the GitOps Kubernetes operator"; homepage = "https://github.com/fluxcd/flux"; license = licenses.asl20; - maintainers = with maintainers; [ Gonzih filalex77 ]; + maintainers = with maintainers; [ Gonzih Br1ght0ne ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index a0daba8d8f2..86d1fd1383c 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1z5s8c6yrc1v2y54lx2mbyz31schzpaz2r304m0wwxhn06p43sl0"; + sha256 = "13w0s11319qg9mmmxc24mlj0hrp0r529p3ny4gfzsl0vn3qzd6i2"; }; - vendorSha256 = "0vcvmbvfmj0bi5msjhy9qcqabiscjpfqpnb1lxy49mshs902qc14"; + vendorSha256 = "0x3dcvnrl7cs8faaiq9ybfgg0lkac5ppf61i724cja270nmpmazl"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index f8c7ce2254e..fe68d90dd92 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.132.1"; + version = "0.134.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "03i9pl3iwqk5az73qm9rxdq8c5nd9l4w3c28yk55bfgpwpnxcwjc"; + sha256 = "14qlz6b4iddc5qxm4w4pvhkbzv60qzymn3bkyrpbx189b2yfvh6c"; }; - vendorSha256 = "0r4p4nwhmxg06qyf86gd2g61l4r1mlpblh4vhsc1shbz9iigykzi"; + vendorSha256 = "0nk2f38qjmhy45pw9yz53acmsdy2fdxswqnasvbmfzrb85b0fnfq"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index d4f1e82d511..d044840637e 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.4.6"; + version = "3.5.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "018bkl6q6q8njv9qy87affs0g6c716vmhcqv2czv8qz454hn7i5h"; + sha256 = "0vng0ra8bjxmfq6xvdxn72f5bcjrv8i72dams80lf0mq3l7wjl7c"; }; vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index f26697f0561..ec5b6f44c6f 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.23.3"; + version = "0.23.10"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "0jdrjsv6miprw0bj964rgkbci4xdwfi536z3px93i2n9zrhhawpn"; + sha256 = "0nfgi67ja36mymhcyh4902680pkfnk4g8j8nbajksx9nfp53n91v"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "105vmy8agl3ppgi28wg7djx0jrfam7nxfvvlps9ycgyrv2qpjh2n"; + vendorSha256 = "116aidry55917ays7rn5r5kj17nbgb9qi16bplml9kxfkjv072kz"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index e50f6e3462c..712761eeef2 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.36.1"; + version = "0.37.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "0j9a7lxspgw63xzz1f8r5fb67jxm5isdvfi5450v20virxch9afi"; + sha256 = "1b1sgwax67pazcs1lly3h3bb7ww91lcd3nr0w3r3f46d1c6iy8mn"; }; - vendorSha256 = "06kx85bf8mjmyhz5gp0la4fr8psnfz6i2rchc22sz2pgmsng1dfr"; + vendorSha256 = "0dn6nryf3vn7r0xna02va4wbgkq0z6x8sj6g2mskfywrk0mfhadv"; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 0f39fc5281e..69119673f30 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "3.1.5"; + version = "3.2.1"; k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "0aspkar9im323d8117k48fvh1yylyspi2p2l2f5rdg1ilpa6hm53"; + sha256 = "1910vir9yc3xvb23260xljnfpznyhnk4gddy752rrndz7rk1b5c3"; }; buildFlagsArray = '' @@ -23,12 +23,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - # TODO: Move to enhanced installShellCompletion when in master: PR #83630 postInstall = '' - $out/bin/k3d completion bash > k3d.bash - $out/bin/k3d completion fish > k3d.fish - $out/bin/k3d completion zsh > _k3d - installShellCompletion k3d.{bash,fish} --zsh _k3d + installShellCompletion --cmd k3d \ + --bash <($out/bin/k3d completion bash) \ + --fish <($out/bin/k3d completion fish) \ + --zsh <($out/bin/k3d completion zsh) ''; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 4d883553bc3..ced9c43876f 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "18rkjdl8asr5c1kgdm2iqb5qwkfcrv2sk3nns3hhfqzs2v9mxmha"; + sha256 = "0jw8v6ff0iwkwxlhcr35cvhy4zg31dsm1s3q4fxgi901yj1wn6zy"; }; vendorSha256 = "0al8y65xvnwl34jkpqyf6zwr21xn30zswknlym9nnn1n47fyayxb"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index a56db433194..9a8bbe09a50 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0fpkgrykkjmkrh327g6zf3r6s39bnv5w1wlqsvvzyp2zsswgw81v"; + sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 134d25ae678..6281d652d0c 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.14.2"; + version = "1.15.0"; - vendorSha256 = "057mlmja3mygfdf0cp0bcm0chq7s30bjcs5hqacwl6c79ivrjf89"; + vendorSha256 = "1xkk4f8qjqx5x878iniclni3jm2f7ka47va756vc3vk8p5s6vpdk"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1fidvfm9x3rbqfjn9zm5kx9smk94dmjm4gb98rrdmgsld5fg99xj"; + sha256 = "1n1jhsa0lrfpqvl7m5il37l3f22ffgg4zv8g42xq24cgna951a1z"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix new file mode 100644 index 00000000000..9e37bb6afe2 --- /dev/null +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl }: +let + version = "0.16.0"; + + system = stdenv.hostPlatform.system; + suffix = { + x86_64-linux = "Linux-64bit"; + aarch64-linux = "Linux-arm64"; + x86_64-darwin = "macOS-64bit"; + }."${system}" or (throw "Unsupported system: ${system}"); + + baseurl = "https://github.com/vmware-tanzu/octant/releases/download"; + fetchsrc = sha256: fetchurl { + url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz"; + sha256 = sha256."${system}"; + }; +in +stdenv.mkDerivation rec { + pname = "octant"; + inherit version; + + src = fetchsrc { + x86_64-linux = "1i6i42hwxaczkfv8ldxn3wp6bslgwfkycvh88khfmapw2f5f9mhr"; + aarch64-linux = "1ka5vscyqxckxnhnymp06yi0r2ljw42q0g62yq7qv4safljd452p"; + x86_64-darwin = "1c50c2r2hq2fi8jcijq6vn336w96ar7b6qccv5w2240i0szsxxql"; + }; + + doBuild = false; + doCheck = false; + + installPhase = '' + mkdir -p "$out/bin" + mv octant $out/bin + ''; + + meta = with stdenv.lib; { + description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters."; + longDescription = '' + Octant is a tool for developers to understand how applications run on a Kubernetes cluster. + It aims to be part of the developer's toolkit for gaining insight and approaching complexity found in Kubernetes. + Octant offers a combination of introspective tooling, cluster navigation, and object management along with a + plugin system to further extend its capabilities. + ''; + homepage = "https://octant.dev/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 1793af1085a..293cdb67371 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "0hp10qgalglsdhh6z6v4azh2hsr89mdrv1g5lssfl5jyink409yd"; + sha256 = "1f67b236njz1qdxjyf2568vkigjmpylqlra29jlgm6vhd5qky7ia"; }; - vendorSha256 = "15x8fqz2d2793ivgxpd9jyr34njzi1xpyxdlfyj1b01n2vr3xg4m"; + vendorSha256 = "1pr265g11lcviqw974lf05q52qrfpwnpn9a64q6088g0nfp4ly06"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index ebe787a2519..6ce7ad6092a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -149,16 +149,6 @@ let ''; }); - # provider was moved to the `vultr` organization, but kept the old references: - # https://github.com/vultr/terraform-provider-vultr/pull/67 - # this override should be removed as soon as new version (>1.4.1) is released. - vultr = automated-providers.vultr.overrideAttrs (attrs: { - prePatch = attrs.prePatch or "" + '' - substituteInPlace go.mod --replace terraform-providers/terraform-provider-vultr vultr/terraform-provider-vultr - substituteInPlace main.go --replace terraform-providers/terraform-provider-vultr vultr/terraform-provider-vultr - ''; - }); - # Packages that don't fit the default model ansible = callPackage ./ansible {}; cloudfoundry = callPackage ./cloudfoundry {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 42ed3d21066..4662a315a8c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { pname = "terraform-provider-libvirt"; - version = "0.6.2"; + version = "0.6.3"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "1wkpns047ccff0clfb1108wjax1qb5v06hky0i3h2wpzysll7r7b"; + sha256 = "0ak2lpnv6h0i7lzfcggd90jpfhvsasdr6nflkflk2drlcpalggj9"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index d64178b1e65..a583bc33514 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-provider-lxd"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "sl1pm4t"; repo = "terraform-provider-lxd"; rev = "v${version}"; - sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv"; + sha256 = "00gj7zj45wm9sf7a7nybjijdrdr00g2yf8h41c6j679a6nfnx0fd"; }; - vendorSha256 = "1shdpl1zsbbpc3mfs0l65ykq2h15ggvqylaixcap4j4lfl7m9my0"; + vendorSha256 = "0xq8zgx8h47pc88nkdvy5skpr8vk87b4212mm5msfxk8n7nl4fi2"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 83843a82a66..3136529baed 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1017,9 +1017,9 @@ "vultr": { "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v1.4.1", - "sha256": "1jx9p4bwpa5zxig6gfk4akfsnbivvyhwcw8id2ch2ga9a67pwald", - "version": "1.4.1" + "rev": "v1.5.0", + "sha256": "04qy366ignn53bbdj9s3032qr1x7h84q36qzl5ywydlw2va0qbsd", + "version": "1.5.0" }, "wavefront": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index b73f24ed47d..b478071ead1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -114,7 +114,7 @@ let (orig: { passthru = orig.passthru // passthru; }) else lib.appendToName "with-plugins" (stdenv.mkDerivation { - inherit (terraform) name; + inherit (terraform) name meta; buildInputs = [ makeWrapper ]; buildCommand = pluginDir + '' diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e3f2adacfb2..68c41c64d86 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, terraform }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: buildGoModule rec { pname = "terragrunt"; - version = "0.25.5"; + version = "0.26.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "19rsnhws4cvssxjmm22j746jck0wzrhwi24hnlwxkdaaw92yd36l"; + sha256 = "0bp43rsnkq2ysdl0v28i9agan738m0zk5yn8zza6js28sx0y7kns"; }; vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n"; @@ -19,11 +19,6 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=" "-X main.VERSION=v${version}" ]; - postInstall = '' - wrapProgram $out/bin/terragrunt \ - --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform - ''; - meta = with lib; { description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; homepage = "https://github.com/gruntwork-io/terragrunt/"; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 0d5835a8cde..415031d2771 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "velero"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "vmware-tanzu"; repo = "velero"; - sha256 = "1rmymwmglcia5j0c692g34hlffba1yqs2s0iyjpafma2zabrcnai"; + sha256 = "1hfi1iipbval0c0c0nnf6fz5n76za0vwczm5lq86sddqnznbvsrz"; }; buildFlagsArray = '' -ldflags= -s -w -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version} - -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=87d86a45a6ca66c6c942c7c7f08352e26809426c + -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=456eb19668f8da603756353d9179b59b5a7bfa04 -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean ''; diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 896904b0cac..441a80fc071 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -8,7 +8,7 @@ , gdk-pixbuf , glib , gtk3 -, libhandy +, libhandy_0 , openssl , sqlite , webkitgtk @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 - libhandy + libhandy_0 openssl sqlite webkitgtk diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 0cb0d17cc5a..17306059e99 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.50.0"; + version = "3.51.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-4NuHJpylIIqtFKAkFTN7T57+PEnC1NFOZukhx4oTXBA="; + sha256 = "0k3c7gm16snc6dr9a3xgq14ajyqj4hxcrd6hk6jk5fsi9x51rgl2"; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index d9168d7a298..a0f35f3779d 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.15"; + stableVersion = "2.2.16"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "149yphmxc47bhc2f942lp4bx354qj3cyrpn10s1xabkn2hwrsm0d"; - serverSrcHash = "03cfg48xzgz362ra5x853k8r244dgbrmszcprs2lg70i3m722345"; + guiSrcHash = "1kz5gr5rwqp1hn9fw17v6sy2467506zks574nqcd2vgxzhr6cy6x"; + serverSrcHash = "1r6qj1l8jgyjm67agn83zp9c2n7pgfzwyh8a5q314zxi18nm6rqp"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index bbf3f0514c4..ad346104f96 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -35,7 +35,9 @@ in python.pkgs.buildPythonPackage { postPatch = '' # yarl 1.4+ only requires Python 3.6+ - sed -iE "s/yarl==1.3.0//" requirements.txt + substituteInPlace requirements.txt \ + --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \ + --replace "yarl==1.3.0" "" ''; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index 71726056a55..e10d97aeb42 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchgit, ncurses +{ stdenv, fetchurl, ncurses , patches ? [] # allow users to easily override config.def.h }: stdenv.mkDerivation rec { pname = "sacc"; - version = "1.01"; + version = "1.02"; - src = fetchgit { - url = "git://bitreich.org/sacc"; - rev = version; - sha256 = "0n6ghbi715m7hrxzqggx1bpqj8h7569s72b9bzk6m4gd29jaq9hz"; + src = fetchurl { + url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz"; + sha512 = "18ja95cscgjaj1xqn70dj0482f76d0561bdcc47flqfsjh4mqckjqr65qv7awnw6rzm03i5cp45j1qx12y0y83skgsar4pplmy8q014"; }; inherit patches; diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index cf872b77b8d..a54a47b9c8f 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { description = "A third-party, open-source ProtonMail bridge"; homepage = "https://github.com/emersion/hydroxide"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 795f71a3cd0..03508c2ffb5 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -18,24 +18,15 @@ stdenv.mkDerivation rec { pname = "dino"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54"; + sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw"; }; - patches = [ - (fetchpatch { - # Allow newer versions of libsignal-protocol-c - url = "https://github.com/dino/dino/commit/fbd70ceaac5ebbddfa21a580c61165bf5b861303.patch"; - sha256 = "0ydpwsmwrzfsry89fsffkfalhki4n1dw99ixjvpiingdrhjmwyl2"; - excludes = [ "plugins/signal-protocol/libsignal-protocol-c" ]; - }) - ]; - nativeBuildInputs = [ vala cmake diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 8672f64be38..bb37380a682 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.114"; + version = "0.0.115"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0j3w4jf4jisrpz03462sqjsrvjw50kqqq3psyympw0jb1wjccc41"; + sha256 = "0w9i3plbiiy2kp4yahsdvz0f4wpszsgqdnlgzbnx7wj0xk4qrkcx"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 364f5a25d0a..871850fd6a6 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.12", + "version": "1.7.13", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index b31841c5e79..4f387045bb4 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.12"; + version = "1.7.13"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "08d9llrglap5bbicdkbdl9l71wba2kkyhdyd0a4iqdz3l2jvv698"; + sha256 = "04nm5amhc0bqqwcc1c9x88lnbjaaryfs0xhi4as65l5ac4jdkzjc"; }; electron = electron_9; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 0d3e771630f..93f9e34f867 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.12"; + version = "1.7.13"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "173hdg09cw13vqh0lvz6kl0mq4i3rsacjxhspkpydh2qd1g3hjrs"; + sha256 = "13ylzyr1kkrppvp86kih60pqxlsvqlcsgz2gj4azgmrf2bijfby3"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 68e7282870b..7098bba2de0 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -12,7 +12,7 @@ , pkg-config , gtksourceview4 , glib -, libhandy +, libhandy_0 , gtk3 , dbus , openssl @@ -63,10 +63,10 @@ rustPlatform.buildRustPackage rec { gtkSupport = true; }) gst_all_1.gstreamer - gst_all_1.gst-validate + gst_all_1.gst-devtools gtk3 gtksourceview4 - libhandy + libhandy_0 openssl sqlite ]; diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix index 97f77522022..caf6669e120 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -1,14 +1,14 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - pname = "matrix-dl-unstable"; - version = "2019-09-22"; + pname = "matrix-dl"; + version = "unstable-2020-07-14"; src = fetchFromGitHub { owner = "rubo77"; - repo = "matrix-dl"; - rev = "e91610f45b7b3b0aca34923309fc83ba377f8a69"; - sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q"; + repo = pname; + rev = "b1a86d1421f39ee327284e1023f09dc165e3c8a5"; + sha256 = "1l8nh8z7kz24v0wcy3ll3w6in2yxwa1yz8lyc3x0blz37d8ss4ql"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index cf7c1008a08..1112a3215c9 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +{ mkDerivation, lib, fetchFromGitHub, cmake , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , libidn, qca-qt5, libsecret, libXScrnSaver, hunspell , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "psi-plus"; version = "1.4.1473"; @@ -19,15 +19,16 @@ stdenv.mkDerivation rec { "-DENABLE_PLUGINS=ON" ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools ]; buildInputs = [ - qtbase qtmultimedia qtx11extras qttools qtwebengine + qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libsecret libXScrnSaver hunspell libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; - meta = with stdenv.lib; { + meta = with lib; { + homepage = "https://sourceforge.net/projects/psiplus/"; description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej misuzu ]; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 9f841f50dac..08c3ab96210 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,30 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +{ lib, mkDerivation, fetchFromGitHub, cmake , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , libidn, qca-qt5, libXScrnSaver, hunspell }: -stdenv.mkDerivation rec { + +mkDerivation rec { pname = "psi"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "psi-im"; repo = pname; rev = version; - sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4"; + sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM="; fetchSubmodules = true; }; patches = [ ./fix-cmake-hunspell-1.7.patch ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools ]; buildInputs = [ - qtbase qtmultimedia qtx11extras qttools qtwebengine + qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libXScrnSaver hunspell ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + + meta = with lib; { + homepage = "https://psi-im.org"; description = "An XMPP (Jabber) client"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index c1b9cdc122c..995c050d90c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.10"; + version = "0.6.11"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "0zglcx5ylqjc3hjkzi84mjhp9dchnnkv12qq75q5pqkx1w45rmim"; + sha256 = "0gkaxhx87yn8gmkqjdn78m1axfnfkw07sw9qsn7821966fd5l5ax"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 9656db0bd84..f8a3c4b4bf0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.37.3"; # Please backport all updates to the stable channel. + version = "1.38.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0gyg67qhrqqn1676m7ki8h9akhn29fh1sxmj0kw5j7dx4cyc4mid"; + sha256 = "0d146l1s37qxawh1k7yrkv78kxxfzf0yzzzcn1q1v1ndrwrvwhjz"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index d27bd6a521d..5f367c76a92 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -25,6 +25,7 @@ , libpulseaudio , libuuid , libxcb +, libxkbcommon , mesa , nspr , nss @@ -40,11 +41,11 @@ let pname = "slack"; - x86_64-darwin-version = "4.10.3"; - x86_64-darwin-sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb"; + x86_64-darwin-version = "4.11.1"; + x86_64-darwin-sha256 = "0a5rq8zhgdckwxnyjv6nrgpnj682j1rd9yc4nwvsbvpzv15kmd35"; - x86_64-linux-version = "4.10.3"; - x86_64-linux-sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf"; + x86_64-linux-version = "4.11.1"; + x86_64-linux-sha256 = "1r43g3xnla5aq38l3mpba8jb1gx9m2b6pr84prsclz27nr0rfm6g"; version = { x86_64-darwin = x86_64-darwin-version; @@ -99,6 +100,7 @@ let libpulseaudio libuuid libxcb + libxkbcommon mesa nspr nss diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index a6e74443f29..bc0657f7b1a 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl -, fetchpatch -, pkgconfig +, pkg-config , dconf , telepathy-glib , python3 @@ -11,31 +10,21 @@ stdenv.mkDerivation rec { pname = "telepathy-mission-control"; - version = "5.16.5"; + version = "5.16.6"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"; + sha256 = "0ibs575pfr0wmhfcw6ln6iz7gw2y45l3bah11rksf6g9jlwsxy1d"; }; - patches = [ - # Fix property name (new GLib is stricter) - # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939 - # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141 - (fetchpatch { - url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch"; - sha256 = "1rchl0lyfj5c3yhl63spzvx9b6ny3967dlq4hgp9qhqn0zjra3sb"; - }) - ]; - buildInputs = [ python3 ]; # ToDo: optional stuff missing nativeBuildInputs = [ - pkgconfig + pkg-config libxslt makeWrapper ]; @@ -57,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An account manager and channel dispatcher for the Telepathy framework"; homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 540aa3fcea4..8560a8b9447 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w"; + sha256 = "0p1cmj1kyp506y5xm04mhlznhf5wcylvgsn6b307ms91vjqs3fg2"; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 9487780634d..551953d4337 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "4.40"; + version = "5.00"; src = fetchFromGitHub { owner = "Nordaaker"; repo = pname; rev = version; - sha256 = "0yyykr86d494xq1ga5ncr6jmdf0ny1r4gm0wzwn49bxn2x1l0xck"; + sha256 = "0mdbh9q1vclwgnjwvb3z637s7v804h65zxazbhmd7qi3zislnhg1"; }; nativeBuildInputs = [ makeWrapper ] diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index d6b19fc77dd..980221afb61 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec { description = "A console IRC client"; homepage = "https://github.com/osa1/tiny"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index ea00669006b..404810e5f24 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.9"; + version = "3.0"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "12h4m4ag8cdab7q6f5n357mfg0fdayab1gcikncjkkid3bjd4r4g"; + sha256 = "0ciddvyhyp38fnfsi1plj3z8d76f28lbzbxib2857vw7rzyqfcky"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 49a4790f8a8..0a6f3d1a138 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1bxf8976mrl3vbn3s5i32i1lf908yag5rsf84n76dllmly61794k"; + sha256 = "1j0i2jmlk5sc78af9flj3ynj0iiwa8biw7jgf12qm5lppsx1h4j7"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 8d3fb26b06c..c068357a0f6 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "20200925"; + version = "20201120"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "1q931n9sijq1iin3swzk57rz7qmy485hvr1fahy5i2wd1xx9yhb2"; + sha256 = "0z6xavgd0zv9pqvfsdyvhhi1q3y7zxhgg24isbnn9r6mldafqwna"; }; buildInputs = [ @@ -22,18 +22,6 @@ stdenv.mkDerivation rec { mailcap sqlite ]; - patches = [ - # To be removed on next release. Fixes two bugs in the sidebar behavior. - (fetchpatch { - url = "https://github.com/neomutt/neomutt/commit/96753674e70edb695c1dc7af73e3317956c1b259.patch"; - sha256 = "0yjmgdfhn8ra7bc3d40c3c29imgpgbhzphjxp6575llh9kw5h53s"; - }) - (fetchpatch { - url = "https://github.com/neomutt/neomutt/commit/6078653c9233644ca76c24bdb64e49bd443dd714.patch"; - sha256 = "1s1p86bqpc9xq9z5qfh0mxxh6syps8shq0dm7bbkg1bz7qya5phy"; - }) - ]; - nativeBuildInputs = [ docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ca2b8a77347..9a411d4a82d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.4.1"; + version = "78.4.3"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/af/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/af/thunderbird-78.4.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "36268a7fe6ec5a0ea0243f83ffbd73204d5c4ef257b0c8857a50428304b2d4c2"; + sha256 = "03d4e32b23408b003de5347b2a26d9e3e734f7c3e811510ba81114eff80e6fa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ar/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ar/thunderbird-78.4.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "831e70f807f05ce2f82bb11db35d05ed80dac53ad00c12ff6e191a627d0d42d0"; + sha256 = "5aefbc61f46d59de19061a0e76949642e254a13867881b40b6bac289791c281e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ast/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ast/thunderbird-78.4.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e6efde72ce7aeeda5f7c6d7cc0f3a08265c44546a0f8fc84a2adbc11cc038601"; + sha256 = "1e328339808efed1db23ed372841ff65f64e1bda8e1d4be81fd00039468bbb1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/be/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/be/thunderbird-78.4.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "07fe33390caf37a96c000e0f5435d07711f7a95dbe04f85a222b17ae5a13f1bc"; + sha256 = "f42230768f2907fb3d23a03a56fc20f14ff5ded7b4418debb3e77c4942eb7db8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/bg/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/bg/thunderbird-78.4.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d460e201cbe4a1d6548a52121a33c2aaa7cbbf0e126fa1c4e8a431423424fb9e"; + sha256 = "27a72288cbaaaaee6a24a36bb2e463a0426810e97938cbfe012dceb1a3800fd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/br/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/br/thunderbird-78.4.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9e85928f1145391d9c3f238612b93e6344a2ad5e6179bf09502b1b69c8ad1b03"; + sha256 = "fa1b6c891e3d9d097857a08181030e1df2201240ae466c4adc6fc0be0982d002"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ca/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ca/thunderbird-78.4.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1516236c252f22933adf23bfe93d73fa272a4574deb674aef6e1f35006a6cc50"; + sha256 = "6bcc123c7ecccbf42022e302b63683cdf77f6f6f2a615b12c5ea9e6a081fb900"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cak/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cak/thunderbird-78.4.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c46508321d32c468d067d86c04973ca345b09b0e983954eaa123d02778d61fbd"; + sha256 = "392cc166ee9be6c5cf8294f727f97cb21b6ad7ebb77d263bba273f02cb15e661"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cs/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cs/thunderbird-78.4.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "227209429c07238f38d334e5ac8a5fd895a4c87f51b21b4376df89c50bb6a789"; + sha256 = "60f5ea97e75f965ac0947e51c8cb8e709e5fa8f67ea478babe936032dee5a912"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cy/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cy/thunderbird-78.4.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b272926205e5470df8aec8b22d6733e4f47993e76123fe81d4be26ad5a153062"; + sha256 = "93aa92633d2414ad59aedea8b1a820b158a21c042cbfaedd8abd2b5a41e31c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/da/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/da/thunderbird-78.4.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "13f9fe10c84d2b8d8d0215cb58a9852486741f5bc8c6979f0a701bef14a70f4f"; + sha256 = "dc263e9d186f4ca8cd404b6e5bd13f9d2874e0e2507eaa55e99a6b5ab3b05179"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/de/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/de/thunderbird-78.4.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "590f9a5a975544d2effedda942e3989a13be23b95f4e6707f9905fed3fc08214"; + sha256 = "d9dbf07f3c57f688b08f75673074562ad9d4a9b138159f353415d63f9ccac80b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/dsb/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/dsb/thunderbird-78.4.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5b572c847f9ec76b25c225652c23ecf8c56523ffc3071b437310f0d8f9049b05"; + sha256 = "084ef3ef3628d003c75dea9a9fa5897424e6e564cb18fb5bca33b341c8c511cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/el/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/el/thunderbird-78.4.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7cad76ea5a07dce6bdd3db78485f83a998ff27037f8ca68f8617659a06910a05"; + sha256 = "4e91e7d21d0a3d524de7e41201ce8af58518a7e0292c11fc2961a84e9b7d04fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-CA/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-CA/thunderbird-78.4.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f261b38fbc8d83c20be63015a444644a95f7d8b6584fcfc193145abcc69a4164"; + sha256 = "922220811fb0083e8dc51c7cbd703530acdfeb0e9403d1a0909ba1618db020bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-GB/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-GB/thunderbird-78.4.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "5c0c364b1408182c0cbae1c2d05041781e2e4f3a17fb1735d61196c9b647dba4"; + sha256 = "090806f6ebf12efbc5c20a920451feeb0d88d1e7366a074553b79080869687c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-US/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-US/thunderbird-78.4.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a152c3b8c6ad4ba3a92a8a1f909b99599d8c3ded62b57e9721fb333b47f6509d"; + sha256 = "7fa3769297600c47c54902bac696e718053c48fc02e54698cb05ef81a4eec873"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-AR/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-AR/thunderbird-78.4.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "dc06a64e0b20dd174d6158e5d2f393bf6a6907f8f515120220bb2a8480f58d1c"; + sha256 = "51be3a453bb3e3f1353b88ab31fffa3fc0c135cb91facb7807c967a9d4afa659"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-ES/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-ES/thunderbird-78.4.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7d3b7ff0ffb9b19f10bd7c2cffb5dbff8216c65c01fd4032ba5b7924c73ce343"; + sha256 = "8828e5ff82e84c5f69afd60ae5dbba445d766e2a2d7fbbcd8f0dc8f255d8fc02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/et/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/et/thunderbird-78.4.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a9a8e610bc1c696137ee650fa11f2cbf8dece4ba32d1f0961ae697f6433cf1b2"; + sha256 = "d58404701341bcd9b859f1afb87cb3340fc4b8334cc9490e8ea21446e3f308eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/eu/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/eu/thunderbird-78.4.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6835e8459b4191cd4bb5ae8011d032d475631e7a532450b98f0b087ed0a80fb6"; + sha256 = "5570472164329f23d3f0be51911402c2b454ea704419ef16b46b359a2c93e821"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fa/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fa/thunderbird-78.4.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7cfd8681a7ed38364a823881fbb42af8cf33d17bf911e9f5b97dd18102b412f5"; + sha256 = "cc56e14f1fa17e8b4ec9431ae9ada10159bd90bcade39432c647ba401791e3fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fi/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fi/thunderbird-78.4.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8c84662afb60e3dc94eace5a493f7feef6598b78613fe99f195408e4ee2b0a11"; + sha256 = "5175e312e8957490b013dd515b84fe4dfcdf57d30c6806f8bdee67caf39659f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fr/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fr/thunderbird-78.4.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "24449816c690757b05d1913ff1fa12eed47f316ac13c76a195ae0628c6950da0"; + sha256 = "5239f8a07f0f6bc4f69b3d4315570dab33c331ab775479a9df39479b71542cc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fy-NL/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fy-NL/thunderbird-78.4.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9a0334f032333eda16cdabd5dffb05f5a22edb1dcf4bcd0b47495defd0d9f3dc"; + sha256 = "5747be2c7f9d5463f9c14fd02fd5e66a8f6c4c8adca3a1bf8c3b4333f1ea2adf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ga-IE/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ga-IE/thunderbird-78.4.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "33e5a54e2259984ff29d3394fe936b5af8830e489e0775ff36eace4c6b3dc145"; + sha256 = "8e15ffc9235742ad88a1ecaf587a178f5aeb0bc57e075b33f792e2d458362ab9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gd/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gd/thunderbird-78.4.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b91c4b3aafa2166cd27c52977711c55aa425f68c5f7cca64be1dd07fd533bc05"; + sha256 = "72f53918cd04e587319d59100da05657a3084f97d70acba7d1ef7b7321add6ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gl/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gl/thunderbird-78.4.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d1c03b3b92bef4f3c94518981cf99840944c8a36aab7b2cfe3f72f1f0e57e045"; + sha256 = "28beb85fe0ea27a659e5063f7094877e906729602ef2e155f0e55e9e9f6d56ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/he/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/he/thunderbird-78.4.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7fdaf0e83eeb39b66a6d1c2600f2c6f1b69ec4f67dd7b33a39132e838a699f06"; + sha256 = "718f8605fc8d418c645a0485ce86d97ae1eeded8b776a990e137ced78eb91a68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hr/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hr/thunderbird-78.4.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4ba99eaa25964bde6108eeab702b096ba50b45d8db7e36f3203b0a71cc1e30cf"; + sha256 = "febadac023152dc30e72026f6df203c8051b65ad4da0c4e7059a14ab0b4b5f37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hsb/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hsb/thunderbird-78.4.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "187a5f2b2e1b16fad948356f31b2ac903fe318432d9a3f105055c23d1225d11b"; + sha256 = "faaaf4606fde4baca3216ed5801209f13cd1bbf34c9671cfc7a7648bb0ac7351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hu/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hu/thunderbird-78.4.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8f6b79692143e6e27cc844985366004d06c8e55184a73477fd20020575947ad8"; + sha256 = "353633956336852193510c8e77251834355c92ec503ab827a389a0dbc21c05bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hy-AM/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hy-AM/thunderbird-78.4.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "4066683e4a635b163b9b14e1921d834b37a95cee8dd04fc6885094c5e0394dee"; + sha256 = "1b5dba6f05ecc8449522d8a54c1d4e7aa5ec7a2e26fafbaefbd754ee3ea5780f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/id/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/id/thunderbird-78.4.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1fed6d3a9a11d303db2f2c6f7a92639b92ca144ce3b45eed4607696ea4617511"; + sha256 = "470151868d745ce829f0f38c6377f4ead87be829d43f4383d2e5c3541b93e8d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/is/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/is/thunderbird-78.4.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a627c95d2284b4e828a466865aa19262aa84a1a2267235c3f62d13c52081c580"; + sha256 = "e9d6b36beb61445c3f96ffe6e11b238a8539b398d5f3911f2ded7ee96ec0766c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/it/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/it/thunderbird-78.4.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "6b01e88da702deee95a3a6d526e563e854be7ae13414fed3a2c9cc427e906ffa"; + sha256 = "95a02afcebb834b14986b8ccd92d5381a8ac64d3ebbba13860ffbd0313a594e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ja/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ja/thunderbird-78.4.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3b63cf4c45945f4a40159a417ed217b77128905de82812fe2165c0c5f66410a7"; + sha256 = "d1c4e2a551a5266839da96b843372e71616346ea00361dccc8e1a62628e6315f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ka/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ka/thunderbird-78.4.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "c9d11ae298691f2e302078f865b047b1c2b568ae763495fbfe2f2d4f04a9ef6a"; + sha256 = "9eb37a69a370b2619724c91c6789471b9ef579190c08363f633f320563dc4df1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kab/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kab/thunderbird-78.4.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "b6367ccb74b2ced8708ca9f4c2c06aeaaf4f3bcba0b2b2fdf2c552aa10fcfc03"; + sha256 = "bce07886dc5251ef401141d387c926f27f61d13450f35cb9a9cbc8403b43260a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kk/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kk/thunderbird-78.4.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "99ece9975a3981fa33887d3b5d60cd6874e1dab7c51d830dc0d13c28c103ca79"; + sha256 = "222647dd8106134d46bbad6dad8638090e5441a64aa2a6725aa5b1d959a2832a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ko/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ko/thunderbird-78.4.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d81c844cbd490e5eeeb2739a9b040062baf3bbdf13ddfbceb59b5630019b935d"; + sha256 = "be2346d5a48e5323d5cc8c1077adf054927d8aececd2fb45fc2f5c0a9f0b8dc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/lt/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/lt/thunderbird-78.4.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "56b5813a5b0debfe90fa2a20fb9a13ea210e2eed37f180f3e23e851f871241e2"; + sha256 = "da5cde252d5e167025fb06861a32b67a2d0f7171c767bdd8c5d2ba9fc90d7739"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ms/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ms/thunderbird-78.4.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8dc3f341a69b9ef458c1203ff15779beecf3db2dede1cd8740ee19a9552f22f3"; + sha256 = "d6ab0652184cbbfe9126a49f61c25fe8852725b88460ad92c37dc1c4d969368f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nb-NO/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nb-NO/thunderbird-78.4.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0fe431d3773de39431cd777cf301d2c3d8074dd41596bf6a6f1bef96870413b4"; + sha256 = "2485cc4df1b1dafd0c5fb7d7723e923e7fea10af1dbf9764d5d7447f38825e49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nl/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nl/thunderbird-78.4.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4127bdb6338210d9928fc84838a57cfb731aa3254aa5427471deca00bb12beca"; + sha256 = "0795d2ae4364def43056e77106ea19053c3111e2f95758dbb41875071655ba47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nn-NO/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nn-NO/thunderbird-78.4.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "cf0c6d67115ee36b80010d93d50991a544af332ca19f1ed1199f49c7dd125049"; + sha256 = "b774035d8bff615646d3b3d73228277531d50309fb5dbf3978346e2b988b2491"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pa-IN/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pa-IN/thunderbird-78.4.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "283c2be7f9bc0aa3d505f1838f1c03721a4b956870ac2b1e762b966e87767ce0"; + sha256 = "2a38813c8aa0eaef3d2ec0ac379ab5c85d0b8c2df1f6a2d36ae066f7b0445447"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pl/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pl/thunderbird-78.4.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4c07e4500ad4c0d698942e3c47ced3bbd6142e4a70292629ebbe53ef5f1816f9"; + sha256 = "21cdb977bff1f0c07bf913b4feab2075a429b4594760de52ac358538179d9c66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-BR/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-BR/thunderbird-78.4.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c6ace3452d1720681e668da50d16811286c1e73021bd06ab9b538c6f6fc5fda6"; + sha256 = "d903ccd23367c39779ac2cdd3abe636a0f9e72f8d133a567bead8a739e651589"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-PT/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-PT/thunderbird-78.4.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b9ab4d38b271e2987b5e425a277042dc149794cf461283114553133e7fed5f06"; + sha256 = "f220a8bc90b05dd796c402aa5e79c62a8aa91a4d80dacbdf57abf77ec51d73b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/rm/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/rm/thunderbird-78.4.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "50fc69135b789b2bb5d8008292d3fc25f1a0a30bba35c6e24ddfeabe55231407"; + sha256 = "805d08f629e9dda7d6db36bd41dbcc128defe59b4610e4b7d5d47408a07e47b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ro/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ro/thunderbird-78.4.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1e050b33a942dc815e739c57944a0d705982e18e74637172b0366a9b06916f7b"; + sha256 = "3b09b2c59f32a09938a45270e04740616b2a13f8b8a6f40503650d9b0f72fc35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ru/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ru/thunderbird-78.4.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "c295bda57db84e07f28affa4201c4f612478efce733cb9c69962f6d7a797218b"; + sha256 = "2022473752da127d2ebe4eef7f834ac5feafe38dedbe64ad30defb8ae69c6ebd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/si/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/si/thunderbird-78.4.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "63dc83cfab8be94893ca6a0d60e448d14db1afcae55192149a882456dca77e9a"; + sha256 = "dc5166b0b24bd0a9e98f7dfc483a6bff184a4bfffb0eff8a4007b96fe8205254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sk/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sk/thunderbird-78.4.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5ab5ea76649582ddf10fa77bbb95040d157883e0905df72f5bc0ae79167d97be"; + sha256 = "d30e4d3218fbf13a5c531d45f55f0f366aac10aa2d180886ced778c7459c0610"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sl/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sl/thunderbird-78.4.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "da3f8a30797386bc7c9ba135ba360cee01143bc76a2315e7a2223bab90e2283e"; + sha256 = "f968618f7b13b6dc4441a09882ac5c826017a5b0ca3887b7cdca8ef6a3b3c266"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sq/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sq/thunderbird-78.4.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f2f9639c4b4dc4bfba476aa92814fee65ecd3fca27652177614d1107e4200246"; + sha256 = "f4400c6e55859e07705b353cbf211e863e8c3f373490f3fff6bd3e6d360d5b7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sr/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sr/thunderbird-78.4.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "3bcad0c845e4481a22c1b330b6cd94c3c6fc46c33597ce5af0594368579a8260"; + sha256 = "f6437ffb64b1a98b5c5630f3b386b12866a514467c641fb02c8e86560e4b62d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sv-SE/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sv-SE/thunderbird-78.4.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "9b09d4ab71000429c5015dd8a0642cfe0eeeaa785d2cac6e876b1cd6aadaeb44"; + sha256 = "f1af8019698347ac94bad5c33b5e094b65e8ebed9181f5fed5e740cf2029bcef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/th/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/th/thunderbird-78.4.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b33e42f0271ee84a581a737513197d5f036695706b19697a53000834c199c75f"; + sha256 = "75830b637302032bbc70342b71012f391b333a2645d8fefb8f4232d432c9dde1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/tr/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/tr/thunderbird-78.4.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f419ed9f0f06575da2f89486d830ab7fd2b439dcfcac92f1b31c573901e7b9ea"; + sha256 = "3691e5aca6b9713fab9c8a15952d1ceae50d67cc60e362eacc9513a362875dfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uk/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uk/thunderbird-78.4.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "bcecec66a6ef8b928da2aa5d52d89f4f1587d4e45bf0e836b71912b0e5a43f7c"; + sha256 = "c4aca974c3a541c312029eb66fb8fdb1c5ecd787deb67a10bda3195f0ca06263"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uz/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uz/thunderbird-78.4.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2b33f40b9da386e61f3bdcacd9c16fc06dac18d2b36865292700744dfbe2da25"; + sha256 = "2052c0a9a41c81a37aa23fbf28775e286b8350594b01aff629604ccbd74ae90d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/vi/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/vi/thunderbird-78.4.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b5d005c45221c41e1e81234b755f6a9d380220cc03f43012c40440a0378c19e0"; + sha256 = "b142f463cd953bfc423be210eb891f66e948308129de74cdfd415409d4b0cb03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-CN/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-CN/thunderbird-78.4.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c08765cc8562cce08b4cda04123cd8672f5abb130b597f36f4c143d74b09b9b3"; + sha256 = "0664f379ce4e464e2e6dcc3cfa749bd6ae4a597b008b7fd1c97bb6219727da6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-TW/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-TW/thunderbird-78.4.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "56f84ea43a5288a6cd34f8de5f69dde05737474f11c70d638981ef2ff4ea5bfa"; + sha256 = "2ba4d49b52e6cd699f7bb1fa8f024c330f67d6b9df543a77fea7c3dc87985cc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/af/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/af/thunderbird-78.4.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "95384cf3d0ab6ad8d3bb133e8ff7c1881523c0f7be840c5ab6016325ebc7f9ff"; + sha256 = "60f62dc28a8433e571b894d33c0d9670c3aebc6a8c556c65f12d8d574e5edceb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ar/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ar/thunderbird-78.4.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c2cf87579a092bec69042b35743574872b8b791d54628c35c28d44c1dc605b6b"; + sha256 = "cf0fc7d7af09b20dbb35364ac0e47615919ae1627a0b729acf2f13dd99198400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ast/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ast/thunderbird-78.4.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "127ce24b2c06606e9567e2106ba5cb9628d8bda10620b01cbfe60bc287977c94"; + sha256 = "cb7ed53eedb55858fa5a5aadab1ed0ae4f2f9e2714406488b211660e56785d21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/be/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/be/thunderbird-78.4.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e8acd7cc25f91af91caee7487598cf1f60512864cf1fee714d2289a65f0cc195"; + sha256 = "b04239a6caf488d3fcb5be0373ddf83554643897d41bd197edb6dbaee15b9a4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/bg/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/bg/thunderbird-78.4.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "461e4ec0b0f3dcb78426a99f0b8dc32b14dbc561b89e8d422433f5360425448d"; + sha256 = "fabd2c79cee02328166954d6b793b70bb94cb41162b904ecb124cdf91e5cff0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/br/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/br/thunderbird-78.4.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "ba3902a457d0570d3eeaa63cc83a67e35532e547127b71f38781158bc3cc5e60"; + sha256 = "66584e5c63c58c10cb4f2f8fb81048c4201046adbad03d58faf8f36e405a8e40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ca/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ca/thunderbird-78.4.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "609de3623c6f4075bedee741533843f6f9fd1afc5933fe3a8709f5c16c7d7bc5"; + sha256 = "eca54850e9ed41a19bb4cd23de9c11d9d2851ac1573507b32b4fd33431ad7889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cak/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cak/thunderbird-78.4.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "4a5aa707eca53cf5490189a09d222abaa8290ea3366d4bf081273c23e89b3fc0"; + sha256 = "ff8e285bf3198c225c2b5b216678bde7f978443c1f354193e39c0c5d3d7237bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cs/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cs/thunderbird-78.4.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0450c73284b274af21f3f0c4c21842e11fa2a86fcb38f96332c1ca8984149c62"; + sha256 = "72a18f3ac0168478c7b9c8d2641922ba7be5d129b63b711b7f7f133ba3cb1d75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cy/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cy/thunderbird-78.4.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5686316ec53a76dab272934dbd274a47802c5c31f2ae8719bcf85c22e12cc3f7"; + sha256 = "16fecfef3f81870befcadf833db5ecf54b7b83d587f2a211c5eaceeaf7a5796f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/da/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/da/thunderbird-78.4.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2025f5946989905fd197fe5bf6c51160e7c9d281d6cfd220ea3ee0393cc54ca0"; + sha256 = "7aac88184c6e2539003905b3a7609116cb2180943a8df219449354297b323455"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/de/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/de/thunderbird-78.4.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "906e8a5de0aa12b496f4d4447df25432b11c88d79b7ab4a55291a9d65434aa03"; + sha256 = "f3f487f8852b7f50ed49b5375ae97376470282a0f5639c8fc4cb7040da30f946"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/dsb/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/dsb/thunderbird-78.4.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d6bfb2b790d8391344916515d1cc6ca2eb68a3e58934cacba14e77788aec6b09"; + sha256 = "842a084fc74c29d3c7573e473666cfa01f205b75fe6c1ee83acc25cca68d3666"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/el/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/el/thunderbird-78.4.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "5f96345a945697326b24fcd73a96fa2f49edb66b02f4c23b6d392fad87935e08"; + sha256 = "8df4c2a688b435f60fe0d5646ac5172dad33d254fdd68e35a29a6a83c4bda905"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-CA/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-CA/thunderbird-78.4.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b57e44fd16e33b178778a60f0bd47519585a3e648b3b621f1fd693836c5fb598"; + sha256 = "8eab7a0b08e3c65eb5c373eb018d5e1df519b28f8774b06203a5b7743b146cd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-GB/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-GB/thunderbird-78.4.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6f656dcbd7aaab5995beb11a9847e32f8820199272e2f9ce27583cd3d7e50a76"; + sha256 = "23c819e15ca0ff1ad366f2d5fb76e934dcea0fae9cec6674b39339e14a3c4254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-US/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-US/thunderbird-78.4.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8c6bccc757df947bed74a3f7448a3885932a4f6c21d24ab6b5c7a94ab83ebae5"; + sha256 = "5cdf4b40f337352a8e966046a2eb1a368c0feef4fb069fd4c22d4f986ea1ed3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-AR/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-AR/thunderbird-78.4.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "55bbc629ceadf359e0ad05e763a31479f6c57c38f372e55812b028681a5ff32a"; + sha256 = "e7947542ef45cb432991ac5435523987c79811889e9bd5cb6fe4c698897a241e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-ES/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-ES/thunderbird-78.4.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "bf30dd8882b2b35bfaa62a6c4b40a823333476128a6d5dd3e3d2c8eb16303b9a"; + sha256 = "95121f74bc1389e62dfe7acb286d2a4cd60a536f28054c8e367cdfd867babde1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/et/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/et/thunderbird-78.4.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "5b977eab7f203e230d6a03b36afebdb32c481f1eb8129e454977791469ed5651"; + sha256 = "87aedd276bc54360887e81bf2e3b07c54a365b78814d7e478f7ad5ec15c1d451"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/eu/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/eu/thunderbird-78.4.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f2d606a6f825640c0f344cf470d87a1dea5fc6ff538239ce25c3d7c9fc76237d"; + sha256 = "66168f09ed77b7f31faaf21daff48e9a8bf75314fcab585fad67160db52471b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fa/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fa/thunderbird-78.4.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "95d0d3d1b456c035cc6ed09df970e9e772a71af3703f05e9388e844d7f80edab"; + sha256 = "2848f0277f75dc58f371e2025bebdeca1c37d543055fa78258df67d05c67f5bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fi/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fi/thunderbird-78.4.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e0be2532774bbe017a6091d7e1ec79901f692c39e04e01fe4094f7c8179fbaf4"; + sha256 = "725f0dcd456245e188e32a32401ecd40400b7786da3a39d9f6965c1f674ee954"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fr/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fr/thunderbird-78.4.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "48cc16a61958160f369b32e8a0dcd2979ee65e18efe3d1dd3a4af1109842718b"; + sha256 = "d24ab35a8db7cb32d6098defb9f7b6b007b5c993a070c1a3a5c8991451165e37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fy-NL/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fy-NL/thunderbird-78.4.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "386d0a2ed01b158f0fe18eb6820ff9a17fbbea61241eaf873782271ac84eb103"; + sha256 = "ea3a88b57166b3b8f04922a5c2f6d8d9f94f1a7bb5f3a9e2d6b5f11a13528c18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ga-IE/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ga-IE/thunderbird-78.4.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c0c15410e6812e8652181ab347b3fe60fdce3b5b9958d54ef3f96ecc46a4d344"; + sha256 = "763bc901967ec61e1f7f543bbf248bb03ea68b01c000677505408ec8e8c3cbb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gd/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gd/thunderbird-78.4.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3989f0c0f87ebfca3e4cfad0ac9ca2964791ab8f1163f1bec340444ae4a72a7b"; + sha256 = "7394f43ae2ff5816dcf9b37255fd9770dc48dd7309d685ab378bc2de8a5a39b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gl/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gl/thunderbird-78.4.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "eb1b58c93e492a79f92660909e671ee7ec504701b8e074d3dc6f3d3fe3619660"; + sha256 = "7daaacf6af75b34d37d440e2c0b252ef03c3b432523f5acb8ef71f83b5d7b6cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/he/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/he/thunderbird-78.4.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f584e117ba4fbfbb7d2c28b68377a88aad87929657141adac5ce960bcf5f4fa3"; + sha256 = "4831ef263de0a08df6494b13a280475642c3eed7f34c7415fd7b59af192398dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hr/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hr/thunderbird-78.4.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "633eab2f8ac99426dd85b614f04d96509125f0799c187305b7678496d9ceff0f"; + sha256 = "6860b40fc2ba7f9b8ddedcaf50acca8ac01b6451c0895c325b36485f188b5dda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hsb/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hsb/thunderbird-78.4.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "80e4b98bbc9874de9b4c8e35633f6eea7b5707cfc4943df7264cf0bbfba49d99"; + sha256 = "681fc8200f6f9346e911c21d6a1c8206e5ee5ad1adfaa56ddfbc5088225fc561"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hu/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hu/thunderbird-78.4.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5a9339a876a7e0dced6769a99a948329f6eaa400acb6920a24d06695120f682a"; + sha256 = "8909d02e58f5b333fa51b15e4ddb5df162d01e36a8052827482c479949da2cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hy-AM/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hy-AM/thunderbird-78.4.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "286542d67a76a6e8f0c34e7aca9c23c8922bf85f8be77c913285e208f8b195a7"; + sha256 = "12dee2dbe126d2243b674bed4617ffcec7c93f850d266f6253d802c6af5b6d6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/id/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/id/thunderbird-78.4.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "930cbbe1520c544a25cfbdf8d10b4e6ae19a812c8a20ce51053ba0d5fc2b4b24"; + sha256 = "5564c24b01f9a952def885a4fb56e3246643ca30bc5066d6ffa4ed6c6982b33b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/is/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/is/thunderbird-78.4.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7fca3c4c9d3a309ec182d1486438973741fe2f1e39afd3ccb769256657db20a6"; + sha256 = "fedea70297479b2c828aa19a9a4aa3090597c5490ee842a0f521d0096615d6db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/it/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/it/thunderbird-78.4.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "3b44f63975cfe7460f3eadd9f71f13db9ded5d9e5622ec322f556692f979434b"; + sha256 = "8466f3dc9988270d4a9166b82dba764d8dbfa14e8c26a1931d35abe011c3160a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ja/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ja/thunderbird-78.4.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "1284e52cda834b1ef9b5ac6a1dc29858f6e1519d0fd47d330744c0d294338650"; + sha256 = "3ffe4ae508896ac961a27940a93f5955bb8b29640c88e5378a8251827b4e9ab8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ka/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ka/thunderbird-78.4.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b12a79e20fce3db2541dcde61e04206e82530d1d79b58637bfcede87294fd801"; + sha256 = "7c099596fbc4666e053bd1079f6b7c45511b2b44db73cd5c099fd392bec8e3e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kab/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kab/thunderbird-78.4.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "9766eab276e77b0e33ad7ecbf8f26b84aa2a079a4fc9e4dfc992c41074513e40"; + sha256 = "5e64e5a276a6e77250ad7647f9b4ecc2b8c9dc360c486f9504b3b17b8da3e467"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kk/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kk/thunderbird-78.4.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "aec202db7c28ae69c9f7684a2e4f30a16ab29ec983aacb32bbe4b5bd31b76e94"; + sha256 = "4562bced5900bc447a79c53d381b250a1e13b9f076979cb9760f9adaa89c54b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ko/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ko/thunderbird-78.4.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b0e553c14925413461a87f1d81591bfa4e2ce2c5ad87e8ec609fef76ba4f17d8"; + sha256 = "b6cb53893d67bedb077547f1262a833a5487e49395187a49eb977659d019e7f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/lt/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/lt/thunderbird-78.4.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6036247e3025c2b513762577e7de1d1eda050572f674c31391e583ccd16e80f8"; + sha256 = "6291d36e9347729920f89a28b949c943d8c92863cba1a03624801c7136eff997"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ms/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ms/thunderbird-78.4.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0852cb745130e22af327e2ce39249751ed482c8216c18f4545bd294f4afb4e29"; + sha256 = "5dee2e40dbceea93fbe3b35b744d00472b89b88e745025127a1d07afc79d7df8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nb-NO/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nb-NO/thunderbird-78.4.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "eebec58d3a20956894711266715ce5a4afcfd44b5eb7b334dc0c22068fbb10a6"; + sha256 = "491115e7ad1c4245da34dc328e179de3916291d4e42a85ee5fd4fadeae1fcdcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nl/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nl/thunderbird-78.4.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0c6d35960d89681087bcfbf403ff727f53ba2e67de9c69d04f96b68447b616d8"; + sha256 = "c4631681eb3354a3093acd5a76d5c7ca5ef3e76ac2cef9f1fa4007c40c1e282d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nn-NO/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nn-NO/thunderbird-78.4.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b761b921ba2e604dcde7ac0e03a83ef29a3311309cb95bc39801b8bcfd80ef98"; + sha256 = "aa4d383b90b7cd48ff18f098c9bba429f09fcfb72a2f2a086a992778718a3b1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pa-IN/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pa-IN/thunderbird-78.4.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "fa350ad64a3ff760a6e2cc6ac6b6ad1d6b9ad300b6c3420477148152bc207499"; + sha256 = "c5fb66455a59383494890e06559d4529c0762ecf76d17e5ad784eb413277438d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pl/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pl/thunderbird-78.4.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "8b187d44bc1364dc76258ff3452610483b2ab3d060c9de43e47c25fd3103c5d9"; + sha256 = "720eea0998d9934960a5dc97466f57c7e68b2048f88125a987569539a8a00579"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-BR/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-BR/thunderbird-78.4.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "1ff199f91e49d72bd9821bfe3e2d33cb4a750a6c46aaf16a80554c195694ed43"; + sha256 = "d27ab836f5d8753d740e980291a4403656735c206cedbaf7d5c13df26d327150"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-PT/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-PT/thunderbird-78.4.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "098043202612b362a16353c84a5b9e662331c2311679357592b5a77a6690b68d"; + sha256 = "2b996d07174c24df1b066c41bd92c8b24ebab82767c47d8c658f2205eeff9cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/rm/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/rm/thunderbird-78.4.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "ab9bb22e53da48744885634a14886ddb23dd5ccab376e5323824daa3f22ae0cf"; + sha256 = "206b2bf82b88ab733bf585e11a3eba49a779c8b8fb7bb249716022fc7ee1a18a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ro/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ro/thunderbird-78.4.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "fb3e61830c5693c7f3b84eb4e3c60ff97324c5654352008aabbe9f16ea40cb0e"; + sha256 = "2d06d671114d70ba4e39b2c639eab1debe7ad33de11795113f30f27708d13ae4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ru/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ru/thunderbird-78.4.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f9fceef81a605ebc66fd90e2759205c4eb7160095312579eb7543b4293dd7a7d"; + sha256 = "08e71802964c340dfbcddf963382d1ccc5b8fd2e262daa1316488cffd04f449f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/si/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/si/thunderbird-78.4.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0903c3d1bf790c5c10167839e3bc60d80a23e4230895703f7c931856cb617038"; + sha256 = "0f59d187fa15bd08ffe0e08e643bb76954f7eb7730c3768079514385c53df5d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sk/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sk/thunderbird-78.4.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "2018e5685fbcb5c2cc8925be39b04f6d98347cb59446af62846378818d6435f6"; + sha256 = "5109939226907517fac9ae9c4e6ee96d732de9a67b9139e390d32cbdea892ef7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sl/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sl/thunderbird-78.4.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "d20b13b5caa2f5c9c431f3e69095f094800fa520b3a5a57c27a4c9c565961fb8"; + sha256 = "c56fb54ad65dd453b487813b1f0dde8d83ed6a2f7e428af55c40a80d1c9a35ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sq/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sq/thunderbird-78.4.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "164041c3958f57f90d17fe1457205a420f326c17e88da0197732435cf6a5dfca"; + sha256 = "0b3814c80014108032c9f0376a62c09864704441f36a084accba1c7c0f8156de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sr/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sr/thunderbird-78.4.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "8ffcd2dea1b4980519220a27346b5c0fa955b89580836c38711c21c8eb7d26c8"; + sha256 = "80b01424fae7d18c98a77a0026dd4b50f1913f5f3cce2d3f85d9e56da633a537"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sv-SE/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sv-SE/thunderbird-78.4.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "83536011e7bfe2e7a0a760ed879e041b4caa3ee27e95829331faefd29e8deebb"; + sha256 = "ef0154595d85c13d0eac381a907a51da19e9d93d2758c7dc0f052b7b76a7f31f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/th/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/th/thunderbird-78.4.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "13be237b698dc9b468af7a2b8ff062118421a7b798771f1db4f82bcb1098f83c"; + sha256 = "939f56c4951e8dbfdff257efe7f0212e93c1bb55547ce1e934f7d908932d3116"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/tr/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/tr/thunderbird-78.4.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c70d085f6ceed58e7ea55ab01d121627a55df2f5e961ef160f4965db941660b3"; + sha256 = "66f4f2cb06f20fca47e59b37d52f07a9e1215b03f0bbf9320cd1436e1d1a7c35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uk/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uk/thunderbird-78.4.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c1b7b0efe7af03a488c80020247e2d8038d6dffa313188083bb75c1bc09c35fc"; + sha256 = "33f3b9812b442184c075056cbe7da924655729865d849856093bdaa2d7d84660"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uz/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uz/thunderbird-78.4.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f4b8d20603c5e1dcc72760623803fc4cb34fffffd7b394c1998b860b5e3bc129"; + sha256 = "5abbc17bb66700093eeef5eb97bcab0a5d040ffe20ecf79d8239123248b1affb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/vi/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/vi/thunderbird-78.4.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "6d9d7885ba742ae28766ed98e64aa59892ffb51ad67eb9bc47d5a3974b8a7f50"; + sha256 = "de5071c3b4a5cf7494f91c69f4a7cf4678bcf57227115e1b6e50cc65a3e716dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-CN/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-CN/thunderbird-78.4.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e47c2e9b66c99c8ba02c60f739d31ea2d679cdc4d6f1f407257ef3372cabf364"; + sha256 = "07afc2b794439475d0d4db82c7b694728aa5b8e6e80ac79789bae662757ae8d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-TW/thunderbird-78.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-TW/thunderbird-78.4.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1cbab249ae670a204e464a9082365967a74ce2533bdab60682c14fe65dafba16"; + sha256 = "70a71d0c26fd2cd18dd599374cc6f1c39d22246f3b3c8e8d17659cb7c33a5a77"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index dd339ef1c1a..c982f6db485 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -32,7 +32,7 @@ , nasm , nodejs , nspr -, nss +, nss_3_53 , pango , perl , pkgconfig @@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.4.1"; + version = "78.4.3"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "2mbb139xdi69bnvvg7zabwbw181xnz7y154viynmkwyh4iww0hcsvr88q246gnif8a7jns3pi4qgqxgzflyl6mzpsvfdrbjs5hylanx"; + "0h5ddqp1z2dphyy4mjcb7v9mrrxlnjw8rwklm0yqsbvs9m96pc1yyp4clb3wmgs7kzh3wxdwi450842m3b13wdg5h0ls7rhamd1yi0c"; }; nativeBuildInputs = [ @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { libvpx libwebp nspr - nss + nss_3_53 pango perl sqlite @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE =[ "-I${glib.dev}/include/gio-unix-2.0" - "-I${nss.dev}/include/nss" + "-I${nss_3_53.dev}/include/nss" ]; patches = [ @@ -332,6 +332,5 @@ stdenv.mkDerivation rec { ]; platforms = platforms.linux; license = licenses.mpl20; - timeout = 28800; # eight hours }; } diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index ee5ea9d7e03..bfa98b94d0a 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.12"; + version = "1.8.13"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8"; + sha256 = "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd"; }; patches = [ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 52adbca18b1..da49ece4c68 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 64bcf5f6838..bfc928cfbc6 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -64,7 +64,7 @@ mkDerivation rec { description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; license = licenses.gpl2; - maintainers = with maintainers; [ caugner ma27 ]; + maintainers = with maintainers; [ caugner ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index aa9d94ad5b6..3bfb2526232 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, fetchurl, qmake4Hook, makeDesktopItem -, qt4, protobuf, libpcap, wireshark, gzip, diffutils, gawk +{ lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem +, qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk +, libnl }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "ostinato"; - version = "0.9"; + version = "1.1"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx"; + sha256 = "0B3jOj5rA3/rD2gXS2praZImeP34zN06fOPy/IswXOg="; }; ostinatoIcon = fetchurl { @@ -18,14 +19,17 @@ stdenv.mkDerivation rec { sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; }; - buildInputs = [ qt4 protobuf libpcap ]; + buildInputs = [ qtbase protobuf libpcap qtscript libnl ]; - nativeBuildInputs = [ qmake4Hook ]; + nativeBuildInputs = [ qmake ]; patches = [ ./drone_ini.patch ]; + prePatch = '' + sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro + ''; desktopItem = makeDesktopItem { - type = "application"; + type = "Application"; name = "ostinato"; desktopName = "Ostinato"; genericName = "Packet/Traffic Generator and Analyzer"; @@ -58,7 +62,7 @@ stdenv.mkDerivation rec { # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A packet traffic generator and analyzer"; homepage = "https://ostinato.org"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 2a8a0622713..0d2fc0fd833 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { dontBuild = true; dontConfigure = true; - + nativeBuildInputs = [ imagemagick autoPatchelfHook desktop-file-utils ]; buildInputs = [ qtmultimedia stdenv.cc.cc ]; @@ -53,7 +53,7 @@ mkDerivation rec { description = "Official Qt SoulSeek client"; homepage = "https://www.slsknet.org"; license = licenses.unfree; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix index 02b14b72c18..444a6dcf45c 100644 --- a/pkgs/applications/networking/ps2client/default.nix +++ b/pkgs/applications/networking/ps2client/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { patchPhase = '' sed -i -e "s|-I/usr/include||g" -e "s|-I/usr/local/include||g" Makefile ''; - + installPhase = '' make PREFIX=$out install ''; @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "Desktop clients to interact with ps2link and ps2netfs"; homepage = "https://github.com/ps2dev/ps2client"; license = licenses.bsd3; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 52f8decf170..a81356da252 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,9 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg_3, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland -, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt -, libusb1, libpulseaudio ? null, cups ? null, pcsclite ? null, systemd ? null -, buildServer ? true, nocaps ? false }: +, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo +, libusb1, libpulseaudio, cups, pcsclite, systemd, libjpeg_turbo +, buildServer ? true, nocaps ? false +}: let cmFlag = flag: if flag then "ON" else "OFF"; @@ -49,8 +50,9 @@ in stdenv.mkDerivation rec { buildInputs = with lib; [ alsaLib + cairo cups - ffmpeg_3 + ffmpeg glib gst-plugins-base gst-plugins-good @@ -65,6 +67,7 @@ in stdenv.mkDerivation rec { libXrender libXtst libXv + libjpeg_turbo libpulseaudio libunwind libusb1 @@ -93,6 +96,9 @@ in stdenv.mkDerivation rec { WITH_PULSE = (libpulseaudio != null); WITH_SERVER = buildServer; WITH_SSE2 = stdenv.isx86_64; + WITH_VAAPI = true; + WITH_JPEG = (libjpeg_turbo != null); + WITH_CAIRO = (cairo != null); }; meta = with lib; { diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index be583755868..da54ecf44db 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.07"; + version = "2.09"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "0yrfpj4ph9f321vqfn1zadv44pqa3ivjq9rx6gsz9hlv50gfaqn1"; + sha256 = "0yy5a7hr597vj6xbn7f5vzqdwnr637b3l1d62cmk0h7qbmh4anji"; }; - vendorSha256 = "1ysqagi4y25bi84h5fhkdimnsigy43klf6hrcqn7q75382fb4bzn"; + vendorSha256 = "1r7k0rzizs61r4gqqll7l2j7mdpi3w1ja6l4w6vxgzb45h2sjhi7"; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index b48edd69837..9dda62b3bad 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "1dx5l48m4634y0zi6wjky412g80lfxqq1nphv7pi1kwvm1k5m5ri"; + sha256 = "0lnwsw9x4y4lr1yh749y24f71p5zsghwh5lp28zqfanw025mipf2"; }; buildInputs = [ diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 7f384846c96..e07fecbf893 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -35,7 +35,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableXXHash xxHash; nativeBuildInputs = [perl]; - configureFlags = ["--with-nobody-group=nogroup"] + configureFlags = [ + "--with-nobody-group=nogroup" + + # disable the included zlib explicitly as it otherwise still compiles and + # links them even. + "--with-included-zlib=no" + ] # Work around issue with cross-compilation: # configure.sh: error: cannot run test program while cross compiling # Remove once 3.2.4 or more recent is released. diff --git a/pkgs/applications/networking/sync/unison/4.08-compatibility.patch b/pkgs/applications/networking/sync/unison/4.08-compatibility.patch deleted file mode 100644 index a6921b516f0..00000000000 --- a/pkgs/applications/networking/sync/unison/4.08-compatibility.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001 -From: Jaap Boender <jaapb@kerguelen.org> -Date: Thu, 21 Mar 2019 12:26:51 +0000 -Subject: [PATCH] Compatibility with OCaml 4.08 - ---- - src/files.ml | 2 +- - src/recon.ml | 4 ++-- - src/system/system_generic.ml | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/files.ml b/src/files.ml -index ba42ad57..5babf21e 100644 ---- a/src/files.ml -+++ b/src/files.ml -@@ -722,7 +722,7 @@ let get_files_in_directory dir = - with End_of_file -> - dirh.System.closedir () - end; -- Sort.list (<) !files -+ List.sort String.compare !files - - let ls dir pattern = - Util.convertUnixErrorsToTransient -diff --git a/src/recon.ml b/src/recon.ml -index 5ed358d7..0df2cfe4 100644 ---- a/src/recon.ml -+++ b/src/recon.ml -@@ -651,8 +651,8 @@ let rec reconcile - - (* Sorts the paths so that they will be displayed in order *) - let sortPaths pathUpdatesList = -- Sort.list -- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) -+ List.sort -+ Path.compare - pathUpdatesList - - let rec enterPath p1 p2 t = -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index ed8e18f3..0e28a781 100755 ---- a/src/system/system_generic.ml -+++ b/src/system/system_generic.ml -@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen - let chmod = Unix.chmod - let chown = Unix.chown - let utimes = Unix.utimes --let link = Unix.link -+let link s d = Unix.link s d - let openfile = Unix.openfile - let opendir f = - let h = Unix.opendir f in diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 7b7318544c5..36e80350926 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -6,12 +6,12 @@ let inherit (ocamlPackages) ocaml lablgtk; in stdenv.mkDerivation (rec { pname = "unison"; - version = "2.51.2"; + version = "2.51.3"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq"; + sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y="; }; buildInputs = [ ocaml makeWrapper ncurses ]; @@ -27,12 +27,6 @@ stdenv.mkDerivation (rec { "UISTYLE=${if enableX11 then "gtk2" else "text"}" ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; - patches = [ - # NOTE: Only needed until Unison 2.51.3 is released! - ./4.08-compatibility.patch - ./lablgtk.patch - ]; - preInstall = "mkdir -p $out/bin"; postInstall = if enableX11 then '' diff --git a/pkgs/applications/networking/sync/unison/lablgtk.patch b/pkgs/applications/networking/sync/unison/lablgtk.patch deleted file mode 100644 index 20c1db1b116..00000000000 --- a/pkgs/applications/networking/sync/unison/lablgtk.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001 -From: daviddavid <geiger.david68210@gmail.com> -Date: Mon, 26 Feb 2018 13:36:36 +0100 -Subject: [PATCH] Fix for lablgtk >= 2.18.6 - ---- - src/uigtk2.ml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/uigtk2.ml b/src/uigtk2.ml -index 2ba6d79..04c4da4 100644 ---- a/src/uigtk2.ml -+++ b/src/uigtk2.ml -@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic") - (* This does not work with the current version of Lablgtk, due to a bug - let icon = - GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true -- (Gpointer.region_of_string Pixmaps.icon_data) -+ (Gpointer.region_of_bytes Pixmaps.icon_data) - *) - let icon = - let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in - Gpointer.blit -- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); -+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); - p - - let leftPtrWatch = --- -2.25.1 - diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index cf1e053dd53..e432b379517 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -59,6 +59,7 @@ buildPythonApplication rec { description = "GTK3 & python based GUI for Syncthing"; homepage = "https://github.com/syncthing/syncthing-gtk"; license = licenses.gpl2; + broken = true; maintainers = with maintainers; [ ]; platforms = syncthing.meta.platforms; }; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 09b9bfa571b..66856264f34 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://termius.com/"; downloadPage = "https://termius.com/linux/"; license = licenses.unfree; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 7ab53b19ce0..03da2170b3d 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings-desktop-schemas }: +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas +, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, libav, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { - version = "3.8.1"; + version = "5.1"; pname = "jabref"; src = fetchurl { - url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar"; - sha256 = "11asfym74zdq46i217z5n6vc79gylcx8xn7nvwacfqmym0bz79cg"; + url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}-portable_linux.tar.gz"; + sha256 = "04f612byrq3agzy26byg1sgrjyhcpa8xfj0ssh8dl8d8vnhx9742"; }; + preferLocalBuild = true; + desktopItem = makeDesktopItem { comment = meta.description; name = "jabref"; @@ -19,21 +22,44 @@ stdenv.mkDerivation rec { exec = "jabref"; }; - buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs; - dontUnpack = true; + systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib libav cairo freetype pango gdk-pixbuf glib ]; + systemLibPaths = stdenv.lib.makeLibraryPath systemLibs; installPhase = '' - mkdir -p $out/bin $out/share/java $out/share/icons + mkdir -p $out/share/java $out/share/icons - cp -r ${desktopItem}/share/applications $out/share/ + cp -r lib $out/lib + + for f in $out/lib/runtime/bin/j*; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${ stdenv.lib.makeLibraryPath [ zlib ]}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f + done + + for f in $out/lib/runtime/lib/*.so; do + patchelf \ + --set-rpath "${systemLibPaths}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f + done - jar xf $src images/icons/JabRef-icon-mac.svg - cp images/icons/JabRef-icon-mac.svg $out/share/icons/jabref.svg + # patching the libs in the JImage runtime image is quite impossible as there is no documented way + # of rebuilding the image after it has been extracted + # the image format itself is "intendedly not documented" - maybe one of the reasons the + # devolpers constantly broke "jimage recreate" and dropped it in OpenJDK 9 Build 116 Early Access + # so, for now just copy the image and provide our lib paths through the wrapper + + makeWrapper $out/lib/runtime/bin/java $out/bin/jabref \ + --add-flags '-Djava.library.path=${systemLibPaths}' --add-flags "-p $out/lib/app -m org.jabref/org.jabref.JabRefLauncher" \ + --run 'export LD_LIBRARY_PATH=${systemLibPaths}:$LD_LIBRARY_PATH' + + cp -r ${desktopItem}/share/applications $out/share/ - ln -s $src $out/share/java/jabref-${version}.jar - makeWrapper ${jre}/bin/java $out/bin/jabref \ - --add-flags "-jar $out/share/java/jabref-${version}.jar" + # we still need to unpack the runtime image to get the icon + mkdir unpacked + $out/lib/runtime/bin/jimage extract --dir=./unpacked lib/runtime/lib/modules + cp unpacked/org.jabref/icons/jabref.svg $out/share/icons/jabref.svg ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 2f961f43da0..1023af9234c 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -17,6 +17,7 @@ , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null , ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null +, wrapQtAppsHook ? null , variant ? "fresh" } @ args: @@ -303,8 +304,15 @@ in (mkDrv rec { mkdir -p $dev cp -r include $dev + '' + lib.optionalString kdeIntegration '' + for prog in $out/bin/* + do + wrapQtApp $prog + done ''; + dontWrapQtApps = true; + configureFlags = [ (if withHelp then "" else "--without-help") "--with-boost=${boost.dev}" @@ -382,7 +390,8 @@ in (mkDrv rec { nativeBuildInputs = [ gdb fontforge autoconf automake bison pkgconfig libtool - ] ++ lib.optional (!kdeIntegration) wrapGAppsHook; + ] ++ lib.optional (!kdeIntegration) wrapGAppsHook + ++ lib.optional kdeIntegration wrapQtAppsHook; buildInputs = with xorg; [ ant ArchiveZip boost cairo clucene_core diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix deleted file mode 100644 index af0d4c43059..00000000000 --- a/pkgs/applications/office/paperwork/backend.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ buildPythonPackage, lib, fetchFromGitLab - -, isPy3k, isPyPy - -, pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor -, python-Levenshtein, pygobject3, pyocr, natsort, libinsane -, distro - -, pkgs -}: - -buildPythonPackage rec { - pname = "paperwork-backend"; - version = "1.3.1"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - repo = "paperwork"; - group = "World"; - owner = "OpenPaperwork"; - rev = version; - sha256 = "1219yz8z4r1yn6miq8zc2z1m1lnhf3dmkhwfw23n05bg842nvg65"; - }; - - sourceRoot = "source/paperwork-backend"; - - # Python 2.x is not supported. - disabled = !isPy3k && !isPyPy; - - patchPhase = '' - echo 'version = "${version}"' > paperwork_backend/_version.py - ''; - - preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; - - propagatedBuildInputs = [ - pyenchant simplebayes pillow pycountry whoosh termcolor - python-Levenshtein libinsane pygobject3 pyocr natsort - pkgs.poppler_gi pkgs.gtk3 distro - ]; - - meta = { - description = "Backend part of Paperwork (Python API, no UI)"; - homepage = "https://openpaper.work/"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ aszlig symphorien ]; - }; -} diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix new file mode 100644 index 00000000000..cae55ae95f1 --- /dev/null +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -0,0 +1,42 @@ +{ buildPythonPackage, lib, fetchFromGitLab + +, isPy3k, isPyPy + +, distro, setuptools + +, pkgs +}: + +buildPythonPackage rec { + pname = "openpaperwork-core"; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + + sourceRoot = "source/openpaperwork-core"; + + # Python 2.x is not supported. + disabled = !isPy3k && !isPyPy; + + patchPhase = '' + echo 'version = "${version}"' > src/openpaperwork_core/_version.py + chmod a+w -R .. + patchShebangs ../tools + ''; + + propagatedBuildInputs = [ + distro + setuptools + ]; + + nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + + preBuild = '' + make l10n_compile + ''; + + meta = { + description = "Backend part of Paperwork (Python API, no UI)"; + homepage = "https://openpaper.work/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aszlig symphorien ]; + }; +} diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix new file mode 100644 index 00000000000..5dae745ce2e --- /dev/null +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -0,0 +1,52 @@ +{ buildPythonPackage +, lib +, fetchFromGitLab + +, isPy3k +, isPyPy + +, openpaperwork-core +, pillow +, pygobject3 +, distro + +, pkgs +}: + +buildPythonPackage rec { + pname = "openpaperwork-gtk"; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + + sourceRoot = "source/openpaperwork-gtk"; + + # Python 2.x is not supported. + disabled = !isPy3k && !isPyPy; + + patchPhase = '' + echo 'version = "${version}"' > src/openpaperwork_gtk/_version.py + chmod a+w -R .. + patchShebangs ../tools + ''; + + nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + preBuild = '' + make l10n_compile + ''; + + propagatedBuildInputs = [ + pillow + pygobject3 + pkgs.poppler_gi + pkgs.gtk3 + distro + pkgs.pango + openpaperwork-core + ]; + + meta = { + description = "Reusable GTK components of Paperwork"; + homepage = "https://openpaper.work/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aszlig symphorien ]; + }; +} diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix new file mode 100644 index 00000000000..a033bd695db --- /dev/null +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -0,0 +1,77 @@ +{ buildPythonPackage +, lib +, fetchFromGitLab + +, isPy3k +, isPyPy + +, pyenchant +, simplebayes +, pypillowfight +, pycountry +, whoosh +, termcolor +, python-Levenshtein +, pygobject3 +, pyocr +, natsort +, libinsane +, distro +, openpaperwork-core +, openpaperwork-gtk +, psutil + +, pkgs +}: + +buildPythonPackage rec { + pname = "paperwork-backend"; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + + sourceRoot = "source/paperwork-backend"; + + # Python 2.x is not supported. + disabled = !isPy3k && !isPyPy; + + patchPhase = '' + echo 'version = "${version}"' > src/paperwork_backend/_version.py + chmod a+w -R .. + patchShebangs ../tools + ''; + + propagatedBuildInputs = [ + pyenchant + simplebayes + pypillowfight + pycountry + whoosh + termcolor + python-Levenshtein + libinsane + pygobject3 + pyocr + natsort + pkgs.poppler_gi + pkgs.gtk3 + distro + openpaperwork-core + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + preBuild = '' + make l10n_compile + ''; + + checkInputs = [ openpaperwork-gtk psutil ]; + + meta = { + description = "Backend part of Paperwork (Python API, no UI)"; + homepage = "https://openpaper.work/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aszlig symphorien ]; + }; +} diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 102c3cd2564..c493421dd11 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -10,45 +10,36 @@ , dbus , libnotify , wrapGAppsHook +, fetchFromGitLab +, which +, gettext +, gobject-introspection }: python3Packages.buildPythonApplication rec { - inherit (python3Packages.paperwork-backend) version src; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; pname = "paperwork"; sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: postPatch = '' - themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)" - sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py + chmod a+w -R .. + patchShebangs ../tools - sed -i -e 's,sys\.prefix,"",g' \ - src/paperwork/frontend/aboutdialog/__init__.py \ - src/paperwork/frontend/mainwindow/__init__.py \ - setup.py + export HOME=$(mktemp -d) - sed -i -e '/^UI_FILES_DIRS = \[/,/^\]$/ { - c UI_FILES_DIRS = ["'"$out/share/paperwork"'"] - }' src/paperwork/frontend/util/__init__.py - - sed -i -e '/^LOCALE_PATHS = \[/,/^\]$/ { - c LOCALE_PATHS = ["'"$out/share"'"] - }' src/paperwork/paperwork.py - - sed -i -e 's/"icon"/"icon-name"/g' \ - src/paperwork/frontend/mainwindow/mainwindow.glade - - sed -i -e 's/"logo"/"logo-icon-name"/g' \ - src/paperwork/frontend/aboutdialog/aboutdialog.glade - - cat - ../AUTHORS.py > src/paperwork/_version.py <<EOF + cat - ../AUTHORS.py > src/paperwork_gtk/_version.py <<EOF # -*- coding: utf-8 -*- version = "${version}" authors_code="" EOF ''; + preBuild = '' + make l10n_compile + ''; + ASPELL_CONF = "dict-dir ${buildEnv { name = "aspell-all-dicts"; paths = lib.collect lib.isDerivation aspellDicts; @@ -56,37 +47,49 @@ python3Packages.buildPythonApplication rec { postInstall = '' # paperwork-shell needs to be re-wrapped with access to paperwork - cp ${python3Packages.paperwork-backend}/bin/.paperwork-shell-wrapped $out/bin/paperwork-shell + cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli # install desktop files and icons - XDG_DATA_HOME=$out/share $out/bin/paperwork-shell install + XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user ''; - checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]); + checkInputs = [ xvfb_run dbus.daemon ]; nativeBuildInputs = [ wrapGAppsHook + gobject-introspection + (lib.getBin gettext) + which ]; buildInputs = [ gnome3.adwaita-icon-theme libnotify librsvg + gtk3 + cairo ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + # A few parts of chkdeps need to have a display and a dbus session, so we not # only need to run a virtual X server + dbus but also have a large enough # resolution, because the Cairo test tries to draw a 200x200 window. preCheck = '' xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - paperwork-shell chkdeps paperwork + $out/bin/paperwork-gtk chkdeps ''; propagatedBuildInputs = with python3Packages; [ paperwork-backend + paperwork-shell + openpaperwork-gtk + openpaperwork-core pypillowfight - gtk3 - cairo pyxdg dateutil setuptools diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix new file mode 100644 index 00000000000..1be6f329e3c --- /dev/null +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -0,0 +1,59 @@ +{ buildPythonPackage +, lib +, fetchFromGitLab + +, isPy3k +, isPyPy + +, openpaperwork-core +, openpaperwork-gtk +, paperwork-backend +, fabulous +, getkey + +, pkgs +}: + +buildPythonPackage rec { + pname = "paperwork-shell"; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + + sourceRoot = "source/paperwork-shell"; + + # Python 2.x is not supported. + disabled = !isPy3k && !isPyPy; + + patchPhase = '' + echo 'version = "${version}"' > src/paperwork_shell/_version.py + chmod a+w -R .. + patchShebangs ../tools + ''; + + propagatedBuildInputs = [ + openpaperwork-core + paperwork-backend + fabulous + getkey + ]; + + checkInputs = [ + openpaperwork-gtk + ]; + + nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + preBuild = '' + make l10n_compile + ''; + + preCheck = '' + export HOME=$(mktemp -d) + "$out/bin/paperwork-cli" chkdeps + ''; + + meta = { + description = "CLI for Paperwork"; + homepage = "https://openpaper.work/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aszlig symphorien ]; + }; +} diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix new file mode 100644 index 00000000000..70770676edd --- /dev/null +++ b/pkgs/applications/office/paperwork/src.nix @@ -0,0 +1,12 @@ +{fetchFromGitLab}: +rec { + version = "2.0.1"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + repo = "paperwork"; + group = "World"; + owner = "OpenPaperwork"; + rev = version; + sha256 = "16pc4drwpjl4937wdavs6wk0j1qs474b072wplhs8ywxfgqip1h4"; + }; +} diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index e186b3e3ce5..163e6121576 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.49.0"; + version = "0.49.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1b3dll6ljkj2wyiy3ns9cgxqgjjr60dfrqrbbwdbndqj4pzfvbyf"; + sha256 = "0c2ixzwbc094wqc2lyrh3w1azswg6xz3wdh8l4lbkiw02s9czhhn"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index ff69329140b..c2c300b8748 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -18,7 +18,7 @@ , podofo , poppler , poppler_data -, python2 +, python3 , qtbase , qtimageformats , qttools @@ -26,7 +26,7 @@ }: let - pythonEnv = python2.withPackages ( + pythonEnv = python3.withPackages ( ps: [ ps.pillow ps.tkinter @@ -36,50 +36,13 @@ in mkDerivation rec { pname = "scribus"; - version = "1.5.5"; + version = "1.5.6.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; - sha256 = "0w9zzsiaq3f7vpxybk01c9z2b4qqg67mzpyfb2gjchz8dhdb423r"; + sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s="; }; - patches = [ - # Poppler patches from - # https://github.com/scribusproject/scribus/commits/master/scribus/plugins/import/pdf - - # fix build with Poppler 0.82 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; - sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; - }) - # fix build with Poppler 0.83 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; - sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; - }) - # fix build with Poppler 0.84 - # TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch"; - sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y"; - }) - # Formating changes needed for the Poppler 0.86 patch to apply - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch"; - sha256 = "16n3wch2mkabgkb06iywggdkckr4idrw4in56k5jh2jqjl0ra2db"; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch"; - sha256 = "0g6l3qc75wiykh59059ajraxjczh11wkm68942d0skl144i893rr"; - includes = [ "scribus/plugins/import/pdf/*" ]; - }) - # fix build with Poppler 0.86 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch"; - sha256 = "1lszpzlpgdhm79nywvqji25aklfhzb2qfsfiyld7yv51h82zwp77"; - }) - ]; - enableParallelBuilding = true; nativeBuildInputs = [ diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index e84e8496741..067b06747d7 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -30,6 +30,7 @@ mkDerivation rec { cmakeFlags = [ "-DSKG_DESIGNER=OFF" "-DSKG_WEBENGINE=ON" + "-DBUILD_TESTS=ON" ]; meta = with lib; { diff --git a/pkgs/applications/office/timekeeper/default.nix b/pkgs/applications/office/timekeeper/default.nix new file mode 100644 index 00000000000..60b4bad60bb --- /dev/null +++ b/pkgs/applications/office/timekeeper/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchFromGitHub +, poco +, pkg-config +, gnome2 +, gtkmm2 +, lib +}: + +stdenv.mkDerivation rec { + pname = "timekeeper"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "bburdette"; + repo = "TimeKeeper"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "03rvzkygnn7igcindbb5bcmfy0l83n0awkzprsnhlb6ndxax3k9w"; + }; + + nativeBuildInputs = [ + poco + pkg-config + ]; + + buildInputs = [ + gtkmm2 + gnome2.libglademm + gnome2.libglade + ]; + + installPhase = '' + install -Dm755 TimeKeeper/TimeKeeper $out/bin/timekeeper + ''; + + meta = with stdenv.lib; { + description = "Log hours worked and make reports"; + homepage = "https://github.com/bburdette/TimeKeeper"; + maintainers = with maintainers; [ bburdette ]; + platforms = [ "x86_64-linux" ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index 489b759f48c..8db5691ed84 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -13,8 +13,8 @@ in stdenv.mkDerivation { installPhase = '' install -vd $out/bin install -vm 755 todo.sh $out/bin - install -vd $out/etc/bash_completion.d - install -vm 644 todo_completion $out/etc/bash_completion.d/todo + install -vd $out/share/bash-completion/completions + install -vm 644 todo_completion $out/share/bash-completion/completions/todo install -vd $out/etc/todo install -vm 644 todo.cfg $out/etc/todo/config ''; diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 80b6ef6243c..b266ce86e2a 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -3,7 +3,7 @@ let description = "A note-taking application that knows programmers and Markdown better"; in mkDerivation rec { - version = "2.8.2"; + version = "2.10"; pname = "vnote"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ in mkDerivation rec { repo = "vnote"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "18qffq5c2plr5rjb5lafhdz1v5kbbb2wiyacgdhh3xni3khni52l"; + sha256 = "EeeVGnKI0irLO1zJQxlVlIUhqG987JIgxNvKpUgLxUQ="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 11c5c46ae68..6e70a9f8d03 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dump1090"; - version = "3.8.1"; + version = "4.0"; src = fetchFromGitHub { owner = "flightaware"; repo = pname; rev = "v${version}"; - sha256 = "0xg8rzrxqklx1m9ncxsd96dlkbjcsxfi2mrb859v50f07xysdyd8"; + sha256 = "1zacsqaqsiapljhzw31dwc4nld2rp98jm3ivkyznrhzk9n156p42"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 3811c8fd6f2..5f7ee88a029 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.15"; + version = "4.1.16"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1fzbcv2dgg6byb2l8m2d6i69yn0a44pq52mpmms756jdf6z622i6"; + sha256 = "1dfkvhs0ri5kbyskk730ik8ix5z138qys26b31p6kixd8jjkw3k4"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 786e463686f..106d2103ec4 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { pname = "gqrx"; - version = "2.13.2"; + version = "2.13.5"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "1lcy9gqb1x9fwq550bywj7h66rdacq5893wsax1p7qvqa27d945b"; + sha256 = "168wjad5g0ka555hwsciwbj7fqx1c89q59hq1yxj8aiyp5kfcahx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix new file mode 100644 index 00000000000..1a032554e19 --- /dev/null +++ b/pkgs/applications/radio/quisk/default.nix @@ -0,0 +1,39 @@ +{ stdenv, python38Packages, fetchPypi +, fftw, alsaLib, pulseaudio, wxPython_4_0 }: + +python38Packages.buildPythonApplication rec { + pname = "quisk"; + version = "4.1.72"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qw00b9d0l3ysdrmd3nr5a2zlwg9ygdil7krnk2gjp5g8bb778k7"; + }; + + buildInputs = [ fftw alsaLib pulseaudio ]; + + propagatedBuildInputs = [ wxPython_4_0 ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A SDR transceiver for radios that use the Hermes protocol"; + longDescription = '' + QUISK is a Software Defined Radio (SDR) transceiver. You supply radio + hardware that converts signals at the antenna to complex (I/Q) data at an + intermediate frequency (IF). Data can come from a sound card, Ethernet or + USB. Quisk then filters and demodulates the data and sends the audio to + your speakers or headphones. For transmit, Quisk takes the microphone + signal, converts it to I/Q data and sends it to the hardware. + + Quisk can be used with SoftRock, Hermes Lite 2, HiQSDR, Odyssey and many + radios that use the Hermes protocol. Quisk can connect to digital + programs like Fldigi and WSJT-X. Quisk can be connected to other software + like N1MM+ and software that uses Hamlib. + ''; + license = licenses.gpl2Plus; + homepage = "https://james.ahlstrom.name/quisk/"; + maintainers = with maintainers; [ pulsation ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 6d0a19334de..dd8c56610c2 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -13,47 +13,40 @@ libav, libiio, libopus, libpulseaudio, -libusb-compat-0_1, +libusb1, limesuite, +libbladeRF, mkDerivation, ocl-icd, opencv3, pkgconfig, qtbase, qtmultimedia, +qtserialport, qtwebsockets, rtl-sdr, -serialdv +serialdv, +uhd }: -let - - codec2' = codec2.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "drowe67"; - repo = "codec2"; - rev = "567346818c0d4d697773cf66d925fdb031e15668"; - sha256 = "0ngqlh2cw5grx2lg7xj8baz6p55gfhq4caggxkb4pxlg817pwbpa"; - }; - }); - -in mkDerivation rec { +mkDerivation rec { pname = "sdrangel"; - version = "4.11.12"; + version = "4.21.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "0zbx0gklylk8npb3wnnmqpam0pdxl40f20i3wzwwh4gqrppxywzx"; + sha256 = "y6BVwnSJXiapgm9pAuby1DLLeU5MSyB4uqEa3oS35/U="; fetchSubmodules = false; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf - fftwFloat codec2' cm256cc serialdv + fftwFloat codec2 cm256cc serialdv qtserialport + libbladeRF uhd ]; cmakeFlags = [ "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index cb3f3131ea1..4a6bdd9d1e9 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://www.astrolabeproject.com"; description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; license = licenses.gpl3; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 0b990dc541b..86a16c4f047 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.8.11"; + version = "2.8.12"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip"; - sha256 = "1hiwnrrh42qzc7kdc7bypgcgn488pz8g462xzchbhgx7jjdbbwhm"; + sha256 = "0zxmk417j9s5nms0np1fsip7r0jhwkj1d1x424ljr9krcb2zwcyq"; }; installPhase = '' diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 77585293116..0976e5a1080 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1133"; + version = "1145"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "0a600p1fymm1ylaxzjwg46zdwz6ilaaak1f4n8xr3hp3ir9rgfjq"; + sha256 = "0g54nmxxrirgid1i1k5i6rf7vnjpk9548sy06yqb4fj7vdzqgq99"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/science/biology/samblaster/default.nix b/pkgs/applications/science/biology/samblaster/default.nix index 7795ba23736..6846e3c84fa 100644 --- a/pkgs/applications/science/biology/samblaster/default.nix +++ b/pkgs/applications/science/biology/samblaster/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "samblaster"; - version = "0.1.24"; + version = "0.1.26"; src = fetchFromGitHub { owner = "GregoryFaust"; repo = "samblaster"; rev = "v.${version}"; - sha256 = "0iv2ddfw8363vb2x8gr3p8g88whb6mb9m0pf71i2cqsbv6jghap7"; + sha256 = "0g24fq5hplnfgqkh3xqpg3lgx3wmxwnh9c7m6yw7pbi40lmgl1jv"; }; installPhase = '' diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index cba3f1d0946..9adb8e3674b 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.14"; + version = "14.31.17"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "1qmy4iqn5xgd4m9hs4w9cn9rzkwmpgdb5azd93cypp05s4nmjsnm"; + sha256 = "1cg3a56bbvlq5wfjgwclg9vsj61kmj6fnqvgf7fdvklhdvnijla2"; }; patchPhase = '' @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/jmol"; license = licenses.lgpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau mounium ]; + maintainers = with maintainers; [ mounium ] ++ teams.sage.members; }; } diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 84a1034849f..ddab526ebe7 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.19.0"; + version = "20.20.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "0b9a0yl3mxfb2dfdkgs2wphhxsgwixqk6nl2hsn1ly3gz53cws1q"; + sha256 = "1a8b0drb0c95c8arm3aa0z0sbdm9ilj4h1g90i0qyn4g2wk2xsal"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index d2b7c0d66a1..c2d7cefec9b 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -27,7 +27,6 @@ mkDerivation { nativeBuildInputs = [ cmake - wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 494a5cf2931..4b0a4108ab2 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,39 +1,47 @@ -{ lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }: +{ stdenv, lib, fetchFromGitHub +, qtbase, qttools, qmake, wrapQtAppsHook +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "librepcb"; version = "0.1.5"; src = fetchFromGitHub { - owner = "LibrePCB"; - repo = "LibrePCB"; - fetchSubmodules = true; - rev = version; + owner = pname; + repo = pname; + rev = version; sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx"; + fetchSubmodules = true; }; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; - buildInputs = [ qtbase ]; qmakeFlags = ["-r"]; + enableParallelBuilding = true; postInstall = '' - mkdir -p $out/share/librepcb/fontobene - cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/ - ''; + mkdir -p $out/share/librepcb/fontobene + cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/ + ''; + + # the build system tries to use 'git' at build time to find the HEAD hash. + # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment + # at the end of the line to remove the git call. + patchPhase = '' + substituteInPlace ./libs/librepcb/common/common.pro \ + --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # ' + ''; preFixup = '' wrapQtApp $out/bin/librepcb ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A free EDA software to develop printed circuit boards"; - homepage = "https://librepcb.org/"; - maintainers = with maintainers; [ luz ]; - license = licenses.gpl3; - platforms = platforms.linux; + homepage = "https://librepcb.org/"; + maintainers = with maintainers; [ luz thoughtpolice ]; + license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 96849c30029..6667f2be9c3 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }: +{ stdenv, fetchurl +, m4, tcsh, libX11, tcl, tk +, cairo, ncurses, mesa_glu, python3 +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.5"; + version = "8.3.80"; src = fetchurl { - url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz"; - sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq"; + url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; + sha256 = "0a5x4sh5xsr79pqbgv6221jc4fvaxkg2pvrdhy1cs4bmsc1sbm9j"; }; buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ]; nativeBuildInputs = [ python3 ]; + enableParallelBuilding = true; configureFlags = [ "--with-tcl=${tcl}" @@ -22,6 +26,8 @@ stdenv.mkDerivation { patchShebangs scripts/* ''; + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + patches = [ ./0001-strip-bin-prefix.patch ./0002-fix-format-security.patch @@ -29,8 +35,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "VLSI layout tool written in Tcl"; - homepage = "http://opencircuitdesign.com/magic/"; - license = licenses.mit; - maintainers = [ maintainers.anna328p ]; + homepage = "http://opencircuitdesign.com/magic/"; + license = licenses.mit; + maintainers = with maintainers; [ anna328p thoughtpolice ]; }; } diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index ab2861d53f2..5113dc778f6 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ngspice"; - version = "32"; + version = "33"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "1wiys30c9mqzxr7iv1sws0jnn4xi0mj3lanhnk2qfvaiji70rn9w"; + sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/science/electronics/qcsxcad/default.nix b/pkgs/applications/science/electronics/qcsxcad/default.nix deleted file mode 100644 index c12678c0047..00000000000 --- a/pkgs/applications/science/electronics/qcsxcad/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, cmake -, csxcad -, tinyxml -, vtkWithQt5 -, wrapQtAppsHook -, qtbase -}: - -mkDerivation { - pname = "qcsxcad"; - version = "unstable-2020-01-04"; - - src = fetchFromGitHub { - owner = "thliebig"; - repo = "QCSXCAD"; - rev = "0dabbaf2bc1190adec300871cf309791af842c8e"; - sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn"; - }; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCSXCAD_ROOT_DIR=${csxcad}" - "-DENABLE_RPATH=OFF" - ]; - - buildInputs = [ - csxcad - tinyxml - vtkWithQt5 - qtbase - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Qt library for CSXCAD"; - homepage = "https://github.com/thliebig/QCSXCAD"; - license = licenses.gpl3; - maintainers = with maintainers; [ matthuszagh ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index df1ce7b7235..6217df2db8f 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -1,43 +1,45 @@ -{ stdenv, fetchFromGitHub, autoconf, gperf, flex, bison, readline, ncurses -, bzip2, zlib -# Test inputs +{ stdenv +, fetchFromGitHub +, autoconf +, bison +, bzip2 +, flex +, gperf +, ncurses , perl +, readline +, zlib }: let iverilog-test = fetchFromGitHub { - owner = "steveicarus"; - repo = "ivtest"; - rev = "6882cb8ec08926c4e356c6092f0c5f8c23328d5c"; - sha256 = "04sj5nqzwls1y760kgnd9c2whkcrr8kvj9lisd5rvk0w580kjb2x"; + owner = "steveicarus"; + repo = "ivtest"; + rev = "253609b89576355b3bef2f91e90db62223ecf2be"; + sha256 = "18i7jlr2csp7mplcrwjhllwvb6w3v7x7mnx7vdw48nd3g5scrydx"; }; in stdenv.mkDerivation rec { - pname = "iverilog"; - version = "unstable-2020-08-24"; + pname = "iverilog"; + version = "11.0"; src = fetchFromGitHub { - owner = "steveicarus"; - repo = pname; - rev = "d8556e4c86e1465b68bdc8d5ba2056ba95a42dfd"; - sha256 = "sha256-sT9j/0Q2FD5MOGpH/quMGvAuM7t7QavRHKD9lX7Elfs="; + owner = "steveicarus"; + repo = pname; + rev = "v${stdenv.lib.replaceStrings ["."] ["_"] version}"; + sha256 = "0nzcyi6l2zv9wxzsv9i963p3igyjds0n55x0ph561mc3pfbc7aqp"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ autoconf bison flex gperf ]; - preConfigure = '' - chmod +x $PWD/autoconf.sh - $PWD/autoconf.sh - ''; + buildInputs = [ bzip2 ncurses readline zlib ]; - nativeBuildInputs = [ autoconf gperf flex bison ]; + preConfigure = "sh autoconf.sh"; + + enableParallelBuilding = true; - buildInputs = [ readline ncurses bzip2 zlib ]; + doCheck = true; - # tests from .travis.yml - doCheck = true; # runs ``make check`` - # most tests pass, but some that rely on exact text of floating-point numbers fail on aarch64. - doInstallCheck = !stdenv.isAarch64; installCheckInputs = [ perl ]; installCheckPhase = '' @@ -58,9 +60,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icarus Verilog compiler"; - homepage = "http://iverilog.icarus.com/"; - license = with licenses; [ gpl2Plus lgpl21Plus] ; - maintainers = with maintainers; [ winden ]; - platforms = platforms.all; + homepage = "http://iverilog.icarus.com/"; # https does not work + license = with licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ winden thoughtpolice ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index 43dfdcabd02..be9e890fc8d 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , bison , flex , verilog @@ -16,6 +17,15 @@ stdenv.mkDerivation rec { sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; }; + patches = stdenv.lib.optionals (!stdenv.isAarch64) [ + # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15 + # for some strange reason, this is not needed for aarch64 + (fetchpatch { + url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch"; + sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf"; + }) + ]; + nativeBuildInputs = [ bison flex diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix new file mode 100644 index 00000000000..4691291a425 --- /dev/null +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, libX11 +, libGL +, libGLU +, freeglut }: + +stdenv.mkDerivation rec { + pname = "antiprism"; + version = "0.26"; + + src = fetchFromGitHub { + owner = "antiprism"; + repo = pname; + rev = version; + sha256 = "sha256-5FE6IbYKk7eMT985R9NCX3GDXE8SrdVHFcCpKeJvKtQ="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; + + meta = with stdenv.lib; { + homepage = "https://www.antiprism.com"; + description = "A collection of programs for generating, manipulating, transforming and viewing polyhedra"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 946cba41b14..dc9e40912d5 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -35,6 +35,7 @@ let "8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0"; "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; "8.12.0" = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz"; + "8.12.1" = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 749220382c6..88e1b4fbc0e 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.21.0"; + version = "3.23.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1c7f2x6hdamjkr50761gcb5mg8hhlc75k1mf18vn1k9zsy1gxlgz"; + sha256 = "09mklc1p6ms1jayg2f89hqfmhca3h5744lli936l38ypn1d00sxx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 88aafcdae22..dd71cf2cb1a 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"; }; - buildInputs = [ python fixDarwinDylibNames ] + nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ python ] ++ optional javaBindings jdk ++ optionals ocamlBindings [ ocaml findlib zarith ] ; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 25ee66e8f75..e4fbe8a7f2d 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; hydraPlatforms = platforms.linux; - maintainers = with maintainers; [ peti timokau ]; + maintainers = with maintainers; [ peti ] ++ teams.sage.members; }; } diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index 438a84c0e0b..ddd470e621a 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Littlewood-Richardson calculator"; homepage = "http://math.rutgers.edu/~asbuch/lrcalc/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index ace5ee55d7b..d04a89bd884 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -144,6 +144,9 @@ stdenv.mkDerivation rec { ''; dontBuild = true; + + # This is primarily an IO bound build; there's little benefit to building remotely. + preferLocalBuild = true; # all binaries are already stripped dontStrip = true; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index d75fc9731cd..76e7c796a13 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { inherit version; description = ''Programs for computing automorphism groups of graphs and digraphs''; license = licenses.asl20; - maintainers = with maintainers; [ raskin timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; # I'm not sure if the filename will remain the same for future changelog or # if it will track changes to minor releases. Lets see. Better than nothing diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index c383438002f..9ae4fe1ba92 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { # version was released that pointed to gplv2 however, so thats probably # the right license. license = licenses.gpl2; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index bd730a1eaaa..a3e2f99ab27 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "http://pari.math.u-bordeaux.fr"; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ertes raskin AndersonTorres timokau ]; + maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members; platforms = platforms.linux ++ platforms.darwin; updateWalker = true; }; diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index 7726a0d789e..082ff60c3e8 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gp2c"; - version = "0.0.11pl4"; + version = "0.0.12"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz"; - sha256 = "sha256-QGocEXxTahB5fHhlWtHXgMEl6brQ34LNwScxHNuB1rI="; + sha256 = "039ip7qkwwv46wrcdrz7y12m30kazzkjr44kqbc0h137g4wzd7zf"; }; buildInputs = [ pari perl ]; diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 82e33121671..3e6057c9aef 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://pynac.org"; license = licenses.gpl3; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 133df7c75ac..48c4b77c2cc 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0yrzvsii84r9d2i2hrs4f65wzv3yj24l9d9yqfv3j85881h8wkm2"; + sha256 = "1pff3m5xnw9kai6n110j1grxzcf2r7pxi76jin1lxhm8q8gmnnz1"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix index 403dc8708fa..86fe9912c19 100644 --- a/pkgs/applications/science/math/sage/flask-oldsessions.nix +++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides a session class that works like the one in Flask before 0.10."; license = licenses.bsd2; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; homepage = "https://github.com/mitsuhiko/flask-oldsessions"; }; } diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/pkgs/applications/science/math/sage/flask-openid.nix index 527173dec80..900b033429e 100644 --- a/pkgs/applications/science/math/sage/flask-openid.nix +++ b/pkgs/applications/science/math/sage/flask-openid.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Adds openid support to flask applications"; license = licenses.bsd2; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; homepage = "https://pythonhosted.org/Flask-OpenID/"; }; } diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix index 718414126ae..5fc8a4aa6f4 100644 --- a/pkgs/applications/science/math/sage/pybrial.nix +++ b/pkgs/applications/science/math/sage/pybrial.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "python implementation of BRiAl"; license = licenses.gpl2; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/pkgs/applications/science/math/sage/python-openid.nix index 4c7fdadadaf..1e8a908ac79 100644 --- a/pkgs/applications/science/math/sage/python-openid.nix +++ b/pkgs/applications/science/math/sage/python-openid.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OpenID library for Python"; license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; homepage = "https://github.com/openid/python-openid/"; }; } diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 4fa8ae6270b..e2acef7b8eb 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"; license = licenses.gpl2; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix index 77b2168ad97..ad5c53b6c11 100644 --- a/pkgs/applications/science/math/sage/sagenb.nix +++ b/pkgs/applications/science/math/sage/sagenb.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Sage Notebook"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; # let sagenb use mathjax diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index a8c4f6bb9a0..8c5eac2c06d 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A CAS for polynomial computations"; - maintainers = with maintainers; [ raskin timokau ]; + maintainers = teams.sage.members; # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` platforms = subtractLists platforms.i686 platforms.unix; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index b363137fb99..ca752259797 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = ''A collection of routines for representation theory and combinatorics''; license = licenses.isc; - maintainers = with maintainers; [raskin timokau]; + maintainers = teams.sage.members; platforms = platforms.unix; homepage = "https://gitlab.com/sagemath/symmetrica"; }; diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index 91c3b8c779c..85be61f6686 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -8,7 +8,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.6.13"; + version = "7.6.21"; python = python2.withPackages ( @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - sha256 = "0qfvhwc29cgqkwf2bkhq4gr2d1c4jgccfs58916ss03n4rwz9gng"; + sha256 = "1vfrdqkrvdlyxaw3f6z92w5dllrv6810lmf8yhcmjcwmphipvf71"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index cdeed6536ef..a383de621f2 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -11,7 +11,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.6.13"; + version = "7.6.21"; in stdenv.mkDerivation rec { inherit version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - sha256 = "09yfvk16j1iwx8h1xg678ks3bc8760gfdn7n32j8r893kd32cwyk"; + sha256 = "00fd00pf6fcpplcaahvy9ir60mk69d9rcmwsyq3jrv9mxqm9aq7p"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index b868706a05f..0b1ef2b16ea 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { description = "Unit-aware calculator"; homepage = "https://rinkcalc.app"; license = with licenses; [ mpl20 gpl3 ]; - maintainers = with maintainers; [ sb0 filalex77 ]; + maintainers = with maintainers; [ sb0 Br1ght0ne ]; }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 2b7532a9345..a03f7682a51 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.19.3"; + version = "5.28.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -13,6 +13,7 @@ python3Packages.buildPythonApplication rec { jsonschema nbformat psutil + pulp pyyaml ratelimiter requests @@ -22,7 +23,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "b83f3ef73e25dafcb39b3565030e33fa2f7e80ed70256c535dc7e58ea762305d"; + sha256 = "2367ce91baf7f8fa7738d33aff9670ffdf5410bbac49aeb209f73b45a3425046"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index b2e5284796f..5ae56528f96 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, wrapQtAppsHook, qmake }: +{ mkDerivation, lib, fetchurl, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "xflr5"; version = "6.47"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ qmake wrapQtAppsHook ]; + nativeBuildInputs = [ qmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An analysis tool for airfoils, wings and planes"; homepage = https://sourceforge.net/projects/xflr5/; license = licenses.gpl3; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 9c7166afc2a..dcc2114a488 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.22"; + version = "1.8.23"; src = fetchPypi { inherit pname version; - sha256 = "87d7f9c0b8f4f1db3ce3521f67cd244fe3b89ffead797e92f35a7f71bbe8b958"; + sha256 = "46c70e013d3e465daae5523f6a1aad553e6ee0f4db137bb935a3273f7ffcc22e"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 72e00cb15a7..4e87c00434b 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,16 +52,17 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.5.0"; + # 0.5.0 is not compatible with gnome 3.38 + version = "0.6.0-rc1"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "1948j57xhqvc5y876s929x9rhd6j0xnw5c91g1zqw2rfncn602g2"; + sha256 = "RuIJvB0J/BQFqemOkEUiqS1uz0gMS49Dd8UQt0nbrQ0="; }; - cargoSha256 = "17lyzcj07f0vyki3091vgjd0w8ki11sw5m8gb3bxdph1dl04rria"; + cargoSha256 = "+3iZywLvy+8C7j6g9bqij2DSLjBoE2u1GXgfV04cWRY="; nativeBuildInputs = [ cmake @@ -136,7 +137,7 @@ rustPlatform.buildRustPackage rec { description = "A cross-platform, GPU-accelerated terminal emulator"; homepage = "https://github.com/alacritty/alacritty"; license = licenses.asl20; - maintainers = with maintainers; [ filalex77 mic92 cole-h ma27 ]; + maintainers = with maintainers; [ Br1ght0ne mic92 cole-h ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e2eda846d60..b6a93aefb59 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.19.1"; + version = "0.19.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "145fx4nnn0gszawllfwqf1h65ak0ij6ffargs7y0cgaxsc991s6m"; + sha256 = "06mlrc283k5f75y36fmmaxnj29jfc1s8vaykjph6a86m1gcl5wgi"; }; buildInputs = [ @@ -53,10 +53,10 @@ buildPythonApplication rec { nativeBuildInputs = [ pkgconfig sphinx ncurses + installShellFiles ] ++ stdenv.lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. - installShellFiles ]; propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; @@ -113,10 +113,10 @@ buildPythonApplication rec { wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" runHook postInstall - mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} - "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish" - "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash" - "$out/bin/kitty" + complete setup zsh > "$out/share/zsh/site-functions/_kitty" + installShellCompletion --cmd kitty \ + --bash <("$out/bin/kitty" + complete setup bash) \ + --fish <("$out/bin/kitty" + complete setup fish) \ + --zsh <("$out/bin/kitty" + complete setup zsh) ''; postInstall = '' diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 853fe22f0bf..9c01430d6df 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, autoconf, makeDesktopItem +{ stdenv, lib, fetchFromGitHub, pkgconfig, autoconf, makeDesktopItem , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.9.0"; + version = "3.9.1"; - src = fetchurl { - url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k"; + src = fetchFromGitHub { + owner = "arakiken"; + repo = pname; + rev = "rel-${lib.replaceStrings [ "." ] [ "_" ] version}"; # 3.9.1 -> rel-3_9_1 + sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj"; }; nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ]; diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 63565e207f7..2f991ca1c7e 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -4,6 +4,8 @@ let # termite requires VTE with some internals exposed # https://github.com/thestinger/vte-ng + # + # three of the patches have been locally modified to cleanly apply on 0.62 vte-ng = vte.overrideAttrs (attrs: { patches = attrs.patches or [] ++ [ (fetchpatch { @@ -11,26 +13,17 @@ let url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch"; sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715"; }) - (fetchpatch { - name = "0002-expose-function-for-setting-cursor-position.patch"; - url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch"; - sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89"; - }) - (fetchpatch { - name = "0003-add-function-for-setting-the-text-selections.patch"; - url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch"; - sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x"; - }) + # Derived from https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch + ./vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch + # Derived from https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch + ./vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch (fetchpatch { name = "0004-add-functions-to-get-set-block-selection-mode.patch"; url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch"; sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g"; }) - (fetchpatch { - name = "0005-expose-function-for-getting-the-selected-text.patch"; - url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch"; - sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27"; - }) + # Derived from "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch"; + ./vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch ]; }); diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch new file mode 100644 index 00000000000..8f5c0dab39a --- /dev/null +++ b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch @@ -0,0 +1,61 @@ +From 5ae3acb69474fe5bc43767a4a3625e9ed23607a1 Mon Sep 17 00:00:00 2001 +From: Jelle van der Waa <jelle@vdwaa.nl> +Date: Sat, 13 Feb 2016 22:18:01 +0100 +Subject: [PATCH] expose function for setting cursor position + +--- + src/vte/vteterminal.h | 5 +++++ + src/vtegtk.cc | 24 ++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index a607e5da..9701320d 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -378,6 +378,11 @@ _VTE_PUBLIC + void vte_terminal_get_cursor_position(VteTerminal *terminal, + glong *column, + glong *row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_set_cursor_position(VteTerminal *terminal, ++ glong column, ++ glong row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++ + + _VTE_PUBLIC + char *vte_terminal_hyperlink_check_event(VteTerminal *terminal, +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index b11b780b..bdf36eac 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2415,6 +2415,30 @@ vte_terminal_get_cursor_position(VteTerminal *terminal, + } + } + ++/** ++ * vte_terminal_set_cursor_position ++ * @terminal: a #VteTerminal ++ * @column: the new cursor column ++ * @row: the new cursor row ++ * ++ * Set the location of the cursor. ++ */ ++void ++vte_terminal_set_cursor_position(VteTerminal *terminal, ++ long column, long row) noexcept ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ ++ auto impl = IMPL(terminal); ++ impl->invalidate_cursor_once(FALSE); ++ impl->m_screen->cursor.col = column; ++ impl->m_screen->cursor.row = row; ++ impl->invalidate_cursor_once(FALSE); ++ impl->check_cursor_blink(); ++ impl->queue_cursor_moved(); ++ ++} ++ + /** + * vte_terminal_pty_new_sync: + * @terminal: a #VteTerminal diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch new file mode 100644 index 00000000000..203228dae34 --- /dev/null +++ b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch @@ -0,0 +1,56 @@ +From 742d57ecf15e24f6a5f2133a81b6c70acc8ff03c Mon Sep 17 00:00:00 2001 +From: Jelle van der Waa <jelle@vdwaa.nl> +Date: Sat, 13 Feb 2016 22:25:19 +0100 +Subject: [PATCH] add function for setting the text selections + +--- + src/vte/vteterminal.h | 4 ++++ + src/vtegtk.cc | 20 ++++++++++++++++++++ + 2 files changed, 24 insertions(+) + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index 9701320d..a11b4cb7 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -196,6 +196,10 @@ _VTE_PUBLIC + void vte_terminal_select_all(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); + _VTE_PUBLIC + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row, ++ long end_col, long end_row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++ + + /* By-word selection */ + _VTE_PUBLIC +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index bdf36eac..d9e9f2ed 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2390,6 +2390,26 @@ vte_terminal_unselect_all(VteTerminal *terminal) + IMPL(terminal)->deselect_all(); + } + ++/** ++ * vte_terminal_select_text: ++ * @terminal: a #VteTerminal ++ * @start_col: the starting column for the selection ++ * @start_row: the starting row for the selection ++ * @end_col: the end column for the selection ++ * @end_row: the end row for the selection ++ * ++ * Sets the current selection region. ++ */ ++void ++vte_terminal_select_text(VteTerminal *terminal, ++ long start_col, long start_row, ++ long end_col, long end_row) noexcept ++{ ++ g_return_if_fail (VTE_IS_TERMINAL (terminal)); ++ ++ IMPL(terminal)->select_text(start_col, start_row, end_col, end_row); ++} ++ + /** + * vte_terminal_get_cursor_position: + * @terminal: a #VteTerminal diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch new file mode 100644 index 00000000000..0a2c5272226 --- /dev/null +++ b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch @@ -0,0 +1,29 @@ +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -204,7 +204,9 @@ + _VTE_PUBLIC + void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row, + long end_col, long end_row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); +- ++_VTE_PUBLIC ++char * ++vte_terminal_get_selection(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); + + /* By-word selection */ + _VTE_PUBLIC +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2435,6 +2435,13 @@ + IMPL(terminal)->select_text(start_col, start_row, end_col, end_row); + } + ++char * ++vte_terminal_get_selection(VteTerminal *terminal) noexcept ++{ ++ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); ++ return g_strdup (IMPL(terminal)->m_selection[VTE_SELECTION_PRIMARY]->str); ++} ++ + /** + * vte_terminal_get_cursor_position: + * @terminal: a #VteTerminal diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 109444fc518..d5113ebf8fa 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,29 +1,41 @@ -{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper -, enableDecLocator ? true -}: +{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig +, makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix +, gnused, coreutils, enableDecLocator ? true }: stdenv.mkDerivation rec { - name = "xterm-353"; + pname = "xterm"; + version = "362"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/xterm/${name}.tgz" - "https://invisible-mirror.net/archives/xterm/${name}.tgz" - ]; - sha256 = "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5"; + "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" + "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" + ]; + sha256 = "HU/+Im+o8CGFm7wwB3iP9jpGoxJC2b2ae9fr4k6BrKI="; }; - buildInputs = - [ xorg.libXaw xorg.xorgproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE - ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper - ]; + buildInputs = [ + xorg.libXaw + xorg.xorgproto + xorg.libXt + xorg.libXext + xorg.libX11 + xorg.libSM + xorg.libICE + ncurses + freetype + fontconfig + pkgconfig + xorg.libXft + xorg.luit + makeWrapper + ]; - patches = [ - ./sixel-256.support.patch - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { + patches = [ ./sixel-256.support.patch ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "posix-ptys.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; + url = + "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; }); @@ -62,10 +74,44 @@ stdenv.mkDerivation rec { install -D -t $out/share/icons/hicolor/48x48/apps icons/xterm-color_48x48.xpm ''; + passthru = { + updateScript = let + # Tags that end in letters are unstable + suffixes = stdenv.lib.concatStringsSep " " + (map (c: "-c versionsort.suffix='${c}'") + (stdenv.lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz")); + in writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + git + nixfmt + nix + coreutils + gnused + ] + } + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git ${suffixes} ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:ThomasDickey/xterm-snapshots.git 'xterm-*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^xterm-||g')" + + if [ ! "$oldVersion" = "$latestTag" ]; then + update-source-version ${pname} "$latestTag" --version-key=version --print-changes + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix" + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + meta = { homepage = "https://invisible-island.net/xterm"; license = with stdenv.lib.licenses; [ mit ]; - maintainers = with stdenv.lib.maintainers; [vrthra]; + maintainers = with stdenv.lib.maintainers; [ nequissimus vrthra ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 114e8fe012c..f68a3c7728d 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -198,7 +198,7 @@ let gitstatus = callPackage ./gitstatus { }; gitui = callPackage ./gitui { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security AppKit; }; grv = callPackage ./grv { }; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 4fe805f752c..767e471f8a3 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "17hbgi1jh4p07r4p5mr7w7p01i6zzr28mn5i4jaki7p0jwfqbvvi"; + sha256 = "1lk3lhw598v966c553a3j0bp6vhf03xg7ggv827vzs1s8gnhxshz"; }; - vendorSha256 = "0ybbwbw4vdsxdq4w75s1i0dqad844sfgs69b3vlscwfm6g3i9h51"; + vendorSha256 = "0bkd2ndda6w8pdpvw8hhlb60g8r6gbyymgfb69dvanw5i5shsp5q"; nativeBuildInputs = [ installShellFiles ]; @@ -30,9 +30,8 @@ buildGoModule rec { done ''; - checkPhase = '' - make test - ''; + # fails with `unable to find git executable in PATH` + doCheck = false; meta = with lib; { description = "GitHub CLI tool"; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 44eba8c4b39..7c345639e9f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ''; postInstall = '' - install -D -m 0644 misc/bash_completion/git-bug "$out/etc/bash_completion.d/git-bug" + install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug" install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug" install -D -m 0644 -t "$out/share/man/man1" doc/man/* ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 858383f9664..fa77b5307a3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "3.5"; + version = "3.8"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "09b60jbpdr4czx7h4vqahqmmi7m9vn77jlkpjfhys7crrdnxjp9i"; + sha256 = "1qxv2k8lxcxpqx46ka7f042xk90xns5w9lc4009cxmsqvcdba03a"; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix index dc636571acc..aa53529933f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation { }; installPhase = '' - mkdir -p $out/bin $out/etc/bash_completion.d + mkdir -p $out/bin $out/share/bash-completion/completions install -m 0755 git-stree $out/bin/ - install -m 0644 git-stree-completion.bash $out/etc/bash_completion.d/ + install -m 0644 git-stree-completion.bash $out/share/bash-completion/completions/ ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 49dc7866dbd..b7e4f3e6c48 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -2,7 +2,7 @@ , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 -, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 +, asciidoctor, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xsl_ns, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? true @@ -22,7 +22,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.29.0"; + version = "2.29.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "KEMtmVJXxGJv4PsgkfWI327tmOlXFBnnLIO8Izcua4k="; + sha256 = "1h87yv117ypnc0yi86941089c14n91gixk8b6shj2y35prp47z7j"; }; outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; @@ -65,8 +65,8 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gettext perlPackages.perl ] - ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_45 libxslt ]; + ++ stdenv.lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x + docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] ++ stdenv.lib.optionals perlSupport [ perlPackages.perl ] ++ stdenv.lib.optionals guiSupport [tcl tk] @@ -145,7 +145,7 @@ stdenv.mkDerivation { } # Install git-subtree. - make -C contrib/subtree install ${stdenv.lib.optionalString withManual "install-doc"} + make -C contrib/subtree install ${stdenv.lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} rm -rf contrib/subtree # Install contrib stuff. @@ -153,8 +153,8 @@ stdenv.mkDerivation { cp -a contrib $out/share/git/ mkdir -p $out/share/bash-completion/completions ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git - mkdir -p $out/etc/bash_completion.d - ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/ + mkdir -p $out/share/bash-completion/completions + ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/ # grep is a runtime dependency, need to patch so that it's found substituteInPlace $out/libexec/git-core/git-sh-setup \ @@ -230,7 +230,7 @@ stdenv.mkDerivation { '') + stdenv.lib.optionalString withManual ''# Install man pages and Info manual - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \ + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \ -C Documentation '' + (if guiSupport then '' @@ -249,6 +249,7 @@ stdenv.mkDerivation { '') + stdenv.lib.optionalString stdenv.isDarwin '' # enable git-credential-osxkeychain by default if darwin + mkdir -p $out/etc cat > $out/etc/gitconfig << EOF [credential] helper = osxkeychain diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 6aad5b78fb6..21e382a44bc 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security }: +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security, AppKit }: rustPlatform.buildRustPackage rec { pname = "gitui"; version = "0.10.1"; @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ python3 ]; buildInputs = [ ] ++ stdenv.lib.optional stdenv.isLinux xorg.libxcb - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; meta = with stdenv.lib; { description = "Blazing fast terminal-ui for git written in rust"; homepage = "https://github.com/extrawurst/gitui"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 yanganto ]; + maintainers = with maintainers; [ Br1ght0ne yanganto ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 4a02baa465c..3abfd3a3139 100644 --- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -29,6 +29,6 @@ in crystal.buildCrystalPackage rec { description = "A better one-line git log"; homepage = "https://github.com/taylorthurlow/thicket"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 0da0cfa02b6..9577b56b6c7 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl git ]; postInstall = '' - install -Dm644 README -t"$out/share/doc/${pname}-${version}/" - install -Dm755 contrib/tg-completion.bash -t "$out/etc/bash_completion.d/" + install -Dm644 README -t "$out/share/doc/${pname}-${version}/" + install -Dm755 contrib/tg-completion.bash -t "$out/share/bash-completion/completions/" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 7c86318abac..29c8fac962b 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.12.5"; + version = "1.12.6"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "03p4nn7xklqr43h4d98qvv2xc14ly7mbb90njnxljj64yh7svw4n"; + sha256 = "sha256-mEhtFcWLUhd+WK8wDhrGr6RvL4X2G42W6su/c8zxGR4="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 827d9539dba..8b93bf2176a 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.3.2"; + version = "7.4.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0bw75m87qbnnn1gjphik3xcjx2zwczsa37rpr16la1zjhqjl5m7j"; + sha256 = "0ih0jxdm74vr4dgslhnl3llvi31zin0g2xjw6a4pdji2y2kajkzk"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile b/pkgs/applications/version-management/gitlab-triage/Gemfile new file mode 100644 index 00000000000..7549ada6405 --- /dev/null +++ b/pkgs/applications/version-management/gitlab-triage/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' do + gem 'gitlab-triage' +end diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock new file mode 100644 index 00000000000..adec5b524f3 --- /dev/null +++ b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock @@ -0,0 +1,35 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (5.2.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + concurrent-ruby (1.1.7) + gitlab-triage (1.13.0) + activesupport (~> 5.1) + httparty (~> 0.17) + httparty (0.18.1) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) + i18n (1.8.5) + concurrent-ruby (~> 1.0) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2020.0512) + minitest (5.14.2) + multi_xml (0.6.0) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + +PLATFORMS + ruby + x86_64-linux + +DEPENDENCIES + gitlab-triage! + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/applications/version-management/gitlab-triage/default.nix b/pkgs/applications/version-management/gitlab-triage/default.nix new file mode 100644 index 00000000000..09dfbcbc368 --- /dev/null +++ b/pkgs/applications/version-management/gitlab-triage/default.nix @@ -0,0 +1,14 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "gitlab-triage"; + gemdir = ./.; + exes = [ "gitlab-triage" ]; + + meta = with lib; { + description = "GitLab's issues and merge requests triage, automated!"; + homepage = "https://gitlab.com/gitlab-org/gitlab-triage"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/version-management/gitlab-triage/gemset.nix b/pkgs/applications/version-management/gitlab-triage/gemset.nix new file mode 100644 index 00000000000..1ce8450bba1 --- /dev/null +++ b/pkgs/applications/version-management/gitlab-triage/gemset.nix @@ -0,0 +1,118 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + type = "gem"; + }; + version = "1.1.7"; + }; + gitlab-triage = { + dependencies = ["activesupport" "httparty"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11sas3h3n638gni1mysck1ahyakqnl8gg6g21pc3krs6jrg9qxj9"; + type = "gem"; + }; + version = "1.13.0"; + }; + httparty = { + dependencies = ["mime-types" "multi_xml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17gpnbf2a7xkvsy20jig3ljvx8hl5520rqm9pffj2jrliq1yi3w7"; + type = "gem"; + }; + version = "0.18.1"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + type = "gem"; + }; + version = "1.8.5"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + type = "gem"; + }; + version = "3.2020.0512"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + type = "gem"; + }; + version = "5.14.2"; + }; + multi_xml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; + thread_safe = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 07af9341646..5068dc15f48 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { desktop-file-utils gobject-introspection wrapGAppsHook + gtk3 # for gtk-update-icon-cache ]; buildInputs = [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index c7a1c414987..e0400fd46c6 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,26 +4,24 @@ }: let - inherit (python3Packages) docutils dulwich python; + inherit (python3Packages) docutils python; in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.4.2"; + version = "5.6"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "0ls8nwx3nz26pibphw54fg8pxqb365zmmqx95lqrxqqyf3d972sw"; + sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz"; }; format = "other"; - inherit python; # pass it so that the same version can be used in hg2git + passthru = { inherit python; }; # pass it so that the same version can be used in hg2git buildInputs = [ makeWrapper docutils unzip ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ dulwich ]; - makeFlags = [ "PREFIX=$(out)" ]; postInstall = (stdenv.lib.optionalString guiSupport '' diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index b17e759c657..43890c92039 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,64 +1,44 @@ -{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: - -let - # nettle-sys=1.0.1 requires the des-compat.h header, but it was removed in - # nettle 3.5. See https://nest.pijul.com/pijul_org/pijul/discussions/416 - # Remove with the next release - nettle_34 = nettle.overrideAttrs (_oldAttrs: rec { - version = "3.4.1"; - src = fetchurl { - url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr"; - }; - }); -in rustPlatform.buildRustPackage rec { +{ stdenv +, fetchCrate +, rustPlatform +, pkg-config +, clang +, libclang +, libsodium +, openssl +, xxHash +, zstd +, darwin +, gitImportSupport ? true +, libgit2 ? null +}: + +rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "0.12.0"; + version = "1.0.0-alpha.3"; - src = fetchurl { - url = "https://pijul.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; + src = fetchCrate { + inherit version pname; + sha256 = "0bz38vvzjrplb2mgcypg2p4kq33v6m58yivg15s2ghr7ly9k5ybx"; }; - 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.tar.gz/thrussh/ - patch -p1 < ${./thrussh-build-fix.patch} - substituteInPlace .cargo-checksum.json --replace \ - 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ - a199f2bba520d56e11607b77be4dde0cfae576c90badb9fbd39af4784e8120d1 - popd - ''; - - nativeBuildInputs = [ pkgconfig clang ]; - - postInstall = '' - mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d} - $out/bin/pijul generate-completions --bash > $out/share/bash-completion/completions/pijul - $out/bin/pijul generate-completions --zsh > $out/share/zsh/site-functions/_pijul - $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish - ''; - - LIBCLANG_PATH = libclang + "/lib"; + cargoSha256 = "0p9djvdjzyjzsn3fyw6f74fix39s3y92246cgzcqhc1qlwwz67rl"; - buildInputs = [ openssl libsodium nettle_34 libclang ] ++ stdenv.lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ CoreServices Security ]); + cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; + LIBCLANG_PATH = "${libclang}/lib"; doCheck = false; + nativeBuildInputs = [ pkg-config clang ]; + buildInputs = [ openssl libclang libsodium xxHash zstd ] + ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ]) + ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreServices Security SystemConfiguration + ])); meta = with stdenv.lib; { description = "A distributed version control system"; homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; - maintainers = [ maintainers.gal_bolle ]; + maintainers = with maintainers; [ gal_bolle dywedir ]; }; } diff --git a/pkgs/applications/version-management/pijul/thrussh-build-fix.patch b/pkgs/applications/version-management/pijul/thrussh-build-fix.patch deleted file mode 100644 index 3989639620b..00000000000 --- a/pkgs/applications/version-management/pijul/thrussh-build-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/client/connection.rs 2020-02-04 12:48:43.845299096 +0100 -+++ b/src/client/connection.rs 2020-02-04 12:50:00.140329310 +0100 -@@ -546,8 +546,8 @@ - &[msg::NEWKEYS], - &mut session.0.write_buffer, - ); -- session.0.kex = Some(Kex::NewKeys(newkeys)); - newkeys.sent = true; -+ session.0.kex = Some(Kex::NewKeys(newkeys)); - } - Ok(()) - } diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix new file mode 100644 index 00000000000..89c2eb425ce --- /dev/null +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-chromecast"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "vishen"; + repo = pname; + rev = "v${version}"; + sha256 = "0y1zwy1bxnjz409vdhqwykvfjhrsyy4j503v3rjrrhkcca6vfbyg"; + }; + + vendorSha256 = "04mgm3afgczq0an6ys8bilxv1hgzfwvgjx21fyl82yxd573rsf5r"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; + + meta = with lib; { + homepage = "https://github.com/vishen/go-chromecast"; + description = "CLI for Google Chromecast, Home devices and Cast Groups"; + license = licenses.asl20; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index d3cb12924c2..6f47307f4a6 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,23 +1,33 @@ -{ stdenv, mkDerivation, fetchurl, autoPatchelfHook -, ffmpeg_3, openssl, qtbase, zlib, pkgconfig +{ stdenv +, mkDerivation +, fetchurl +, autoPatchelfHook +, pkg-config +, ffmpeg_3 +, openssl +, qtbase +, zlib + +, withJava ? true +, jre_headless }: let - version = "1.15.2"; + version = "1.15.3"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "1dbips0qllbwhak44c50nlwn8n3kx8i6773cal5zl3dv4v2nf6ql"; + hash = "sha256-Y23aetnwqLGaBIgJ/AP0oCrh8P5jpVrcMJgmc0Oe+i8="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "1wnhzlz5fw6qwh82hjcpimg60xb3a9a54zb6gcjhqr9zdly2zphy"; + hash = "sha256-Qruq9YKAaNF1pDtOhptP95UjFL2NA4EuROR4v6XZHEw="; }; in mkDerivation { pname = "makemkv"; @@ -27,10 +37,17 @@ in mkDerivation { sourceRoot = "makemkv-oss-${version}"; - nativeBuildInputs = [ autoPatchelfHook pkgconfig ]; + nativeBuildInputs = [ autoPatchelfHook pkg-config ]; buildInputs = [ ffmpeg_3 openssl qtbase zlib ]; + qtWrapperArgs = + let + binPath = stdenv.lib.makeBinPath [ jre_headless ]; + in stdenv.lib.optionals withJava [ + ''--prefix PATH : ${binPath}'' + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 690b8355340..a5bd030e470 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,30 +1,30 @@ -{ stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake +{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google # account. You'll need to generate (and please share :-) a new one if it breaks. , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "minitube"; - version = "3.2"; + version = "3.6"; src = fetchFromGitHub { - sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c"; + sha256 = "6IaBPYL/yGWKUHxPe1FnAR1gDHImXYGItYWq7VNjwEU="; rev = version; repo = "minitube"; owner = "flaviotordini"; fetchSubmodules = true; }; - buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ]; - nativeBuildInputs = [ wrapQtAppsHook qmake ]; + buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; + nativeBuildInputs = [ qmake qttools ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Stand-alone YouTube video player"; longDescription = '' Watch YouTube videos in a new way: you type a keyword, Minitube gives diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 0d0fce279bb..cdecde6b869 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -32,6 +32,7 @@ , alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio +, libcef }: let @@ -44,8 +45,9 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; - rev = version; - sha256 = "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj"; + rev = "refs/tags/${version}"; + sha256 = "1bf56z2yb7gq1knqwcqj369c3wl9jr3wll5vlngmfy2gwqrczjmw"; + fetchSubmodules = true; }; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; @@ -55,6 +57,7 @@ in mkDerivation rec { fdk_aac ffmpeg jansson + libcef libjack2 libv4l libxkbcommon @@ -73,6 +76,18 @@ in mkDerivation rec { ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; + # Copied from the obs-linuxbrowser + postUnpack = '' + mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ + for i in ${libcef}/share/cef/*; do + cp -r $i cef/Release/ + cp -r $i cef/Resources/ + done + cp -r ${libcef}/lib/libcef.so cef/Release/ + cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ + cp -r ${libcef}/include cef/ + ''; + # obs attempts to dlopen libobs-opengl, it fails unless we make sure # DL_OPENGL is an explicit path. Not sure if there's a better way # to handle this. @@ -80,6 +95,9 @@ in mkDerivation rec { "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" "-DOBS_VERSION_OVERRIDE=${version}" "-Wno-dev" # kill dev warnings that are useless for packaging + # Add support for browser source + "-DBUILD_BROWSER=ON" + "-DCEF_ROOT_DIR=../../cef" ]; postInstall = '' diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix deleted file mode 100644 index a33383937fb..00000000000 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ /dev/null @@ -1,49 +0,0 @@ -# We don't have a wrapper which can supply obs-studio plugins so you have to -# somewhat manually install this: - -# nix-env -f . -iA obs-linuxbrowser -# mkdir -p ~/.config/obs-studio/plugins -# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/ - -{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef }: - -stdenv.mkDerivation rec { - pname = "obs-linuxbrowser"; - version = "0.6.1-6-gf86dba6"; - - src = fetchFromGitHub { - owner = "bazukas"; - repo = "obs-linuxbrowser"; - rev = version; - sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio ]; - postUnpack = '' - mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ - for i in ${libcef}/share/cef/*; do - ln -s $i cef/Release/ - ln -s $i cef/Resources/ - done - ln -s ${libcef}/lib/libcef.so cef/Release/ - ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ - ln -s ${libcef}/include cef/ - ''; - cmakeFlags = [ - "-DCEF_ROOT_DIR=../../cef" - "-DOBS_INCLUDE_SEARCH_DIR=${obs-studio}/include/obs" - ]; - installPhase = '' - mkdir -p $out/share/obs/obs-plugins - cp -r build/obs-linuxbrowser $out/share/obs/obs-plugins/ - ''; - - meta = with stdenv.lib; { - description = "Browser source plugin for obs-studio based on Chromium Embedded Framework"; - homepage = "https://github.com/bazukas/obs-linuxbrowser"; - maintainers = with maintainers; [ puffnfresh ]; - license = licenses.gpl2; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/video/obs-studio/obs-move-transition.nix b/pkgs/applications/video/obs-studio/obs-move-transition.nix new file mode 100644 index 00000000000..70985b438c6 --- /dev/null +++ b/pkgs/applications/video/obs-studio/obs-move-transition.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, fetchurl +, cmake +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-move-transition"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-move-transition"; + rev = version; + sha256 = "0kr868lxlanq0y98f2hb70y92ac2nla8khsj879kjf3z6dqdpd66"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + cmakeFlags = with lib; [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" + "-Wno-dev" + ]; + + preConfigure = '' + cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake + ''; + + patches = [ ./rename-obs-move-transition-cmake.patch ]; + + postPatch = '' + substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' + substituteInPlace move-value-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' + substituteInPlace move-transition.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' + ''; + + # obs-studio expects the shared object to be located in bin/32bit or bin/64bit + # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 + postInstall = let + pluginPath = { + i686-linux = "bin/32bit"; + x86_64-linux = "bin/64bit"; + }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); + in '' + mkdir -p $out/share/obs/obs-plugins/move-transition/${pluginPath} + ln -s $out/lib/obs-plugins/move-transition.so $out/share/obs/obs-plugins/move-transition/${pluginPath} + ''; + + meta = with lib; { + description = "Plugin for OBS Studio to move source to a new position during scene transition"; + homepage = "https://github.com/exeldro/obs-move-transition"; + maintainers = with maintainers; [ starcraft66 ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch new file mode 100644 index 00000000000..24c1848c10b --- /dev/null +++ b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d116619..a1366ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,17 @@ ++if (POLICY CMP0048) ++ cmake_policy(SET CMP0048 NEW) ++endif (POLICY CMP0048) ++ + project(move-transition VERSION 2.0.2) + set(PROJECT_FULL_NAME "Move Transition") + ++include(FindLibobs.cmake) ++find_package(LibObs REQUIRED) ++ ++include_directories( ++ "${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions" ++ "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api") ++ + set(move-transition_HEADERS + move-transition.h + easing.h) +@@ -34,4 +45,10 @@ target_link_libraries(move-transition + libobs) + + set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro") +-install_obs_plugin_with_data(move-transition data) ++set_target_properties(move-transition PROPERTIES PREFIX "") ++ ++install(TARGETS move-transition ++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins) ++ ++install(DIRECTORY data/locale/ ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/move-transition/locale") diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index cd3176249f8..ede47ad061f 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -1,6 +1,7 @@ { stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch , doxygen, python3Packages, libopenshot -, wrapGAppsHook, gtk3 }: +, wrapGAppsHook, gtk3 +, qtsvg }: mkDerivationWith python3Packages.buildPythonApplication rec { pname = "openshot-qt"; @@ -29,6 +30,12 @@ mkDerivationWith python3Packages.buildPythonApplication rec { postFixup = '' wrapProgram $out/bin/openshot-qt \ + '' + # Fix toolbar icons on Darwin + + stdenv.lib.optionalString stdenv.isDarwin '' + --suffix QT_PLUGIN_PATH : "${stdenv.lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ + '' + + '' "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" ''; @@ -47,6 +54,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ''; license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index d1a368b43ba..b6bb87e6651 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib , libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen +, alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor +, zlib, AGL, Cocoa, Foundation +}: with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +19,12 @@ stdenv.mkDerivation rec { [ pkgconfig cmake doxygen ]; buildInputs = - [ alsaLib libX11 libXft libXrandr libXinerama libXext libXcursor ]; + optionals stdenv.isLinux [ alsaLib ] + ++ (if stdenv.isDarwin then + [ zlib AGL Cocoa Foundation ] + else + [ libX11 libXft libXrandr libXinerama libXext libXcursor ]) + ; doCheck = false; @@ -30,6 +38,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index e24b6ee41f8..1b6084a1d2f 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -3,7 +3,9 @@ , libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 , unittest-cpp, cppzmq, zeromq -, qtbase, qtmultimedia }: +, qtbase, qtmultimedia +, llvmPackages +}: with stdenv.lib; stdenv.mkDerivation rec { @@ -27,7 +29,9 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagick ffmpeg_3 swig python3 unittest-cpp - cppzmq zeromq qtbase qtmultimedia ]; + cppzmq zeromq qtbase qtmultimedia ] + ++ optional stdenv.isDarwin llvmPackages.openmp + ; LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; @@ -46,6 +50,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index ee07a5c7cc8..535913c6f2b 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , fetchurl -, fetchpatch , pkg-config , gettext , itstool @@ -11,6 +10,7 @@ , gst_all_1 , gtk3 , gobject-introspection +, libpeas , librsvg , gnome3 , libnotify @@ -20,40 +20,15 @@ , gsettings-desktop-schemas }: -let - # gst-transcoder was merged with gst-plugins-bad 1.18. - # TODO: switch to that once available. - gst-transcoder = stdenv.mkDerivation rec { - version = "1.14.1"; - pname = "gst-transcoder"; - src = fetchFromGitHub { - owner = "pitivi"; - repo = "gst-transcoder"; - rev = version; - sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f"; - }; - nativeBuildInputs = [ - pkg-config - meson - ninja - gobject-introspection - python3 - ]; - buildInputs = with gst_all_1; [ - gstreamer - gst-plugins-base - ]; - }; - -in python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pitivi"; - version = "0.999"; + version = "2020.09.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb"; + sha256 = "1by52b56s9c3h23n40iccygkazwlhii2gb28zhnj2xz5805j05y2"; }; patches = [ @@ -61,42 +36,6 @@ in python3Packages.buildPythonApplication rec { # and saves them to the generated binary. This would make the build-time # dependencies part of the closure so we remove it. ./prevent-closure-contamination.patch - - # Port from intltool to gettext. - # Needed for the following patches to apply. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/89b1053f2516c594f414c5c67c835471bce44b67.patch"; - sha256 = "8yhArzAtZC+WjHftcSDrstBlT8j6WlGHffU9Nj+ny+c="; - excludes = [ "po/POTFILES.in" ]; - }) - - # Complete switching to gst-transcoder in gst-plugins-bad. - # Otherwise there will likely be conflics. - # TODO: Apply this patch once we are using gst-transcoder from gst-plugins-bad. - # (fetchpatch { - # url = "https://gitlab.gnome.org/GNOME/pitivi/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch"; - # sha256 = "zxJm+E5o+oZ3lW6wYNY/ERo2g4NmCjoY8oV+uScq8j8="; - # }) - - # Generate renderer.so on macOS instead of dylib. - # Needed for the following patch to apply. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/bcacadcafabf8911efb0fddc8d57329237d08cd1.patch"; - sha256 = "2BM5acIwOgdr1L9vhtMMN4trrLuqCg/K6v6ZYtD1Fjw="; - postFetch = '' - sed -i -e "s/1.90.0.1/0.999/g" "$out" - ''; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch"; - sha256 = "6DhqRlxFWFFdLwGoFem+vPt8x7v732KMVjMF9fypMK4="; - postFetch = '' - sed "$out" -i \ - -e "s/1.90.0.1/0.999/g" \ - -e "s/\(-python_dep.*\)/\1\n /" \ - -e "s/-1,9 +1,16/-1,10 +1,17/" - ''; - }) ]; nativeBuildInputs = [ @@ -112,13 +51,13 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 + libpeas librsvg gnome3.gnome-desktop gsound gnome3.adwaita-icon-theme gsettings-desktop-schemas libnotify - gst-transcoder ] ++ (with gst_all_1; [ gstreamer gst-editing-services @@ -127,7 +66,7 @@ in python3Packages.buildPythonApplication rec { gst-plugins-bad gst-plugins-ugly gst-libav - gst-validate + gst-devtools ]); pythonPath = with python3Packages; [ @@ -142,9 +81,6 @@ in python3Packages.buildPythonApplication rec { postPatch = '' patchShebangs ./getenvvar.py - - # fetchpatch does not support renamings - mv data/org.pitivi.Pitivi-mime.xml data/org.pitivi.Pitivi-mime.xml.in ''; # Fixes error diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index d08a4a85242..0530af6f222 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -11,14 +11,14 @@ let depSrcs = import ./deps.nix { inherit fetchurl; }; in mkDerivation rec { pname = "plex-media-player"; - version = "2.55.0.1069"; - vsnHash = "2369bed9"; + version = "2.58.0.1076"; + vsnHash = "38e019da"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "1jq4592sgaia0xy2h7n3vh5i7c84sdh4l64fdc774r4i0bmg66qi"; + sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw="; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; diff --git a/pkgs/applications/video/plex-media-player/deps.nix b/pkgs/applications/video/plex-media-player/deps.nix index 26b57532615..fddbae9375c 100644 --- a/pkgs/applications/video/plex-media-player/deps.nix +++ b/pkgs/applications/video/plex-media-player/deps.nix @@ -1,28 +1,28 @@ { fetchurl }: rec { - webClientBuildId = "180-afec74de50e175"; + webClientBuildId = "183-045db5be50e175"; webClientDesktopBuildId = "4.29.2-e50e175"; - webClientTvBuildId = "4.29.3-afec74d"; + webClientTvBuildId = "4.29.6-045db5b"; webClient = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "0rabrg3lk9vgpswk8npa54hzqf2v8ghqqnysxpwn12wrp1pc2rr9"; + sha256 = "AzHlO7Z8SxQoT6++OphwDDQ47Ombnpaby0mh1YNnSvc="; }; webClientDesktopHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "02b5yq4yc411qlg2dkw5j9lrr3cn2y4d27sin0skf6qza180473g"; + sha256 = "7vUcTuN5ypFFIrBygyutEZu4MYl5WPmFureQl6HvVx8="; }; webClientDesktop = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "0l3xv48kr2rx878a40zrgwif2ga2ikv6fdcbq9pylycnmm41pxmh"; + sha256 = "xWwXhN2N4Pvalxtm5PwZprkcFU6RIiE6fA71d2E6lP4="; }; webClientTvHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "0wq115y2xrgwqrzr43nhkq8ba237z20yfp426ki2kdypsq8fjqka"; + sha256 = "U8u5SOxPpz8HOJKrYXlIHx0X08Flspl67hlzc57g7v8="; }; webClientTv = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "1wax1qslm226l2w53m2fnl849jw349qhg3rjghx7vip5pmb43vw9"; + sha256 = "4Et9d4BO+4UParvsSJglJvb+cnp0oUP3O4MDNnLeP7g="; }; } diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index aa559215fe8..a0d25f2ec1e 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake +{ lib, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , v4l-utils }: @@ -29,7 +29,7 @@ mkDerivation rec { "INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Webcam Capture Software"; longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; homepage = "https://github.com/webcamoid/webcamoid/"; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 058f6fd8ccc..84e0135f665 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -40,6 +40,6 @@ buildGoPackage rec { description = "Minify and secure Docker containers"; homepage = "https://dockersl.im/"; license = licenses.asl20; - maintainers = with maintainers; [ filalex77 marsam mbrgm ]; + maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; }; } diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 4d6f53ceb5d..dad5b43e5b0 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage -, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig +, makeWrapper, installShellFiles, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git @@ -94,7 +94,7 @@ rec { goPackagePath = "github.com/docker/docker-ce"; - nativeBuildInputs = [ pkgconfig go-md2man go libtool removeReferencesTo installShellFiles ]; + nativeBuildInputs = [ pkgconfig go-md2man go libtool installShellFiles ]; buildInputs = [ makeWrapper ] ++ optionals (stdenv.isLinux) [ @@ -184,12 +184,6 @@ rec { installManPage man/*/*.[1-9] ''; - preFixup = '' - find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' + - '' + optionalString (stdenv.isLinux) '' - find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' + - ''; - meta = { homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 9513457d86d..98b95fa2bec 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.22.0"; + version = "0.23.0"; suffix = { x86_64-linux = "x86_64"; @@ -15,13 +15,13 @@ let }; firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "1jl7cmw53fbykcji8a0bkdy82mgpfr8km3ab6iwsrswvahh4srx7"; - aarch64-linux = "15vi6441gr4jy0698ifashgv1ic7iz0kbm7c28m2jd8z08p6bnlz"; + x86_64-linux = "11h6qkq55y1w0mlkfkbnpxxai73rzxkiz07i747m7a9azbrmldp8"; + aarch64-linux = "0zyx7md54w0fhqk1anfyjfdqrkg2mjyy17y9jk17p34yrw8j9y29"; }; jailer-bin = fetchbin "jailer" { - x86_64-linux = "0wir7fi1iqvw02908axfaqzp9q5qyg4yk5jicp8s493iz3vhm9h7"; - aarch64-linux = "1l3yc9j27vxfyn89xmxi1ir635v7l8ikwpw9a30dhh50wa3rm4jy"; + x86_64-linux = "15slr2azqvyqlhvlh7zk1n0rkfq282kj0pllp19r0yl1w8ns1gw5"; + aarch64-linux = "1d92jhd6fb7w7ciz15rcfp8jf74r2503w2fl1b6pznpc8h4qscfd"; }; in diff --git a/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch b/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch new file mode 100644 index 00000000000..fa708b29836 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch @@ -0,0 +1,43 @@ +From 6d19c0cc6c5a9bba308fc29d7c0edc2dc372c41b Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit <pjp@fedoraproject.org> +Date: Wed, 21 Oct 2020 11:35:50 +0530 +Subject: [PATCH] net: remove an assert call in eth_get_gso_type + +eth_get_gso_type() routine returns segmentation offload type based on +L3 protocol type. It calls g_assert_not_reached if L3 protocol is +unknown, making the following return statement unreachable. Remove the +g_assert call, it maybe triggered by a guest user. + +Reported-by: Gaoning Pan <pgn@zju.edu.cn> +Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> +--- + net/eth.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/net/eth.c b/net/eth.c +index 0c1d413ee2..eee77071f9 100644 +--- a/net/eth.c ++++ b/net/eth.c +@@ -16,6 +16,7 @@ + */ + + #include "qemu/osdep.h" ++#include "qemu/log.h" + #include "net/eth.h" + #include "net/checksum.h" + #include "net/tap.h" +@@ -71,9 +72,8 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto) + return VIRTIO_NET_HDR_GSO_TCPV6 | ecn_state; + } + } +- +- /* Unsupported offload */ +- g_assert_not_reached(); ++ qemu_log_mask(LOG_GUEST_ERROR, "%s: probably not GSO frame, " ++ "unknown L3 protocol: 0x%04"PRIx16"\n", __func__, l3_proto); + + return VIRTIO_NET_HDR_GSO_NONE | ecn_state; + } +-- +2.28.0 + diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3c867205799..2bace4f258d 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { ./no-etc-install.patch ./fix-qemu-ga.patch ./9p-ignore-noatime.patch + ./CVE-2020-27617.patch ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index a6d6cf76041..8d04b871e49 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -1,5 +1,4 @@ {stdenv -, removeReferencesTo , lib , fetchurl , utillinux @@ -28,7 +27,7 @@ buildGoPackage rec { goPackagePath = "github.com/sylabs/singularity"; buildInputs = [ gpgme openssl libuuid ]; - nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper cryptsetup ]; + nativeBuildInputs = [ utillinux which makeWrapper cryptsetup ]; propagatedBuildInputs = [ coreutils squashfsTools ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 7ad60405f1b..692b5f01b5c 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocamlPackages, autoreconfHook }: +{ stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }: stdenv.mkDerivation rec { pname = "virt-top"; @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga"; }; + patches = [ + (fetchpatch { + name = "ocaml-libvirt-0.6.1.5-fix.patch"; + url = "http://git.annexia.org/?p=virt-top.git;a=patch;h=24a461715d5bce47f63cb0097606fc336230589f"; + sha256 = "15w7w9iggvlw8m9w8g4h08251wzb3m3zkb58glr7ifsgi3flbn61"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt gettext-stub curses csv xml-light ]; diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index 2a41a3d3c07..367d0214129 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -1,18 +1,30 @@ -{ stdenv, fetchFromGitHub -, libX11, libXft, libXinerama, fontconfig, freetype }: +{ stdenv +, fetchFromGitHub +, libX11 +, libXft +, libXinerama +, fontconfig +, freetype +}: stdenv.mkDerivation rec { pname = "berry"; - version = "0.1.5"; + version = "0.1.7"; src = fetchFromGitHub { owner = "JLErvin"; - repo = "berry"; + repo = pname; rev = version; - sha256 = "1wxbjzpwqb9x7vd7kb095fiqj271rki980dnwcxjxpqlmmrmjzyl"; + sha256 = "sha256-2kFVOE5l1KQvDb5KDL7y0p4M7awJLrxJF871cyc0YZ8="; }; - buildInputs = [ libX11 libXft libXinerama fontconfig freetype ]; + buildInputs =[ + libX11 + libXft + libXinerama + fontconfig + freetype + ]; preBuild = '' makeFlagsArray+=( PREFIX="${placeholder "out"}" diff --git a/pkgs/applications/window-managers/i3/altlayout.nix b/pkgs/applications/window-managers/i3/altlayout.nix new file mode 100644 index 00000000000..973dee3eeed --- /dev/null +++ b/pkgs/applications/window-managers/i3/altlayout.nix @@ -0,0 +1,21 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "i3altlayout"; + version = "0.3"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf"; + }; + + pythonPath = with python3Packages; [ enum-compat i3ipc docopt ]; + + meta = with lib; { + maintainers = with maintainers; [ magnetophon ]; + description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side"; + homepage = "https://github.com/deadc0de6/i3altlayout"; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 3e3065301d9..b86e598a4d0 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "08prc9ip96bxbmkkab0ymma9yisgs5yzymg4gjcvr945bj4q7crb"; + sha256 = "16a9ikknjmhrrlc5r6z2ilkjj5vzyfk4ypwab39mg7vcmd7jzc41"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index e2b3e4a55a4..13c0818101f 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "0xmkhkdpz1bpczrar9y6assdzhd7qxybnkjqs36h099fk9xqmsav"; + sha256 = "03kk3vg0r88317zv8j2bj44wq2fwxi25rv1aasvayrh1i5j6zr10"; }; - cargoSha256 = "06wnx81fhs19pz5qnir6h2v2kmj73y1g354nadcx6650q9pnhdv4"; + cargoSha256 = "0m4sv4chxzk60njixlyja44rpn04apf3bm04fgd3v7abpr169f2s"; buildInputs = [ makeWrapper libX11 libXinerama ]; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index f163715456c..06259774519 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,25 +1,32 @@ -{ stdenv, fetchurl -, pkgconfig, which, autoreconfHook -, rep-gtk, pango, gdk-pixbuf-xlib -, imlib, gettext, texinfo -, libXinerama, libXrandr, libXtst, libICE, libSM +{ stdenv +, fetchurl +, pkg-config +, which +, autoreconfHook +, rep-gtk +, pango +, gdk-pixbuf-xlib +, imlib +, gettext +, texinfo +, libXinerama +, libXrandr +, libXtst +, libICE +, libSM , makeWrapper }: -with stdenv.lib; - stdenv.mkDerivation rec { - pname = "sawfish"; version = "1.12.90"; - sourceName = "sawfish_${version}"; src = fetchurl { - url = "https://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/sawfish/${pname}_${version}.tar.xz"; sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ which rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo libXinerama libXrandr libXtst libICE libSM @@ -31,14 +38,15 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do + for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about \ + $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do wrapProgram $i \ --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \ --set REP_LOAD_PATH "$out/share/sawfish/lisp" done ''; - meta = { + meta = with stdenv.lib; { description = "An extensible, Lisp-based window manager"; longDescription = '' Sawfish is an extensible window manager using a Lisp-based scripting language. @@ -47,7 +55,7 @@ stdenv.mkDerivation rec { All high-level WM functions are implemented in Lisp for future extensibility or redefinition. ''; - homepage = "http://sawfish.wikia.com"; + homepage = "https://sawfish.fandom.com/wiki/Main_Page"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 0af46db0a1c..23dcf68bddf 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0r3b7h778l9i20z3him9i2qsaynpn9y78hzfgv3cqi8fyry2c4f9"; + sha256 = "1xsa3h8zhf29p0mi90baxpr76jkd9pd1gr97ky8cnjbcs4isj9j0"; }; patches = [ @@ -21,12 +21,6 @@ stdenv.mkDerivation rec { ./load-configuration-from-etc.patch ]; - postPatch = '' - substituteInPlace meson.build \ - --replace "v1.5" "1.5" \ - --replace "wlroots_version = ['>=0.11.0', '<0.12.0']" "wlroots_version = ['>=0.11.0', '<0.13.0']" - ''; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix new file mode 100644 index 00000000000..4ec02164401 --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix @@ -0,0 +1,38 @@ +{ stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }: + +stdenv.mkDerivation rec { + pname = "AlsaMixer.app"; + version = "0.2.1"; + + src = dockapps-sources; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXpm libXext alsaLib ]; + + setSourceRoot = '' + export sourceRoot=$(echo */${pname}) + ''; + + dontConfigure = true; + + preInstall = '' + install -d ${placeholder "out"}/bin + ''; + + installPhase = '' + runHook preInstall + install -t ${placeholder "out"}/bin AlsaMixer.app + runHook postInstall + ''; + + postInstall = '' + ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer + ''; + + meta = with stdenv.lib; { + description = "Alsa mixer application for Windowmaker"; + homepage = "https://www.dockapps.net/alsamixerapp"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix deleted file mode 100644 index 4e1256399e7..00000000000 --- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, libX11, libXpm, libXext, alsaLib }: - -stdenv.mkDerivation { - name = "alsamixer.app-0.2.1"; - src = fetchgit { - url = "git://repo.or.cz/dockapps.git"; - rev = "38c74350b02f35824554ce0c4f0f251d71762040"; - sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXpm libXext alsaLib ]; - - postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app"; - - installPhase = '' - mkdir -pv $out/bin; - cp AlsaMixer.app $out/bin/AlsaMixer; - ''; - - meta = { - description = "Alsa mixer application for Windowmaker"; - homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bstrik ]; - }; -} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix new file mode 100644 index 00000000000..8a66fdbd67f --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + + dockapps-sources = pkgs.fetchgit { + url = "https://repo.or.cz/dockapps.git"; + rev = "b2b9d872ee61c9b329e4597c301e4417cbd9c3ea"; + sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w="; + }; + + libdockapp = callPackage ./libdockapp.nix { }; + + AlsaMixer-app = callPackage ./AlsaMixer-app.nix { }; + + wmCalClock = callPackage ./wmCalClock.nix { }; + + wmsm-app = callPackage ./wmsm-app.nix { }; + + wmsystemtray = callPackage ./wmsystemtray.nix { }; +}) diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix b/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix new file mode 100644 index 00000000000..bcdef42a78a --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix @@ -0,0 +1,30 @@ +{ stdenv, dockapps-sources, autoreconfHook, pkg-config +, libX11, libXext, libXpm, mkfontdir, fontutil }: + +stdenv.mkDerivation rec { + pname = "libdockapp"; + version = "0.7.3"; + + src = dockapps-sources; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ]; + + setSourceRoot = '' + export sourceRoot=$(echo */${pname}) + ''; + + # There is a bug on --with-font + configureFlags = [ + "--with-examples=no" + "--with-font=no" + ]; + + meta = with stdenv.lib; { + description = "A library providing a framework for dockapps"; + homepage = "https://www.dockapps.net/libdockapp"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix new file mode 100644 index 00000000000..f8ea781858a --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix @@ -0,0 +1,38 @@ +{ stdenv, dockapps-sources +, libX11, libXpm, libXext }: + +stdenv.mkDerivation rec { + pname = "wmCalClock"; + version = "1.25"; + + src = dockapps-sources; + + buildInputs = [ libX11 libXpm libXext ]; + + setSourceRoot = '' + export sourceRoot=$(echo */${pname}/Src) + ''; + + preBuild = '' + makeFlagsArray+=( + CC="cc" + INCDIR="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include" + LIBDIR="-I${libX11}/lib -I${libXext}/lib -I${libXpm}/lib" + ) + ''; + + preInstall = '' + install -d ${placeholder "out"}/bin + install -d ${placeholder "out"}/man/man1 + ''; + + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "A Calendar clock with antialiased text"; + homepage = "https://www.dockapps.net/wmcalclock"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.bstrik ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix deleted file mode 100644 index 48f4753d674..00000000000 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }: - -stdenv.mkDerivation { - name = "wmCalClock-1.25"; - src = fetchurl { - url = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz"; - sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXpm libXext ]; - - postUnpack = "sourceRoot=\${sourceRoot}/Src"; - - buildPhase='' - make prefix=$out - ''; - - installPhase = '' - mkdir -pv $out/bin - mkdir -pv $out/man/man1 - make DESTDIR=$out install - ''; - - meta = { - description = "Clock for Windowmaker"; - homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bstrik ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix new file mode 100644 index 00000000000..dd25ee2b2fc --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -0,0 +1,43 @@ +{ stdenv, dockapps-sources +, libX11 +, libXpm +, libXext +, libdockapp }: + +stdenv.mkDerivation rec { + pname = "wmsm.app"; + version = "0.2.1"; + + src = dockapps-sources; + + buildInputs = [ libX11 libXpm libXext libdockapp ]; + + setSourceRoot = '' + export sourceRoot=$(echo */${pname}/wmsm) + ''; + + NIX_CFLAGS_COMPILE = "-std=gnu89"; + + postPatch = '' + substituteInPlace Makefile \ + --replace "PREFIX = /usr/X11R6/bin" "" \ + --replace "/usr/bin/install" "install" + ''; + + makeFlags = [ "CC=cc" ]; + + preInstall = '' + runHook preInstall + install -d ${placeholder "out"}/bin + runHook postInstall + ''; + + installFlags = [ "PREFIX=${placeholder "out"}/bin" ]; + + meta = with stdenv.lib; { + description = "System monitor for Windowmaker"; + homepage = "https://www.dockapps.net/wmsmapp"; + license = licenses.gpl2; + maintainers = [ maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix deleted file mode 100644 index ad255414a69..00000000000 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }: - -stdenv.mkDerivation { - name = "wmsm.app-0.2.1"; - src = fetchurl { - url = "http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2"; - sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXpm libXext ]; - - postUnpack = "sourceRoot=\${sourceRoot}/wmsm"; - - NIX_CFLAGS_COMPILE = "-std=gnu89"; - - installPhase = '' - substituteInPlace Makefile --replace "PREFIX = /usr/X11R6/bin" "" --replace "/usr/bin/install" "install" - mkdir -pv $out/bin; - make PREFIX=$out/bin install; - ''; - - meta = { - description = "System monitor for Windowmaker"; - homepage = "http://linux-bsd-unix.strefa.pl"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bstrik ]; - }; -} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index 3e073cd8e91..6ec62af5d36 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -1,20 +1,22 @@ { stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: -stdenv.mkDerivation { - name = "wmsystemtray-1.4"; +stdenv.mkDerivation rec { + pname = "wmsystemtray"; + version = "1.4"; + src = fetchurl { - url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz"; - sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; + url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz"; + sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; - meta = { - description = "Systemtray for Windowmaker"; + meta = with stdenv.lib; { + description = "A system tray for Windowmaker"; homepage = "http://wmsystemtray.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bstrik ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Only; + maintainers = [ maintainers.bstrik ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 7c6041b576e..ffd804eaba0 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/kalj/xmonad-log-applet"; license = licenses.bsd3; + broken = desktopSupport == "gnomeflashback"; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; |