From aa845c31004ea41d2205dbc5c2954437d374d9d2 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sun, 30 May 2021 20:49:25 -0700 Subject: nixos/tests/wine: Init --- nixos/tests/wine.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 nixos/tests/wine.nix diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix new file mode 100644 index 00000000000..29b8c482808 --- /dev/null +++ b/nixos/tests/wine.nix @@ -0,0 +1,14 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "wine"; + meta = with pkgs.lib.maintainers; { maintainers = [ chkno ]; }; + + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.wine ]; }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + greeting = machine.succeed( + 'wine ${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe' + ) + assert 'Hello, world!' in greeting + ''; +}) -- cgit 1.4.1 From 2690ab613b6226bdbb97503cc5754af213114ca5 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sun, 30 May 2021 22:00:17 -0700 Subject: nixos/tests/wine: Test all five wine variants --- nixos/tests/wine.nix | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 29b8c482808..49ee19fe6af 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -1,14 +1,27 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "wine"; - meta = with pkgs.lib.maintainers; { maintainers = [ chkno ]; }; - - machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.wine ]; }; - - testScript = '' - machine.wait_for_unit("multi-user.target") - greeting = machine.succeed( - 'wine ${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe' - ) - assert 'Hello, world!' in greeting - ''; -}) +{ system ? builtins.currentSystem, pkgs ? import ../.. { + inherit system; + config = { }; +}, }: + +let + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; + + makeWineTest = variant: + makeTest { + name = "wine-${variant}"; + meta = with pkgs.lib.maintainers; { maintainers = [ chkno ]; }; + + machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.winePackages."${variant}" ]; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + greeting = machine.succeed( + 'wine ${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe' + ) + assert 'Hello, world!' in greeting + ''; + }; +in pkgs.lib.genAttrs [ "base" "full" "minimal" "staging" "unstable" ] +makeWineTest -- cgit 1.4.1 From a9eecaff54b506ae37207c2dbb46da4dfc68bfd1 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sun, 30 May 2021 23:52:14 -0700 Subject: nixos/tests/wine: Test 32 and 64 bit --- nixos/tests/wine.nix | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 49ee19fe6af..566b9baa67b 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -4,24 +4,36 @@ }, }: let + inherit (pkgs.lib) concatMapStrings listToAttrs; inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; - makeWineTest = variant: - makeTest { - name = "wine-${variant}"; + hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe"; + hello64 = "${pkgs.pkgsCross.mingwW64.hello}/bin/hello.exe"; + + makeWineTest = packageSet: exes: variant: rec { + name = "${packageSet}-${variant}"; + value = makeTest { + inherit name; meta = with pkgs.lib.maintainers; { maintainers = [ chkno ]; }; machine = { pkgs, ... }: { - environment.systemPackages = [ pkgs.winePackages."${variant}" ]; + environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ]; + virtualisation.diskSize = "800"; }; testScript = '' machine.wait_for_unit("multi-user.target") - greeting = machine.succeed( - 'wine ${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe' - ) - assert 'Hello, world!' in greeting + ${concatMapStrings (exe: '' + greeting = machine.succeed( + 'wine ${exe}' + ) + assert 'Hello, world!' in greeting + '') exes} ''; }; -in pkgs.lib.genAttrs [ "base" "full" "minimal" "staging" "unstable" ] -makeWineTest + }; + + variants = [ "base" "full" "minimal" "staging" "unstable" ]; + +in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants + ++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) -- cgit 1.4.1 From e83531aa220c5343f5c3e909a79d5fb9a5d881e0 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Mon, 31 May 2021 08:17:08 -0700 Subject: wine: gecko 2.47.1 -> 2.47.2 Wine uses gecko 2.47.2 since wine commit 70567d9f2d32fa3f052609051e9913344f24c42a, which is wine versions 6.0 up through current (6.9) Add a test verifying that the "Can't find Gecko" error message does not appear. A positive test of HTML rendering would be better (eg: would be robust against changes in the error message string), but this test is easy to set up & much better than nothing. --- nixos/tests/wine.nix | 5 ++++- pkgs/misc/emulators/wine/sources.nix | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 566b9baa67b..30d417ce9fa 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -25,9 +25,12 @@ let machine.wait_for_unit("multi-user.target") ${concatMapStrings (exe: '' greeting = machine.succeed( - 'wine ${exe}' + "bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'" ) assert 'Hello, world!' in greeting + machine.fail( + "fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr" + ) '') exes} ''; }; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 6103472a7cc..abaa16d2d13 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -19,14 +19,14 @@ in rec { ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { - version = "2.47.1"; + version = "2.47.2"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - sha256 = "0ld03pjm65xkpgqkvfsmk6h9krjsqbgxw4b8rvl2fj20j8l0w2zh"; + sha256 = "07d6nrk2g0614kvwdjym1wq21d2bwy3pscwikk80qhnd6rrww875"; }; gecko64 = fetchurl rec { - version = "2.47.1"; + version = "2.47.2"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - sha256 = "0jj7azmpy07319238g52a8m4nkdwj9g010i355ykxnl8m5wjwcb9"; + sha256 = "0iffhvdawc499nbn4k99k33cr7g8sdfcvq8k3z1g6gw24h87d5h5"; }; ## see http://wiki.winehq.org/Mono -- cgit 1.4.1 From 7fa7c823ec6577cba8bdae6ec052b4eabe545b76 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Sep 2021 07:39:40 +0000 Subject: klipper: unstable-2021-09-03 -> unstable-2021-09-21 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index f8d49770370..75d08caf3a2 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2021-09-03"; + version = "unstable-2021-09-21"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "c84956befe88daeeb9512acaa9fa82395665df16"; - sha256 = "sha256-dHFIeA2RCoqC0ROYUUbSoLZ4frRWBJaNJWohpK8xN7I="; + rev = "0b918b357cb0c282d53cbdf59e1931a2054cd60a"; + sha256 = "sha256-vUhP71vZ5XFG7MDkPFpAcCUL4kIdzHJ1hAkwqIi6ksQ="; }; # We have no LTO on i686 since commit 22284b0 -- cgit 1.4.1 From c33e3917126e8237a9b7a1894ad8b081383db621 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Wed, 20 Oct 2021 22:35:34 +0700 Subject: CuboCore.packages: added --- pkgs/applications/graphics/coreimage/default.nix | 31 ------- pkgs/applications/misc/coreaction/default.nix | 41 ---------- pkgs/applications/misc/corefm/default.nix | 32 -------- pkgs/applications/misc/coregarage/default.nix | 33 -------- pkgs/applications/misc/corehunt/default.nix | 31 ------- .../misc/coretoppings/0001-fix-install-phase.patch | 8 -- pkgs/applications/misc/coretoppings/default.nix | 62 -------------- .../misc/cubocore-packages/coreaction/default.nix | 41 ++++++++++ .../cubocore-packages/corearchiver/default.nix | 34 ++++++++ .../misc/cubocore-packages/corefm/default.nix | 32 ++++++++ .../misc/cubocore-packages/coregarage/default.nix | 34 ++++++++ .../misc/cubocore-packages/corehunt/default.nix | 32 ++++++++ .../misc/cubocore-packages/coreimage/default.nix | 32 ++++++++ .../misc/cubocore-packages/coreinfo/default.nix | 35 ++++++++ .../cubocore-packages/corekeyboard/default.nix | 35 ++++++++ .../misc/cubocore-packages/corepad/default.nix | 32 ++++++++ .../misc/cubocore-packages/corepaint/default.nix | 32 ++++++++ .../misc/cubocore-packages/corepdf/default.nix | 33 ++++++++ .../misc/cubocore-packages/corepins/default.nix | 32 ++++++++ .../misc/cubocore-packages/corerenamer/default.nix | 32 ++++++++ .../misc/cubocore-packages/coreshot/default.nix | 33 ++++++++ .../misc/cubocore-packages/corestats/default.nix | 33 ++++++++ .../misc/cubocore-packages/corestuff/default.nix | 35 ++++++++ .../cubocore-packages/coreterminal/default.nix | 44 ++++++++++ .../misc/cubocore-packages/coretime/default.nix | 33 ++++++++ .../coretoppings/0001-fix-install-phase.patch | 8 ++ .../cubocore-packages/coretoppings/default.nix | 87 ++++++++++++++++++++ .../cubocore-packages/coreuniverse/default.nix | 32 ++++++++ .../libcprime/0001-fix-application-dirs.patch | 29 +++++++ .../misc/cubocore-packages/libcprime/default.nix | 44 ++++++++++ .../misc/cubocore-packages/libcsys/default.nix | 31 +++++++ .../terminal-emulators/coreterminal/default.nix | 42 ---------- .../libcprime/0001-fix-application-dirs.patch | 29 ------- pkgs/development/libraries/libcprime/default.nix | 42 ---------- pkgs/development/libraries/libcsys/default.nix | 31 ------- pkgs/tools/archivers/corearchiver/default.nix | 33 -------- pkgs/tools/misc/coreshot/default.nix | 32 -------- pkgs/top-level/all-packages.nix | 31 ++----- pkgs/top-level/cubocore-packages.nix | 94 ++++++++++++++++++++++ 39 files changed, 946 insertions(+), 471 deletions(-) delete mode 100644 pkgs/applications/graphics/coreimage/default.nix delete mode 100644 pkgs/applications/misc/coreaction/default.nix delete mode 100644 pkgs/applications/misc/corefm/default.nix delete mode 100644 pkgs/applications/misc/coregarage/default.nix delete mode 100644 pkgs/applications/misc/corehunt/default.nix delete mode 100644 pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch delete mode 100644 pkgs/applications/misc/coretoppings/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/coreaction/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corearchiver/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corefm/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/coregarage/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corehunt/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/coreimage/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/coreinfo/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corepad/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corepaint/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corepdf/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corepins/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corerenamer/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/coreshot/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corestats/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/corestuff/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/coreterminal/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/coretime/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch create mode 100644 pkgs/applications/misc/cubocore-packages/coretoppings/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch create mode 100644 pkgs/applications/misc/cubocore-packages/libcprime/default.nix create mode 100644 pkgs/applications/misc/cubocore-packages/libcsys/default.nix delete mode 100644 pkgs/applications/terminal-emulators/coreterminal/default.nix delete mode 100644 pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch delete mode 100644 pkgs/development/libraries/libcprime/default.nix delete mode 100644 pkgs/development/libraries/libcsys/default.nix delete mode 100644 pkgs/tools/archivers/corearchiver/default.nix delete mode 100644 pkgs/tools/misc/coreshot/default.nix create mode 100644 pkgs/top-level/cubocore-packages.nix diff --git a/pkgs/applications/graphics/coreimage/default.nix b/pkgs/applications/graphics/coreimage/default.nix deleted file mode 100644 index 1dcff1f6e8f..00000000000 --- a/pkgs/applications/graphics/coreimage/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, libcprime, qtbase, cmake, ninja }: - -mkDerivation rec { - pname = "coreimage"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-dxRHzSG5ea1MhpTjgZbFztV9mElEaeOK4NsmieSgf5Q"; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - libcprime - ]; - - meta = with lib; { - description = "An image viewer from the C Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/coreimage"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/coreaction/default.nix b/pkgs/applications/misc/coreaction/default.nix deleted file mode 100644 index be9d02bf339..00000000000 --- a/pkgs/applications/misc/coreaction/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }: - -mkDerivation rec { - pname = "coreaction"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-5qEZNLvbgLoAOXij0wXoVw2iyvytsYZikSJDm6F6ddc="; - }; - - patches = [ - ## Fix Plugin Error: "The shared library was not found." "libbatery.so" - (fetchpatch { - url = "https://gitlab.com/cubocore/coreapps/coreaction/-/commit/1d1307363614a117978723eaad2332e6e8c05b28.patch"; - sha256 = "039x19rsm23l9vxd5mnbl6gvc3is0igahf47kv54v6apz2q72l3f"; - }) - ]; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtsvg - qtbase - libcsys - libcprime - ]; - - meta = with lib; { - description = "A side bar for showing widgets from the C Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/coreaction"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/corefm/default.nix b/pkgs/applications/misc/corefm/default.nix deleted file mode 100644 index 9ad99e3aa06..00000000000 --- a/pkgs/applications/misc/corefm/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, libcsys, cmake, ninja }: - -mkDerivation rec { - pname = "corefm"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-PczKIKY9uCD+cAzAC6Gkb+g+cn9KKCQYd3epoZK8bvA="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - libcprime - libcsys - ]; - - meta = with lib; { - description = "A lightwight filemanager from the C Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/corefm"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/coregarage/default.nix b/pkgs/applications/misc/coregarage/default.nix deleted file mode 100644 index 6d665479764..00000000000 --- a/pkgs/applications/misc/coregarage/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }: - -mkDerivation rec { - pname = "coregarage"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-2pOQwSj+QKwpHVJp7VCyq6QpVW5wLUf/BE7ReXrJ78s="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - libcprime - libarchive - libarchive-qt - ]; - - meta = with lib; { - description = "A settings manager for the C Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/coregarage"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/corehunt/default.nix b/pkgs/applications/misc/corehunt/default.nix deleted file mode 100644 index ad1fabb2504..00000000000 --- a/pkgs/applications/misc/corehunt/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, cmake, ninja }: - -mkDerivation rec { - pname = "corehunt"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-KnIqLI8MtLirFycW2YNHAjS7EDfU3dpqb6vVq9Tl6Ow="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - libcprime - ]; - - meta = with lib; { - description = "A file finder utility from the C Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/corehunt"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch deleted file mode 100644 index 8a8b0ae4010..00000000000 --- a/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/corepkit/CMakeLists.txt -+++ b/corepkit/Cmakelists.txt -@@ -32,4 +32,4 @@ - target_link_libraries( corepkit Qt5::Core ) - - install( TARGETS corepkit DESTINATION libexec/coreapps/ ) --install( FILES org.cubocore.coreapps.policy DESTINATION /usr/share/polkit-1/actions/ ) -+install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) diff --git a/pkgs/applications/misc/coretoppings/default.nix b/pkgs/applications/misc/coretoppings/default.nix deleted file mode 100644 index eff253ffcc2..00000000000 --- a/pkgs/applications/misc/coretoppings/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, libcprime, cmake, ninja -, ffmpeg, qtbase, qtx11extras, qtconnectivity, v4l-utils, grim, wf-recorder -, libdbusmenu, playerctl, xorg, iio-sensor-proxy, inotify-tools -, bluez, networkmanager, connman, redshift, gawk -, polkit, libnotify, systemd, xdg-utils }: - -mkDerivation rec { - pname = "coretoppings"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-DpmzGqjW1swLirRLzd5nblAb40LHAmf8nL+VykQNL3E="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - patches = [ - # Fix file cannot create directory: /var/empty/share/polkit-1/actions - ./0001-fix-install-phase.patch - ]; - - buildInputs = [ - qtbase - qtx11extras - qtconnectivity - libdbusmenu - libcprime - ffmpeg - v4l-utils - grim - wf-recorder - playerctl - xorg.xrandr - xorg.xinput - xorg.libXdamage - iio-sensor-proxy - inotify-tools - bluez - networkmanager - connman - redshift - gawk - polkit - libnotify - systemd - xdg-utils - ]; - - meta = with lib; { - description = "Additional features,plugins etc for CuboCore Application Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/coretoppings"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix new file mode 100644 index 00000000000..f17730cc7e9 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -0,0 +1,41 @@ +{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreaction"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5qEZNLvbgLoAOXij0wXoVw2iyvytsYZikSJDm6F6ddc="; + }; + + patches = [ + ## Fix Plugin Error: "The shared library was not found." "libbatery.so" + (fetchpatch { + url = "https://gitlab.com/cubocore/coreapps/coreaction/-/commit/1d1307363614a117978723eaad2332e6e8c05b28.patch"; + sha256 = "039x19rsm23l9vxd5mnbl6gvc3is0igahf47kv54v6apz2q72l3f"; + }) + ]; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtsvg + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A side bar for showing widgets from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreaction"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix new file mode 100644 index 00000000000..56a05bc434e --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -0,0 +1,34 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corearchiver"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FJGsQp1lbsrvlzKPiTv/FC9RH2+JRwwIvkLDTFW8t5s="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libarchive-qt + libarchive + libcprime + libcsys + ]; + + meta = with lib; { + description = "Archiver from the C Suite to create and extract archives"; + homepage = "https://gitlab.com/cubocore/coreapps/corearchiver"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix new file mode 100644 index 00000000000..3ec918db7af --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corefm"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PczKIKY9uCD+cAzAC6Gkb+g+cn9KKCQYd3epoZK8bvA="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A lightwight filemanager from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corefm"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix new file mode 100644 index 00000000000..719047c8de7 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -0,0 +1,34 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coregarage"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2pOQwSj+QKwpHVJp7VCyq6QpVW5wLUf/BE7ReXrJ78s="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libarchive + libarchive-qt + libcprime + libcsys + ]; + + meta = with lib; { + description = "A settings manager for the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coregarage"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix new file mode 100644 index 00000000000..fb9bcd5e8ef --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corehunt"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-KnIqLI8MtLirFycW2YNHAjS7EDfU3dpqb6vVq9Tl6Ow="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A file finder utility from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corehunt"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix new file mode 100644 index 00000000000..224c946d117 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreimage"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dxRHzSG5ea1MhpTjgZbFztV9mElEaeOK4NsmieSgf5Q"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "An image viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreimage"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix new file mode 100644 index 00000000000..d8df86abd87 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libzen, libmediainfo, zlib, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreinfo"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kLBOvvulHE1+4TyZVEVZwEA+Id7+w8fI3ll+QL2ukr0="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libzen + libmediainfo + zlib + libcprime + libcsys + ]; + + meta = with lib; { + description = "A file information tool from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreinfo"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix new file mode 100644 index 00000000000..3d4e6ddc301 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, xorg, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corekeyboard"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0CbQ43BN4ORvtxs6FwNkgk/0jcVdFJq/tqvjUGYanM4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + xorg.libXtst + xorg.libX11 + libcprime + libcsys + ]; + + meta = with lib; { + description = "A virtual keyboard for X11 from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix new file mode 100644 index 00000000000..fcd1bfa4a4f --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepad"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2bGHVv0+0NlkIqnvWm014Kr20uARWnOS5xSuNmCt/bQ="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A document editor from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepad"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix new file mode 100644 index 00000000000..6410da3ba60 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepaint"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nATraYm7FZEXoNWgXt1G86KdrAvRgM358F+YdfWcnkg="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A paint app from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepaint"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix new file mode 100644 index 00000000000..bb93391c2af --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, poppler, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepdf"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HeOklgCwJ5h3DeelJOZqasG+eC9DGG3R0Cqg2yPKYhM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + poppler + libcprime + libcsys + ]; + + meta = with lib; { + description = "A PDF viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepdf"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix new file mode 100644 index 00000000000..80d3a096ffe --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepins"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-H/l/MHHrTmkfznVKUHFAhim8b/arT5SNK5fxTvjsTE4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A bookmarking app from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepins"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix new file mode 100644 index 00000000000..f92d532ba4a --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corerenamer"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OI7M7vV0CA42J5cWCqgGKEzUUHSgIJCWRTXmKRD6Jb0="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A batch file renamer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corerenamer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix new file mode 100644 index 00000000000..bf9f5e49aea --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreshot"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HKgGeuM3CKGXwnFwSw6a0AB0klZKY5YS9C4q2UT6TN8="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + libcprime + libcsys + ]; + + meta = with lib; { + description = "A screen capture utility from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreshot"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix new file mode 100644 index 00000000000..a6d71eaa6cb --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, lm_sensors, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corestats"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/WBetvbd8e4v+j6e2xbGtSLwNMdLlaahSIks6r889B4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + lm_sensors + libcprime + libcsys + ]; + + meta = with lib; { + description = "A system resource viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corestats"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix new file mode 100644 index 00000000000..57216f4710d --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, kglobalaccel, xorg, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corestuff"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/mmCIHZXn/Jpjr37neI6owWuU1VO6o7wmRj6ZH8tUbo="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + kglobalaccel + xorg.libXcomposite + libcprime + libcsys + ]; + + meta = with lib; { + description = "An activity viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corestuff"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix new file mode 100644 index 00000000000..c2085686aab --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, qtbase +, qtserialport +, qtermwidget +, cmake +, ninja +, libcprime +, libcsys +}: + +mkDerivation rec { + pname = "coreterminal"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YXs6VTem3AaK4n1DYwKP/jqNuf09Srn2THHyJJnArlc="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtserialport + qtermwidget + libcprime + libcsys + ]; + + meta = with lib; { + description = "A terminal emulator from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreterminal"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix new file mode 100644 index 00000000000..af33d474e35 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtmultimedia, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coretime"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-b7oqHhsuHsy96IAXPUtw+WqneEHgn/nUDgHiJt2aXXM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtmultimedia + libcprime + libcsys + ]; + + meta = with lib; { + description = "A time related task manager from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coretime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch new file mode 100644 index 00000000000..8a8b0ae4010 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch @@ -0,0 +1,8 @@ +--- a/corepkit/CMakeLists.txt ++++ b/corepkit/Cmakelists.txt +@@ -32,4 +32,4 @@ + target_link_libraries( corepkit Qt5::Core ) + + install( TARGETS corepkit DESTINATION libexec/coreapps/ ) +-install( FILES org.cubocore.coreapps.policy DESTINATION /usr/share/polkit-1/actions/ ) ++install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix new file mode 100644 index 00000000000..154f4a38994 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -0,0 +1,87 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, ffmpeg +, cmake +, ninja +, qtbase +, qtx11extras +, qtconnectivity +, v4l-utils +, grim +, wf-recorder +, libdbusmenu +, playerctl +, xorg +, iio-sensor-proxy +, inotify-tools +, bluez +, networkmanager +, connman +, redshift +, gawk +, polkit +, libnotify +, systemd +, xdg-utils +, libcprime +, libcsys +}: + +mkDerivation rec { + pname = "coretoppings"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-DpmzGqjW1swLirRLzd5nblAb40LHAmf8nL+VykQNL3E="; + }; + + patches = [ + # Fix file cannot create directory: /var/empty/share/polkit-1/actions + ./0001-fix-install-phase.patch + ]; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + qtconnectivity + libdbusmenu + ffmpeg + v4l-utils + grim + wf-recorder + playerctl + xorg.xrandr + xorg.xinput + xorg.libXdamage + iio-sensor-proxy + inotify-tools + bluez + networkmanager + connman + redshift + gawk + polkit + libnotify + systemd + xdg-utils + libcprime + libcsys + ]; + + meta = with lib; { + description = "Additional features,plugins etc for CuboCore Application Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coretoppings"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix new file mode 100644 index 00000000000..0a6ccaf7214 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreuniverse"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YZCMyYMAvd/xQYNUnURIvmQwaM+X+Ql93OS4ZIyAZLY="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "Shows information about apps from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch new file mode 100644 index 00000000000..b454abb188b --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch @@ -0,0 +1,29 @@ +From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= +Date: Wed, 28 Jul 2021 02:26:39 +0300 +Subject: [PATCH] fix application dirs + +--- + cprime/systemxdg.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp +index f9eee66..ea0553d 100644 +--- a/cprime/systemxdg.cpp ++++ b/cprime/systemxdg.cpp +@@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety + SystemXdgMime::SystemXdgMime() { + + appsDirs << QDir::home().filePath( ".local/share/applications/" ); +- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; +- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; ++ appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" ); ++ appsDirs << "/run/current-system/sw/share/applications/"; ++ appsDirs << "/run/current-system/sw/share/applications/kde4/"; ++ appsDirs << "/run/current-system/sw/share/gnome/applications/"; + }; + + DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) { +-- +2.32.0 + diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix new file mode 100644 index 00000000000..00e297bf276 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, libnotify +, cmake +, ninja +, qtbase +, qtconnectivity +}: + +mkDerivation rec { + pname = "libcprime"; + version = "4.2.2"; + + src = fetchFromGitLab { + owner = "cubocore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; + }; + + patches = [ + ./0001-fix-application-dirs.patch + ]; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtconnectivity + libnotify + ]; + + meta = with lib; { + description = "A library for bookmarking, saving recent activites, managing settings of C-Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix new file mode 100644 index 00000000000..d1dde9942e9 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja }: + +mkDerivation rec { + pname = "libcsys"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9LH95uJJIn4FHfnikGi5UCI6nUNW+1cSZnJ/KpZDI5Y="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + udisks2 + ]; + + meta = with lib; { + description = "Library for managing drive and getting system resource information in real time"; + homepage = "https://gitlab.com/cubocore/libcsys"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/coreterminal/default.nix b/pkgs/applications/terminal-emulators/coreterminal/default.nix deleted file mode 100644 index e358fae0716..00000000000 --- a/pkgs/applications/terminal-emulators/coreterminal/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ mkDerivation -, lib -, fetchFromGitLab -, cmake -, ninja -, qtbase -, qtserialport -, qtermwidget -, libcprime -}: - -mkDerivation rec { - pname = "coreterminal"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-YXs6VTem3AaK4n1DYwKP/jqNuf09Srn2THHyJJnArlc="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - qtserialport - qtermwidget - libcprime - ]; - - meta = with lib; { - description = "A terminal emulator from the C Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/coreterminal"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch b/pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch deleted file mode 100644 index b454abb188b..00000000000 --- a/pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= -Date: Wed, 28 Jul 2021 02:26:39 +0300 -Subject: [PATCH] fix application dirs - ---- - cprime/systemxdg.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp -index f9eee66..ea0553d 100644 ---- a/cprime/systemxdg.cpp -+++ b/cprime/systemxdg.cpp -@@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety - SystemXdgMime::SystemXdgMime() { - - appsDirs << QDir::home().filePath( ".local/share/applications/" ); -- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; -- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; -+ appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" ); -+ appsDirs << "/run/current-system/sw/share/applications/"; -+ appsDirs << "/run/current-system/sw/share/applications/kde4/"; -+ appsDirs << "/run/current-system/sw/share/gnome/applications/"; - }; - - DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) { --- -2.32.0 - diff --git a/pkgs/development/libraries/libcprime/default.nix b/pkgs/development/libraries/libcprime/default.nix deleted file mode 100644 index d312c832243..00000000000 --- a/pkgs/development/libraries/libcprime/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ mkDerivation -, lib -, fetchFromGitLab -, libnotify -, cmake -, ninja -, qtbase -, qtconnectivity -}: - -mkDerivation rec { - pname = "libcprime"; - version = "4.2.2"; - - src = fetchFromGitLab { - owner = "cubocore"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; - }; - - patches = [ ./0001-fix-application-dirs.patch ]; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - qtconnectivity - libnotify - ]; - - meta = with lib; { - description = "A library for bookmarking, saving recent activites, managing settings of C-Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libcsys/default.nix b/pkgs/development/libraries/libcsys/default.nix deleted file mode 100644 index cec6e501bb5..00000000000 --- a/pkgs/development/libraries/libcsys/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja, }: - -mkDerivation rec { - pname = "libcsys"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-9LH95uJJIn4FHfnikGi5UCI6nUNW+1cSZnJ/KpZDI5Y="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - udisks2 - ]; - - meta = with lib; { - description = "Library for managing drive and getting system resource information in real time"; - homepage = "https://gitlab.com/cubocore/libcsys"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/archivers/corearchiver/default.nix b/pkgs/tools/archivers/corearchiver/default.nix deleted file mode 100644 index 217520dde99..00000000000 --- a/pkgs/tools/archivers/corearchiver/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja, }: - -mkDerivation rec { - pname = "corearchiver"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-FJGsQp1lbsrvlzKPiTv/FC9RH2+JRwwIvkLDTFW8t5s="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - libcprime - libarchive-qt - libarchive - ]; - - meta = with lib; { - description = "Archiver from the C Suite to create and extract archives"; - homepage = "https://gitlab.com/cubocore/coreapps/corearchiver"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/coreshot/default.nix b/pkgs/tools/misc/coreshot/default.nix deleted file mode 100644 index bb2404b1ed5..00000000000 --- a/pkgs/tools/misc/coreshot/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, libcprime, cmake, ninja }: - -mkDerivation rec { - pname = "coreshot"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-HKgGeuM3CKGXwnFwSw6a0AB0klZKY5YS9C4q2UT6TN8="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - qtx11extras - libcprime - ]; - - meta = with lib; { - description = "A screen capture utility from the C Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/coreshot"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff0b603190e..52fc9b1286a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -997,10 +997,6 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - coreterminal = libsForQt5.callPackage ../applications/terminal-emulators/coreterminal { - inherit (lxqt) qtermwidget; - }; - ctx = callPackage ../applications/terminal-emulators/ctx { }; darktile = callPackage ../applications/terminal-emulators/darktile { }; @@ -1504,8 +1500,6 @@ with pkgs; codeql = callPackage ../development/tools/analysis/codeql { }; - corearchiver = libsForQt5.callPackage ../tools/archivers/corearchiver { }; - container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; @@ -4102,16 +4096,8 @@ with pkgs; qtbase = qt5.qtbase; }; - coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; - - coreshot = libsForQt5.callPackage ../tools/misc/coreshot { }; - c14 = callPackage ../applications/networking/c14 { }; - corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; - - coretoppings = libsForQt5.callPackage ../applications/misc/coretoppings { }; - certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; @@ -6704,10 +6690,6 @@ with pkgs; libscrypt = callPackage ../development/libraries/libscrypt { }; - libcsys = libsForQt5.callPackage ../development/libraries/libcsys { }; - - libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; - libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { @@ -13206,6 +13188,13 @@ with pkgs; ### END OF LUA + ### CuboCore + CuboCore = recurseIntoAttrs (import ./cubocore-packages.nix { + inherit newScope lxqt lib libsForQt5; + }); + + ### End of CuboCore + lush2 = callPackage ../development/interpreters/lush {}; maude = callPackage ../development/interpreters/maude { @@ -23707,8 +23696,6 @@ with pkgs; cheesecutter = callPackage ../applications/audio/cheesecutter { }; - corefm = libsForQt5.callPackage ../applications/misc/corefm { }; - milkytracker = callPackage ../applications/audio/milkytracker { }; ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; @@ -24053,8 +24040,6 @@ with pkgs; copyq = libsForQt5.callPackage ../applications/misc/copyq { }; - coreaction = libsForQt5.callPackage ../applications/misc/coreaction { }; - corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; coriander = callPackage ../applications/video/coriander { @@ -24065,8 +24050,6 @@ with pkgs; ffmpeg = ffmpeg-full; }; - coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { }; - csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { }; diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix new file mode 100644 index 00000000000..3c6ed65e928 --- /dev/null +++ b/pkgs/top-level/cubocore-packages.nix @@ -0,0 +1,94 @@ +{ newScope, lxqt, lib, libsForQt5 }: + +let + packages = self: with self; { + + # Libs + libcprime = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcprime { }; + + libcsys = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcsys { }; + + # Apps + coreaction = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreaction { + inherit libcprime libcsys; + }; + + corearchiver = libsForQt5.callPackage ../applications/misc/cubocore-packages/corearchiver { + inherit libcprime libcsys; + }; + + corefm = libsForQt5.callPackage ../applications/misc/cubocore-packages/corefm { + inherit libcprime libcsys; + }; + + coregarage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coregarage { + inherit libcprime libcsys; + }; + + corehunt = libsForQt5.callPackage ../applications/misc/cubocore-packages/corehunt { + inherit libcprime libcsys; + }; + + coreimage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreimage { + inherit libcprime libcsys; + }; + + coreinfo = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreinfo { + inherit libcprime libcsys; + }; + + corekeyboard = libsForQt5.callPackage ../applications/misc/cubocore-packages/corekeyboard { + inherit libcprime libcsys; + }; + + corepad = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepad { + inherit libcprime libcsys; + }; + + corepaint = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepaint { + inherit libcprime libcsys; + }; + + corepdf = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepdf { + inherit libcprime libcsys; + }; + + corepins = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepins { + inherit libcprime libcsys; + }; + + corerenamer = libsForQt5.callPackage ../applications/misc/cubocore-packages/corerenamer { + inherit libcprime libcsys; + }; + + coreshot = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreshot { + inherit libcprime libcsys; + }; + + corestats = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestats { + inherit libcprime libcsys; + }; + + corestuff = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestuff { + inherit libcprime libcsys; + }; + + coreterminal = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreterminal { + inherit (lxqt) qtermwidget; + inherit libcprime libcsys; + }; + + coretime = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretime { + inherit libcprime libcsys; + }; + + coretoppings = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretoppings { + inherit libcprime libcsys; + }; + + coreuniverse = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreuniverse { + inherit libcprime libcsys; + }; + }; +in +lib.makeScope newScope packages -- cgit 1.4.1 From 02bce71cab92f5d95734599d65837cb2fbcfa373 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 25 Oct 2021 00:53:12 +0200 Subject: mtrace: init at 2.33-50 `mtrace(1)` is a small Perl script that interprets and provides human-readable output for `malloc(3)` traces. Even though this is actually part of `glibc` itself I decided to place this into its own package. The main reason for this is that this script has a runtime dependency on Perl which would complicate `stdenv` bootstrapping since we'd have to compile another Perl that doesn't depend on the bootstrap tools that is used as runtime dependency for the stage2 glibc. Since this is only a dev/debugging tool, splitting this up seemed like a reasonable choice to me. On a leaking C program, this can be used like this: $ env MALLOC_TRACE=$(pwd)/trace ./a.out $ ./result/bin/mtrace ./trace Memory not freed: ----------------- Address Size Caller 0x0000000001875690 0x4 at 0x401151 Closes #141924 --- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/glibc/mtrace.nix | 38 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/glibc/mtrace.nix diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index a715ba752ec..580f989c53c 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation ({ BASH_SHELL = "/bin/sh"; # Used by libgcc, elf-header, and others to determine ABI - passthru = { inherit version; }; + passthru = { inherit version; minorRelease = version; }; } // (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // diff --git a/pkgs/development/libraries/glibc/mtrace.nix b/pkgs/development/libraries/glibc/mtrace.nix new file mode 100644 index 00000000000..fed24aff279 --- /dev/null +++ b/pkgs/development/libraries/glibc/mtrace.nix @@ -0,0 +1,38 @@ +{ glibc, perl }: + +# Small wrapper which only exposes `mtrace(3)` from `glibc`. This can't be placed +# into `glibc` itself because it depends on Perl which would mean that the final +# `glibc` inside a stdenv bootstrap has a dependency `glibc -> perl -> bootstrap tools`, +# so this is now in its own package that isn't used for bootstrapping. +# +# `glibc` needs to be overridden here because it's still needed to `./configure` the source in order +# to have a build environment where we can call the needed make target. + +glibc.overrideAttrs ({ meta ? {}, ... }: { + pname = "glibc-mtrace"; + + buildPhase = '' + runHook preBuild + + mkdir malloc + make -C ../glibc-${glibc.minorRelease}/malloc objdir=`pwd` `pwd`/malloc/mtrace; + + runHook postBuild + ''; + + installPhase = '' + mkdir -p $out/bin + mv malloc/mtrace $out/bin/ + ''; + + # Perl interpreter used for `mtrace`. + buildInputs = [ perl ]; + + # Reset a few things declared by `pkgs.glibc`. + outputs = [ "out" ]; + separateDebugInfo = false; + + meta = meta // { + description = "Perl script used to interpret and provide human readable output of the trace log contained in the file mtracedata, whose contents were produced by mtrace(3)."; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a79aa339c19..bf5250a7782 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16248,6 +16248,8 @@ with pkgs; stdenv = gccStdenv; # doesn't compile without gcc }; + mtrace = callPackage ../development/libraries/glibc/mtrace.nix { }; + # Provided by libc on Operating Systems that use the Extensible Linker Format. elf-header = if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" -- cgit 1.4.1 From 30a9e56295a987b5a498d21482d6e64aaea7b542 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Tue, 26 Oct 2021 14:20:34 +0200 Subject: tor-browser-bundle-bin: 10.5.8 -> 10.5.10 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 8ac9235121c..a512c119d53 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,7 +88,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.5.8"; + version = "10.5.10"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1bn31r3cayv79pjw5ndji5qzxy552cb2mcavij3nwchsmnfqp4z1"; + sha256 = "0mvclh2f2lqj5kf98p0xdbaa6wxshwb8dkcna5sl561cw8nnayc2"; }; i686-linux = fetchurl { @@ -106,7 +106,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1j3xxflwwjwxfayixj75dn6a2ka751s53f60dpkfzwpp5rfwl572"; + sha256 = "1g714abhh3ynmparb516z5syl7i64n7s5mga0zxb4598bhzi5zkg"; }; }; in -- cgit 1.4.1 From 7bb12f542e5689cd4bffd9b1c2e9ff20f27a1a23 Mon Sep 17 00:00:00 2001 From: Chip Collier Date: Mon, 25 Oct 2021 09:08:00 +0200 Subject: maintainers: add photex --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fd24dfdabae..1ea6f5745d2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8887,6 +8887,12 @@ githubId = 421510; name = "Noé Rubinstein"; }; + photex = { + email = "photex@gmail.com"; + github = "photex"; + githubId = 301903; + name = "Chip Collier"; + }; phreedom = { email = "phreedom@yandex.ru"; github = "phreedom"; -- cgit 1.4.1 From 43917084766a508d49141d2d6e470de150e5ae34 Mon Sep 17 00:00:00 2001 From: Chip Collier Date: Mon, 25 Oct 2021 09:08:37 +0200 Subject: cpptoml: init at 0.4.0 --- pkgs/development/libraries/cpptoml/default.nix | 34 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/cpptoml/default.nix diff --git a/pkgs/development/libraries/cpptoml/default.nix b/pkgs/development/libraries/cpptoml/default.nix new file mode 100644 index 00000000000..a3528444c6a --- /dev/null +++ b/pkgs/development/libraries/cpptoml/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libcxxCmakeModule ? false }: + +stdenv.mkDerivation rec { + pname = "cpptoml"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "skystrife"; + repo = "cpptoml"; + rev = "fededad7169e538ca47e11a9ee9251bc361a9a65"; + sha256 = "0zlgdlk9nsskmr8xc2ajm6mn1x5wz82ssx9w88s02icz71mcihrx"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + # If this package is built with clang it will attempt to + # use libcxx via the Cmake find_package interface. + # The default libcxx stdenv in llvmPackages doesn't provide + # this and so will fail. + "-DENABLE_LIBCXX=${if libcxxCmakeModule then "ON" else "OFF"}" + "-DCPPTOML_BUILD_EXAMPLES=OFF" + ]; + + outputs = [ "out" ]; + + meta = with lib; { + description = "C++ TOML configuration library"; + homepage = "https://github.com/skystrife/cpptoml"; + license = licenses.mit; + maintainers = with maintainers; [ photex ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 754f1fe44b7..6a18530d3fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1565,6 +1565,8 @@ with pkgs; cozy = callPackage ../applications/audio/cozy { }; + cpptoml = callPackage ../development/libraries/cpptoml { }; + cpuid = callPackage ../os-specific/linux/cpuid { }; ctrtool = callPackage ../tools/archivers/ctrtool { }; -- cgit 1.4.1 From 8be9caf2c1cfb609ad46ab45eeecd50c94728171 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 04:00:18 +0000 Subject: xmlsec: 1.2.32 -> 1.2.33 --- pkgs/development/libraries/xmlsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 2dceaeda649..69d9623c1a5 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -6,11 +6,11 @@ lib.fix (self: stdenv.mkDerivation rec { pname = "xmlsec"; - version = "1.2.32"; + version = "1.2.33"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "sha256-44NwKFMjYATlsI5CS4r+m1P+nzGqp6U4LznZUz63wEM="; + sha256 = "sha256-JgQdNaIKJF7Vovue4HXxCCVmTSdCIMtRkDQPqHpNCTE="; }; patches = [ -- cgit 1.4.1 From 45d82e9fa4aa7cabb2831fed2d373f17111db3d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 07:29:56 +0000 Subject: wabt: 1.0.23 -> 1.0.24 --- pkgs/development/tools/wabt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index aaffa4f8213..344ab9fe9f7 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "1drjngcqkaahzk92jysrzv86fhj02c074xffd7kn3k6q8fxc0976"; + sha256 = "sha256-/blukivL6+xsnChxDp5gCr5w8S3bBuhO459YkLGxYmA="; fetchSubmodules = true; }; -- cgit 1.4.1 From f6fffb2722f3382159cec81a90b7d04e2884324a Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Wed, 27 Oct 2021 23:36:04 +0200 Subject: Nixos manual: nixos-rebuild boot or switch to clear boot entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the `nixos-rebuild` command has multiple subcommands, and not each of them would fix the problem of a large `/boot` partition, so let’s be more precise here. --- nixos/doc/manual/administration/cleaning-store.chapter.md | 4 ++-- nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/administration/cleaning-store.chapter.md b/nixos/doc/manual/administration/cleaning-store.chapter.md index fb2090b31d8..c9140d0869c 100644 --- a/nixos/doc/manual/administration/cleaning-store.chapter.md +++ b/nixos/doc/manual/administration/cleaning-store.chapter.md @@ -58,5 +58,5 @@ a while to finish. ## NixOS Boot Entries {#sect-nixos-gc-boot-entries} If your `/boot` partition runs out of space, after clearing old profiles -you must rebuild your system with `nixos-rebuild` to update the `/boot` -partition and clear space. +you must rebuild your system with `nixos-rebuild boot` or `nixos-rebuild +switch` to update the `/boot` partition and clear space. diff --git a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml index 0ca98dd6e51..4243d2bf53f 100644 --- a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml +++ b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml @@ -64,7 +64,8 @@ $ nix-store --optimise If your /boot partition runs out of space, after clearing old profiles you must rebuild your system with - nixos-rebuild to update the + nixos-rebuild boot or + nixos-rebuild switch to update the /boot partition and clear space. -- cgit 1.4.1 From 2fedb9734d017eb5081524ed53b73dc5584cfc73 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 29 Oct 2021 09:45:27 -0400 Subject: mkpasswd: Fix complaining about missing pkg-config Before, when building, would output multiple times: > sh: line 1: pkg-config: command not found --- pkgs/tools/security/mkpasswd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index e001239f313..c884c279000 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, whois, perl }: +{ lib, stdenv, whois, perl, pkg-config }: stdenv.mkDerivation { name = "mkpasswd-${whois.version}"; src = whois.src; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl pkg-config ]; preConfigure = whois.preConfigure; buildPhase = "make mkpasswd"; -- cgit 1.4.1 From bbf70ca393f9c2e3029b6a875b9aafbe23c7ea77 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 29 Oct 2021 09:46:24 -0400 Subject: mkpasswd: Include support for more hash methods (Before) Available methods: sha512crypt SHA-512 sha256crypt SHA-256 md5crypt MD5 descrypt standard 56 bit DES-based crypt(3) (After) Available methods: yescrypt Yescrypt gost-yescrypt GOST Yescrypt scrypt scrypt bcrypt bcrypt bcrypt-a bcrypt (obsolete $2a$ version) sha512crypt SHA-512 sha256crypt SHA-256 sunmd5 SunMD5 md5crypt MD5 bsdicrypt BSDI extended DES-based crypt(3) descrypt standard 56 bit DES-based crypt(3) nt NT-Hash --- pkgs/tools/security/mkpasswd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index c884c279000..23a8f5d4fbd 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, whois, perl, pkg-config }: +{ lib, stdenv, whois, libxcrypt, perl, pkg-config }: stdenv.mkDerivation { name = "mkpasswd-${whois.version}"; @@ -6,6 +6,7 @@ stdenv.mkDerivation { src = whois.src; nativeBuildInputs = [ perl pkg-config ]; + buildInputs = [ libxcrypt ]; preConfigure = whois.preConfigure; buildPhase = "make mkpasswd"; -- cgit 1.4.1 From 365f3a591876b6748756b810c693f6c6d4a23e50 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 29 Oct 2021 12:27:58 -0400 Subject: mkpasswd: Prefer inherit --- pkgs/tools/security/mkpasswd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 23a8f5d4fbd..6064a80d6cd 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, whois, libxcrypt, perl, pkg-config }: stdenv.mkDerivation { - name = "mkpasswd-${whois.version}"; - - src = whois.src; + pname = "mkpasswd"; + inherit (whois) version; + inherit (whois) src; nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ libxcrypt ]; - preConfigure = whois.preConfigure; + inherit (whois) preConfigure; buildPhase = "make mkpasswd"; installPhase = "make install-mkpasswd"; -- cgit 1.4.1 From 7e67d40e1e0b09effe0af2dc7ece040265c6737e Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Sat, 30 Oct 2021 14:19:46 +0800 Subject: jetbrains: fix preferLocalBuild --- pkgs/applications/editors/jetbrains/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 3992fc5c2ec..4d8835c29c5 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -17,7 +17,7 @@ let loName = toLower product; + ".vmoptions"; in -with stdenv; lib.makeOverridable mkDerivation rec { +with stdenv; lib.makeOverridable mkDerivation (rec { inherit name src; meta = args.meta // { inherit mainProgram; }; @@ -94,4 +94,4 @@ with stdenv; lib.makeOverridable mkDerivation rec { } // lib.optionalAttrs (!(meta.license.free or true)) { preferLocalBuild = true; -} +}) -- cgit 1.4.1 From 82ce6db4e0e94729b391ecf71388e614820fe6b4 Mon Sep 17 00:00:00 2001 From: José Romildo Date: Tue, 2 Nov 2021 19:49:39 -0300 Subject: mate.mate-themes: 3.22.22 -> 3.22.23 --- pkgs/desktops/mate/mate-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 21c7b23537e..27450197623 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-themes"; - version = "3.22.22"; + version = "3.22.23"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18crdwfpfm3br4pv94wy7rpmzzb69im4j8dgq1b7c8gcbbzay05x"; + sha256 = "1avgzccdmr7y18rnp3xrhwk82alv2dlig3wh7ivgahcqdiiavrb1"; }; nativeBuildInputs = [ pkg-config gettext gtk3 ]; -- cgit 1.4.1 From db8229585418ab46f64fc885345da4245c7e367f Mon Sep 17 00:00:00 2001 From: José Romildo Date: Tue, 2 Nov 2021 19:56:54 -0300 Subject: mate.mate-tweak: 21.04.3 -> 21.10.0 --- pkgs/desktops/mate/mate-tweak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 5aebd6aef43..e379f5369f5 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "mate-tweak"; - version = "21.04.3"; + version = "21.10.0"; src = fetchFromGitHub { owner = "ubuntu-mate"; repo = pname; rev = version; - sha256 = "0vpzy7awhb1xfsdjsrchy5b9dygj4ixdcvgx5v5w8hllmi4yxpc1"; + sha256 = "0m61p6idajsrrbjps7s1pnl6nfzwpy7j6l9bdhqi9gaaij687shn"; }; nativeBuildInputs = [ -- cgit 1.4.1 From e67f73ba0376bcd859a5af0520d695254a9d580c Mon Sep 17 00:00:00 2001 From: André Silva Date: Tue, 2 Nov 2021 23:43:16 +0000 Subject: ledger-live-desktop: 2.34.3 -> 2.34.4 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index a1ce67abf9a..636d377ebe4 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.34.3"; + version = "2.34.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "07r7gfn44c4bdcq9rgs6v4frrl2g004lh9lcsrj6rbqy6949r9j2"; + sha256 = "00zl7ywmkbhwzkj7p618rin5pd0ix8cas5q1b8ka6ynw4wlg3w5c"; }; appimageContents = appimageTools.extractType2 { -- cgit 1.4.1 From 06708435d1c6527b5119daafe9c96df9968cf3a6 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 3 Nov 2021 09:13:42 +0900 Subject: thunderbird-bin: 91.2.1 -> 91.3.0 --- .../thunderbird-bin/release_sources.nix | 522 ++++++++++----------- 1 file changed, 261 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 5af24287c17..d53bcda2a69 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.2.1"; + version = "91.3.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/af/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/af/thunderbird-91.3.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "953e07d7198b8b13f312ef620caf6e232c361f78dd04ebd69c753f7b75e55f42"; + sha256 = "067592da3bdc40cb8a7d8f64e3c5d116575604f1305b8eac4b5b1cc7f79dccf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ar/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ar/thunderbird-91.3.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "29f34eac79855c01550a259d3663c662ec9bd259c0b20bf392efb0de1f44af8d"; + sha256 = "3a52d7c0e48496cd2259494196b0514412e922535877ddd322ceb82d02a47a39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ast/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ast/thunderbird-91.3.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "284d8935a5527b58f84ba9acabc0a67c51a7e1587f843d8b0ec9555e6f6d8f4e"; + sha256 = "e07001f03b642887ae4a4e2415ce6bb50542d5af7cd8a9f0531081bb084e56eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/be/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/be/thunderbird-91.3.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6a535aac3b4eb839a2aca1df28ac8425c142c68bd5c6907f5b9999a45b62c9c3"; + sha256 = "ae12e02ef735813f2f807a32b101ea8ac621bff3f01f4e4b3c5e0fa6c178b812"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/bg/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/bg/thunderbird-91.3.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "74dde907aaa3877651e1f2bec43a208ff36bf7d860333eaac6f8cdd20d48dc39"; + sha256 = "3892a660dcc417cbb951bd8362b8fdf06ef35606e98f121ea6f549646a0a8b89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/br/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/br/thunderbird-91.3.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6b396a289addae8d5ade8355f8c93c285ce6833852149a0fed3f741d9ceea220"; + sha256 = "2fd0c6eca16a1435d0abd5d8fa66d68c8024f992ee57b741178c2d253f9bb7d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ca/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ca/thunderbird-91.3.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0611d49fd90777b3af1bd5b5effd3b4a5b267c7c33e6476ceed906a070a0e675"; + sha256 = "45fa1b1e80b646af457b189e07fa13c8bee61df1d80066b0b3d65414a682e105"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cak/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cak/thunderbird-91.3.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "032e7034ab5aada649258dfa43cc10d6e00cf5be6f06b8bede06d2ca19625d79"; + sha256 = "3211236401fbf52b6085c1fe7e82e081c2d7d4f13514b11ced5a483986dabecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cs/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cs/thunderbird-91.3.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b0591e3bdf5e9273269354924fcfa8001579961f089f1011226faf1f4b0ab2e6"; + sha256 = "259bf43995f7990bd1ef78e030db88966688323f363f15af2065c7c551a9e6ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cy/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cy/thunderbird-91.3.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4087f5c5609169b6834e2eed3fdaf614826c47f3ca99177292fd379ef5d430b3"; + sha256 = "2e1719dc5b7c3687c390c7ac07ab0392a3e8f32624ebd40d2cf8208796da054e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/da/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/da/thunderbird-91.3.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b72f768cc2d9c2bad536e2467d1abfe68671b242fcac801e57297694fd41d231"; + sha256 = "49d8e99d05928d4678408a3b38da2f5c4915a802966c7328f4d410d5d0f7d82e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/de/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/de/thunderbird-91.3.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "48990ead3d84cb023e8c3e6e34113209b49e6ed3e29766fb5374fe577cd5cd94"; + sha256 = "0059061919afe9a38a3647896693e4773c3656887657b761356ff698b839cef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/dsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/dsb/thunderbird-91.3.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c7e93ffe9d8ab0bc00db145771e65fec6c589208c28c3e0ecb5bb49471b9ed61"; + sha256 = "7ac2f44c66860967cabd64e94f0b104b2807f4b6297dd2ad828525962d8d5976"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/el/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/el/thunderbird-91.3.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c35372524d77123bb9827d26efcd29e0fb9de402744b22a3c99563531410e2b3"; + sha256 = "3fcde9b4cac6c46a6be2fe15f200cde1f96b59732f1e87b5645538568969817f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-CA/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-CA/thunderbird-91.3.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d20fa4b8c7224f35f06d384b5f37c277c56ac35f2099f59735197a0334c9f3ec"; + sha256 = "13e33af2f7c29f8bcc479a09b3f8ab82362c01984700c5371eb8c050ef0524b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-GB/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-GB/thunderbird-91.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "af0787957918aee6bb931b30ab92722c3ea8fe1e3fd60602d172a598422f7896"; + sha256 = "94e8bf04d513caa7cd74c4e93851a59911352e666b7bf86c8a795d63177f2e0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-US/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-US/thunderbird-91.3.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f8968d5ecf27e37bb8204291a9739ab804ef77c082e11b4e82fc7e02c8bf0da4"; + sha256 = "a5cf280ad34305f7a83d331f554488c08e8c62acf2eb895ba7a6bcbc4aad3180"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/es-AR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/es-AR/thunderbird-91.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ec281675876941240ccebe0c48bbb4ae0ed442b795cd7ee1be51ec59c4331220"; + sha256 = "ae253fa8d23ee19105566a76be6ad4584ba2c5cb1eef6a3135d488109f25dea7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/es-ES/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/es-ES/thunderbird-91.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6436ab381f1ab7fbcf1289d50300d7238f1095022cf18d6441832a8f61df68ea"; + sha256 = "1ede7664984d3ba3ba74163f58f02d5a982aa586c000a9d2b51efdb4b0b39210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/et/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/et/thunderbird-91.3.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1e49089b98dcfebdc1465b93d625b6ea1b6fee4642ca915035fabdc97710eb0f"; + sha256 = "93e29146782ccaa5ba9cc0b30f4f6273d8c57f39c678bc2dc825af5f46415ff1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/eu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/eu/thunderbird-91.3.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c6a1418f15a019924b459b952330b9851c50907a7c12f3d430a79268ebdb7bac"; + sha256 = "ef431ab48190366acad917c5d8710e2df89ee31cf88ccfea206bfb49fbd2083c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fi/thunderbird-91.3.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "588261a4c0e9cfa0c9f506f4fd2e9e14f123d10e96f0cc1724b4ea4607151264"; + sha256 = "e4fba7cbb9cdb515eb29757bbda8b3f1fd091a5c1a35d345b34c547002c44ab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fr/thunderbird-91.3.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9ca2d54c6f6f04ee887621332cc35aeabd0f9b73db621c41e8925bafb316670a"; + sha256 = "127de8d089c8ad535f2ca0dd60856a8822e8adffb3e5f3af868881c36e78da97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fy-NL/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fy-NL/thunderbird-91.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "df9bae4cc2d3bd2778047d4589ec1a8e23f7b8c7fc760817decb9341b59dc0b9"; + sha256 = "28b4e3490105558c6fc47b9189451e0359f0ecfdaf9b40af173483cbef618981"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ga-IE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ga-IE/thunderbird-91.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8d6445032f39152c62e98fe9093cefbaa383d2bff203734ca04a501b44a3a0c2"; + sha256 = "2b16e222cf5f9468bae76f1f3b7b0af8c7b6f8a7a9f263e9d1b1e9320e244fad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/gd/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/gd/thunderbird-91.3.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b947847398a8e086d062f8e54f515d53e39afab48ec59ca0aceb956ea0e0917f"; + sha256 = "9368396e0ca3784201f3e2d2bf6c1c87d0d0dade72f96c450119929a4ae34ae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/gl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/gl/thunderbird-91.3.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3dddbb5cc78171719ed2e7c3ba854c0a346ca5324a898c698dfb79c7881051c0"; + sha256 = "7c90a96061ae3d237636baaa4fe439ae47542d0880b81687bc3a5a9e40edded9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/he/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/he/thunderbird-91.3.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e77eb74db9111e54b1e492fb5752fa92ec6eed96a7146392d1ba19d63b5e2ab8"; + sha256 = "12e42b78aa9757b8274df1395667b89214d393a2dd5969b374a0bf5816f04f31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hr/thunderbird-91.3.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3e4d46ecc0ef83a619775d48e4df81295e3e95ad1e9a96efeafa26d7f24b85ee"; + sha256 = "f27542cf34fffd6aa71c479278b843ce435f4a8272130f7d8cde6f155e82b813"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hsb/thunderbird-91.3.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "36453d6aca463fce338ac4a15c438290bdaa377aff72a56f0acefeba19860986"; + sha256 = "f21bbe1720441392a276f3a2f6025da48f74efcfb7bfbe783f134be013874cf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hu/thunderbird-91.3.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "dd05c379727762fde0c2456a7bbd67cc45fb7ccfbbf88958b887d6637867e80e"; + sha256 = "64b16f848c5a361d9709c2075fdf3ca4f7eb885f3f1cd9ec5acffc260b31982a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hy-AM/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hy-AM/thunderbird-91.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "35e4db20ff927cf079607fd0e7d207c155f23c7890cc6347ac069c9d252f6ad3"; + sha256 = "da650d001f9b10227c5a5f5225725ef9085aa71f95dca0ffc4452fc2d6b48d90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/id/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/id/thunderbird-91.3.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9cc7a35aed1e5808a80cade5b77d064f3bd36f08107dbbdd3b92ac11c8c83766"; + sha256 = "12fcb1295b43b8bfd9607b819a78dd931c5efb092d6a5ddc70199c3625c4c033"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/is/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/is/thunderbird-91.3.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "de645fdf79f33195a7caed9461214f834fb2e52f3da764bde71608fd3783305e"; + sha256 = "48250a36caa8727b6e5bf1369199b4e202c7692ef62ffd97999b71a59c8182b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/it/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/it/thunderbird-91.3.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f9a80f01d18cd36ac5c0a18d65908f329bc3d7ec506e0f201b833ed973528dca"; + sha256 = "aebf9b22dd1af357fdd1709448d3d753319a2f817bc30ed15ba364c75fe5ec40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ja/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ja/thunderbird-91.3.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9345cfdb7e35fc15e94bab52f058dacecd813da210c81770f3037c6f3f982478"; + sha256 = "3a1580283928525b20a163f13c4cb9554484823ddc28699a8d8879860ccf3a73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ka/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ka/thunderbird-91.3.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "49e535b7b8322645b81b8137ded607cbe54e70977a07b800114421fb529b045b"; + sha256 = "a2d2b5e2b884fa1b9547c76b9fce154431ef0db80af45379079f1c2d5c6d14b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/kab/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/kab/thunderbird-91.3.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9e66e0654c5ca2d4fec6101bd40a2ab68f17ad4a27ff58db4a1c5d927d76761d"; + sha256 = "0b909906f58125048fd4683946e62653b5c9064085b3f129b20d865c8463198b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/kk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/kk/thunderbird-91.3.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c929ef91d1ed17db64a36b5c8653e98e1be05b7bef48c062c40c0e37a88f6844"; + sha256 = "5256b328a8920f01b5e93617c3e98a54e27094a383047df9a98f5ac50772e0fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ko/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ko/thunderbird-91.3.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "758c31e642a796e3c8be2848e9789bf9c3d4f896790c80603491235ba126a195"; + sha256 = "445644ffbdff8af1910f664a9ed81512af95c9882f5b1ce1add02dac715ab0e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/lt/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/lt/thunderbird-91.3.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7173cb778a4f1bc625b5dde4eedf59911eb649e29c20f8f2a2eca455696fbdfb"; + sha256 = "0b3dbd1b6e71036b64c98920ef755f418cf6c11feba93ba8d873d438a032bf87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/lv/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/lv/thunderbird-91.3.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ec9ef897898c788521725879906c56593dd08e9b862b1ad32f7133bba7843b94"; + sha256 = "2bc934ce28dd4775984ae2f4db79db54806b34fdb415ec4420ae3b8927fe10a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ms/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ms/thunderbird-91.3.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1f95835843d33a80821c077b26ea5e6330ea3d1a818bb122623a6024dc98515c"; + sha256 = "e13dad427c8d0cb9aa79c48f4f8124ea996cabb34efdbd4ed8e90e233d00b6e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nb-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nb-NO/thunderbird-91.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f5aff84dd6016a4223df28fc92185cffc1771107bc4f7c442bef0d19ae4cccf5"; + sha256 = "e984fe009aa98be81153b1285370fae6187705bfbfe652b3c45e83f5bb0070ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nl/thunderbird-91.3.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1146a72a68b454abdb3ab19e0a487e0aa46af0fec4c9261459ac20785a66f8ca"; + sha256 = "55744aaba9ae0c282d7eeba0beae71101cdfbf689bbad8a6312af3f2abc41778"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nn-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nn-NO/thunderbird-91.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a63d1124b72b4ad1e26f34b26792e576a63ade3aee161965058f6ba2144f4edc"; + sha256 = "b404dfee5b164a0401da149c33535e51030b21da29fc97d1822bc82cec2b6808"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pa-IN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pa-IN/thunderbird-91.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "245692605721b9610bb730f7164c64daebad372f881842a3e2d92dd27cf2c23c"; + sha256 = "cb0bb35c9cbb31443658847bc49d29730b192b6a25875acceac3fa4fd7436edd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pl/thunderbird-91.3.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b3b3f9b4f4e2f310b24b148960dbbada8dedd444968f923e7295ce2e3f561bc0"; + sha256 = "3a0ea72ba75230b4809901138350e0f13f981daaf590455aa75787cb107a0c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pt-BR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pt-BR/thunderbird-91.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dc0a70cb19880a9ea7a076ea03c12150bf2ed6349bee7f7cd64b9ba261366e99"; + sha256 = "8e9deefa5bb510e244d8c6416371e24a2f6c97548eda5a25bf03a7aa5d500b7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pt-PT/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pt-PT/thunderbird-91.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "be20940db6d0b0399ea90e97ce4073c698c9caa822535cfdadaf5019aaa283f0"; + sha256 = "753235eb471c7bb62f766baff612bd1df5926ff248ee174604496edb7c75546b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/rm/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/rm/thunderbird-91.3.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8e996281032049eeb70c12ecc10dd321b055d917edc3f16c12b073160552a76a"; + sha256 = "a298343b057a4d25b89386cde253ddd897550250e81b8abd6a68ff240d41c600"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ro/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ro/thunderbird-91.3.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d015483952516c37169d263660776a572877d6db50b4e4bc42c9d285cc413032"; + sha256 = "df52bc68926b9239d3b26fbbfea3ec7aa98837296243325dfe153e9afea6a0fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ru/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ru/thunderbird-91.3.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "90404c19d3ab7d5142310ae23699b346ee07ab5704b02f3b89e1972737460448"; + sha256 = "001b1145aca605e8e5d72a1fda411546de1d2cb82f7be5626d5766018e1a692a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sk/thunderbird-91.3.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2ed8cea88291714fe25b3f06777340536e24c1837743e6dd16bf2e66e90ed057"; + sha256 = "822e852ec3d2d5a50f042bd2e5b2ec6929441b8116a2cadf2369c769602b85b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sl/thunderbird-91.3.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "be29a12cd0d52f11f19cff89df0d0a883802328cbe036e9f01c2be7d296d5a4a"; + sha256 = "752538090cd3d72cb5d04cc9abf0b089e437a7726cf8eee27b5ebe2d63162b8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sq/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sq/thunderbird-91.3.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b9f0b22b8004af1e7704048eb7223bda77723f664aab3596a3e2fed538eab39f"; + sha256 = "a8548722e8c67da69c8f2e15855dd076b1435c5a1c6c34100dfae8de0eab7543"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sr/thunderbird-91.3.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "1edd87244be553d61bd5db1de74068130e9a3ccfa387d21c489f9a777bbae732"; + sha256 = "d6c86caa9b272b3281b9a3eea8ded13546f4d09518081feb3fd16b995955d6e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sv-SE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sv-SE/thunderbird-91.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e218a20074e50dbe20d2dba7e81d5febdbcad8031e0fd9d88aca469da9cea267"; + sha256 = "a5af37b0803881489bc775e25592901ca77de996b07c4df658f17a9b66c94fc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/th/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/th/thunderbird-91.3.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "fa65b90c1cc903f3e1b743e142736b1c7e897eb6bf9a80cb0bffa60db627aba2"; + sha256 = "a0292086c9e9d0462118ca5945627bb04f8943e3afcdcf3da054ff52ccd45442"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/tr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/tr/thunderbird-91.3.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5af2e6453aa5523169d6922a8a888b757accad60802d7a457a1ee244cd74c3bc"; + sha256 = "f02b7dde392fd77cde01a9ae860a46acf11554ec32d1b606c2a0145562bea1d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/uk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/uk/thunderbird-91.3.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "effad7de717f0597447a7559e666ee3cdb0a1270daa01226d662cab0be84a4dc"; + sha256 = "1cb2935c1517b10adb370ceea6866912656c668dd8e82abcfb0f59435a85a854"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/uz/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/uz/thunderbird-91.3.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f3c8d3d4ca4c076eb8bcc8a06df32622b87b4d4ae397ee36f5de27a947d443ee"; + sha256 = "4ad88f7f036ec199bd69ab7628d2bdf2f162603e8290cc19e4ccd586bef691fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/vi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/vi/thunderbird-91.3.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ac464ab32927c822776b1cf873ea9b9a9473c18ac08b18534332050bde7b1dfe"; + sha256 = "538a9996a604d9464a6c1315c683d6bd80b585d3bcf59fa93272444c22fec59e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/zh-CN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/zh-CN/thunderbird-91.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "44869c19113316a02518eb19fb5b1a7a85e266fccf7a3172d1938d758a5efa6a"; + sha256 = "470123b053cab95930e8594684e65a656da032ea4e46aae4c325f119fbed4a46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/zh-TW/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/zh-TW/thunderbird-91.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "82d915747e3e5459acba3e17663de422586f27e7bbc3a5698d992f82ee3d0cc1"; + sha256 = "cead4d02b5dd39dd146d1f2b28b61e5f30804018cd226d36e56bd39e010d82c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/af/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/af/thunderbird-91.3.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5ccbc3453b76c3e02a05b94905c48cdad99bb15042fb2cfc58c7f619a263da07"; + sha256 = "4ac3b8ea2e7371710b03beca630d409a7f3e101e267e15b2ef49004da728e021"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ar/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ar/thunderbird-91.3.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "616fc2f0265f204b8699dd0beafc02220d7ba9b2243350730573824f6fa49462"; + sha256 = "545423946de595760829c2263b90f1ca2aef3ec576a28c96c37ec6bfc3269fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ast/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ast/thunderbird-91.3.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "046386e67e1b775f1f228e3056660db023093180f1c200f6380b6d3744b8ce4d"; + sha256 = "1ff0fc8052bcb5c26396114be2ebce66e939cfe962c17807183ccb538dc29df1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/be/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/be/thunderbird-91.3.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bf64b91b16bdf4dbdfb88972432f2d2cce002a6ff8c708779511b54a05a7008f"; + sha256 = "079a3e51861d0396d89978b46bcbcc5d786b3b4d728064c7709aefb2ba95ba40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/bg/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/bg/thunderbird-91.3.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f544fbff341165e8e304a8a643be60c8b742973402861b298171699c45fe622b"; + sha256 = "04b095d3b52972e06324630b938cf703143158996036f1d338740e9058c666c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/br/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/br/thunderbird-91.3.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c76ec7e65fc4980f12e05f863d8babab09d771f9679d21c93d8dab0f76d16898"; + sha256 = "82ad96bb61b2c170a0c750328b110772bff263493628c8a0c00396051a30ae4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ca/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ca/thunderbird-91.3.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "6c609f7b5886e7a7c70470d4bb35370284a454b109ca92cff9741bcc3086e9f8"; + sha256 = "e5c4a5c5edbfc95e2dbbf331e8a794fdbef77e111da3b467d050571b6447ff70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cak/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cak/thunderbird-91.3.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f210ac1e0740c7105abd388e9b5e22d9e199ab3deb43842c3a82ecf5e6d15f01"; + sha256 = "4c99da8214856553fd01e4bea4c01945abe799280bf4e6da94e57b8c85e5e047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cs/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cs/thunderbird-91.3.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "108d9bfa0b9bef9433f4837517d3d157d46c8578f889b9fb81bc72178f6dfe52"; + sha256 = "f7a9037ed7889f5de489f875611cf6a5d644b93f26b0dbddcb6e49b5f11ee2be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cy/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cy/thunderbird-91.3.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1bd421b89cded34d9a656b4e44b78c7b07557221b87dc99831ea7029ff6eead2"; + sha256 = "bba109d3b1ec5b5deeb7c8bd036260490252961c52855c4d879ddb73858a1110"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/da/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/da/thunderbird-91.3.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "4db52d6017baeb8a5f925b7cfcdfb89a3ed8af9d3c1a41c4a63d122e4f214ecd"; + sha256 = "182600e06827d9abf7b8428e3dc883036119d23431923eb019b6a6dc197f7e28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/de/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/de/thunderbird-91.3.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "584c0e8a03b068652f61978af053028ca3793e1679ff0ea214bc6f8a99761f0c"; + sha256 = "24f69ecdf96f2823e709fe4ca6f48c2eca8b8574e8ff10e7ac48a78b8a847d76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/dsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/dsb/thunderbird-91.3.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f838e8b6fdfb09e44771cfe02d22abb63722c65a0e430c77aca9fb5a53a97c4c"; + sha256 = "9c7ea981a4d8ca2917fc160dbe5598b7bf8c63a9af4b3010cfa870632f4b8e7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/el/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/el/thunderbird-91.3.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "0b0a6cb3c77e0a4f86bd3adbd4bac229d50323a88b355e470184f932b9602e4b"; + sha256 = "e55668dac59dea1f5faddf0d2d63b223932a086dc79a577f2e811dba4b3e16d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-CA/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-CA/thunderbird-91.3.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "7e22ff64aed5187db9621754f1eedb158285c2514f3eca836103833ac6183f7c"; + sha256 = "b60e6106c054e8d1a107b5601fc96555024b3894334cc4f825a953bf4198e2b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-GB/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-GB/thunderbird-91.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a3be3dec0ec4789f8370c23e47b7ed0bef6802d28e3985c66d1a531a3aa986cf"; + sha256 = "c63b78c881f9c98523214d70053fbe25c84209ea17b634f51fabe47f7a68e700"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-US/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-US/thunderbird-91.3.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "31c35df101e8d3f97c3df72b7660086fdf4f6612068fd03558d5f9dca2d23507"; + sha256 = "2f43f460a7b31c128c8cdae2829bbfd82a5381854d722901e8c07843d73f5030"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/es-AR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/es-AR/thunderbird-91.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "70db1a684f76886131214bb0c48dccd75763f041e06428ee6fef54a3a8d524c0"; + sha256 = "5bfdc77b75b5acfff4a013884298d68ba76946f6ded7b39d973c4a4a20f0c09a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/es-ES/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/es-ES/thunderbird-91.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d0b792b494bea690adc6a2eb967a988920ca497db08c539f92349c925ccb7c33"; + sha256 = "5c793c8ba89d886a67ced4e6cd2271cbd9a516efc1bbf981e4b302ee4223dc37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/et/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/et/thunderbird-91.3.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2e4c3111435cb965972aec73eb181f7e3aac8faa03c8c8f0d7869ace109b433c"; + sha256 = "548e4ff7682d36034dac4b82bee239ff5241b8605982d4ea3e21d59f43710888"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/eu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/eu/thunderbird-91.3.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "875e98a6ffcb614b3f062b7d12069eeb9f1c9dcd62916020369ede9ac76b8f92"; + sha256 = "1c24768b70b1cd8310ed5bd9bc08aab036952c692ddb5cdda7e0605b61746713"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fi/thunderbird-91.3.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "982a28220ed9d6881d83baaf99540e7eb5d689b0b7fca179d4847838f2596a3c"; + sha256 = "fdd4a914633aa6b1aeb4c737c63e7b0a39c60ab15b320ae37221c5a7eb273620"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fr/thunderbird-91.3.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f0421269313849e90eab46698176f1ca425d2bf8136748628a35b0a8baf26c06"; + sha256 = "b582ff509cea4bfcdafa4b260db4831565ea60b7ac64e3163c9a43814790277b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fy-NL/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fy-NL/thunderbird-91.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d49aafc5baebb88b4b2ef7ea5240babe09b16632edebf9a39081aaf183e9ae3b"; + sha256 = "61fa2a02f179e50d9d4bf43cf037a6b545982ee479f7c8f040ca57fc2586ed2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ga-IE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ga-IE/thunderbird-91.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "665df98e5dd0ab4cff25b530bccfdfe4b44f2a81da9167b37aeedf7f05e1f59e"; + sha256 = "c0651a533f2690ad17b336e4de840932c4711e10fec64b80f2fec18d0449f1dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/gd/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/gd/thunderbird-91.3.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "28acbaec011f0222530d0f8411444fdf0743d05c05c1fc04a0c130208dd5e9f9"; + sha256 = "49f7b349a5d55ccbcdeb2ca464aac2ff6c0712b6ea1e8f124ca7562913e8c633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/gl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/gl/thunderbird-91.3.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "97c23e4eac308b51252c0532770961133f2540b94a9dc095c0351e39f42ab038"; + sha256 = "04eca02158c56920f08368bb78ce7affaaa3d6793e6a3361b41e3c8856804130"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/he/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/he/thunderbird-91.3.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "dfd4f5b4c9f396b4a512b38292b73f5a44146b3b46ab0d4e448067481e940914"; + sha256 = "150ea785d46bb8debe554533edd53abc2a5711ddf64268f4479dc0eda2e85be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hr/thunderbird-91.3.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "07a1f4a58af9172912237c35c220efbe80fbcd44151dc0bce3e40ede38dff054"; + sha256 = "d837a407f1a117299a7540fd718f4f7cffdf056871ba5f1adf09da5ecd84eb23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hsb/thunderbird-91.3.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c1b4e64ebdcc1a06d4428d3507aa1899f3d4c27ae428161f7219ea34302b1946"; + sha256 = "d7e3e2287a2218f80f055c450b67ece63ae97320eef1dca77cd153a2106d4bc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hu/thunderbird-91.3.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c57005f3f10938b8cfc6adef1d5452b3235605b97a23d22da1f4528b1e356d2d"; + sha256 = "157a156e393b5a69a326aa0e9be02bd2ae3bd48433382a803ccb9c5c354ed498"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hy-AM/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hy-AM/thunderbird-91.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "73525dc142b6762f803ced2b567a23244b22239d355fe89507cbe59ad1130edc"; + sha256 = "bbb783688762040579258fd8650124770f2a1b6ab8dd050df5c8e0bb057510ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/id/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/id/thunderbird-91.3.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3f79327af36f3174cb303c65b13a0ae164bf24c87e367ba14bb46b1b6e2370b4"; + sha256 = "f14f33e5c8de0e59839654fd472ca20f592669bd739097831e011b3ad6ca3e3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/is/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/is/thunderbird-91.3.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "58f7012723cf4ce6673fed01d038b2517c710585c6f8724181e4a91d717b2351"; + sha256 = "5a6be55557ef79101cf61c4fa684a52be1afa1a972a69e02998a35cbfd3212a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/it/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/it/thunderbird-91.3.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b0e7b9aa39a05148a0ef83d860fd2ab40d2aa1a66a31dd1e9a59d390d56c6e42"; + sha256 = "565299abc53960d3bb7c2a4abac86c2f5864a089aa4b908aceab20651b6d4c25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ja/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ja/thunderbird-91.3.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e02978eef0fc814ca190bf8bde29ae382fc2e14c61200e78ec1f43809d7cca9a"; + sha256 = "03244c4102177b81ad105ca31790000314c35813e6fa2efa2020b99b4ac45391"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ka/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ka/thunderbird-91.3.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b11a6e09556d9f943765badb6145c5db2b7bb54cd3016de686e821aa66308bd5"; + sha256 = "2640b2cab838dea0f2252898302fe0008c2b3807da4c8c45224047a7975b9461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/kab/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/kab/thunderbird-91.3.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "604f1c4a21b58b995e72ac48549802c588b0542c352de813aa4dcc02bbc0c686"; + sha256 = "083cd62d42936adeb069b620b19c7a66f761c40c82b56205626b9e1a6364b64d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/kk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/kk/thunderbird-91.3.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "29479a9970a622e23901c6022058d635874b41e24c7f5aef42536abc922dd1ea"; + sha256 = "8a973b47dfbe996d8e7dc894bb0cc0b473743eec0caf05f11646b3552c287516"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ko/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ko/thunderbird-91.3.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f34050010ff533a1c3949b11ad51c6902d6efec8c92904b2906ab80f95291e6d"; + sha256 = "6f7a992d226028a6398932c8bcaf9d522ff72cfbb60336875b83e74d22564967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/lt/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/lt/thunderbird-91.3.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be3e4c5bff078c2129d6f4e1a6a820efa62cce2750e3e1359dfba0ea93e58b5a"; + sha256 = "76cda4386e76388de5d0b660541f1ae5c40ef31609c329226e07573265b34c05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/lv/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/lv/thunderbird-91.3.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "bd6ec1783bcd5efbf51f963eef3db42f71b50e8826fe4896dc7356d10f4eefce"; + sha256 = "9bc2b1358965e4bdaf875625296d2e40bc6f21709237b38011f82169937cf022"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ms/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ms/thunderbird-91.3.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6279588bd47020c61250c211849b8fcbc4f480318a725090f316bb9f2099c31f"; + sha256 = "5860567197e95c1fbca7585796b34adaf453923be9e726ea33e54e390a7e800f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nb-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nb-NO/thunderbird-91.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0f0a0fb9f6556f4207e63a12e846d2917d8e221321b51ba34860094876c3528f"; + sha256 = "5b50ebc02d93303547704312f11e10a5470bcc116da55573f6d256ec90e5d5cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nl/thunderbird-91.3.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2f3c40fffa081ec62396fc3b715331280603b38b6d5fe5f4b16de1ab6727a713"; + sha256 = "99756c19427ab548d6cd64a5805549ed51af95e41eaa97eff821bfea2b3691ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nn-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nn-NO/thunderbird-91.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "da9c9cc55abbd4f0679b53b6635868fb2a5f56165292a82903512058fa57f988"; + sha256 = "2888793a3490fbebd2148128662a63a7a482c7d770e8e4c4be3e725af5eb5c1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pa-IN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pa-IN/thunderbird-91.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "065db90edaec65fc7cb240d7793afae97110761bca269ffc4e172d0fd5dcbeae"; + sha256 = "a4d6ffa089fc309e208508986f91283a6c839f8cee109e073d3d6a0d25397292"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pl/thunderbird-91.3.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "4e0a43f1633728dbb25dcd60218b31fa45131a8189f94d8ebeff202bc251ac55"; + sha256 = "7a9f677c39700e7b1212047327f1b080004c42c3094eb4bf7a487b39a65458df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pt-BR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pt-BR/thunderbird-91.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a013acdee4b7e983c71dd39607103f1794b967addc57c538a8ca94437551743c"; + sha256 = "0967d12e7cd9d2fd4d55dc75bfb02fb07ca61c60d2f0ccb295b8c264cb565957"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pt-PT/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pt-PT/thunderbird-91.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4bf7b530490f1fc1d031040790a568bee42206f393f8c13994551e6ff4d1ede2"; + sha256 = "1be6b84a42c215928de2dbb36bd9e0f01303eb1ba4224126c12a98205316746c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/rm/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/rm/thunderbird-91.3.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "829ffbd9402f5cf80cdd8b001081d6f67628c842cc3c73f8191b6f6ff1d54d52"; + sha256 = "54b4f955412f9c53d37188f42be5a7cc8ee1357458171d6134299145acde76d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ro/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ro/thunderbird-91.3.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "6bc72633a3b45faf2aa51627caf5674f1b05e16840b952f58f7f86ef6ad483b9"; + sha256 = "4f31a0eeafbe516c93b00b5ac5e7b06a35db471a19965955b8f25713984b7b9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ru/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ru/thunderbird-91.3.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "141787ba7f5aeb0faa2a33e0d84fda8fa8d31681c6fdd0e884a69cc339042048"; + sha256 = "247c78a1dc8d6013744de242efc6ddac6f2f3d10d86e1348769e90124f5eb6df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sk/thunderbird-91.3.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "90363481a491a239e4c3da49bc87ed3ca795e4ce0eaf2239ac5a298e5d7abc10"; + sha256 = "73b69b08de497cc2c5e50e7226b7c6de61546b1198a6757b8a63c6399fd2a9e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sl/thunderbird-91.3.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "95e57777da6f9fcb41bb3116771be2e90b023315433d41e21884b34feb6a38e4"; + sha256 = "3d822e2c79d38e26353cb8810b8468580d2157b62aadcfca1d96874bb7ee0681"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sq/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sq/thunderbird-91.3.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d7e0a12bd5c7edfb130e4defdc25b8776fb71722fb146cd5309d52405ad231bd"; + sha256 = "c8e185af246c6059e85554968fa91c1ff0477e824fdf05d1860dc36ff7dd8a47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sr/thunderbird-91.3.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b17dbc3424ce90c0360a75476d1d25568fb4e7c6e1e90a197ab332e5584cb88e"; + sha256 = "61da012cc5aa8dab7855deef3f26c20efdbca12c788caede60a4825289850b72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sv-SE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sv-SE/thunderbird-91.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "027f7f817823e939261c05113b3cc5518b3fff1d061e66e8fcd5703504259f2b"; + sha256 = "064e2ca29bd5c1d63bae872d4419b537d5a75bec75a602847a115da15a0dcfae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/th/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/th/thunderbird-91.3.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "268473436cc5230bc60b38c0678eaa71c64b5f9c3780120df51c1063790e1855"; + sha256 = "791adf04802aca3323c4a7659a83ca3affa9b93c1ae9a011447d6ad638f256df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/tr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/tr/thunderbird-91.3.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "79bad44e8e9dd7962d67b395d27c046d84c50f3eb66c53bc10de8a9c3d94a059"; + sha256 = "494fa955b325df483902df74c99e0a5a24c50670bcac7f62d5da5989b4c3555f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/uk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/uk/thunderbird-91.3.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c363f700537f3a466fb438ec4339b5e83b60c721faa647b4ab77c907ab9b1f21"; + sha256 = "aaf7fd5dd2c2ad95cf0ea5333a59e6f953e36ad2b19b0a24cd42075ff6a96e44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/uz/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/uz/thunderbird-91.3.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2de957d36eb6c2b5a7d33d6a06e9f4f1072981fd8530aa18d609a892f963c975"; + sha256 = "5ae7dee3ae3c33a0278c5b10401be741ed91d2cef3d00c9e6686d065830e0f32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/vi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/vi/thunderbird-91.3.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "5006d6c79aff928e307a92eb3867364f206ee1d872e275d3ebf63b9a4cf286de"; + sha256 = "455183213bfc0936a71c3f8fd35d4b753cfafb5c72df514232df97b2af75f10f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/zh-CN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/zh-CN/thunderbird-91.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4893ea232fa746efc32cb0d84800b46fbdffb49a13fbc244559ca0382561ebca"; + sha256 = "13b600caa35aae9e6d82b7969afeb6951f2d2824a4c5af33eecf7b004e421ebd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/zh-TW/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/zh-TW/thunderbird-91.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "37ad46134d268639514eeb267a89aeb20fc318bde923b9eb552c281b23ae153e"; + sha256 = "4f01236b849f03599df14efc1f4cf7519077b72697758f41c69ce84a084ac37e"; } ]; } -- cgit 1.4.1 From 18cf5c8cacb7ed2e4e9437a69b273167dce3701e Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 3 Nov 2021 09:14:01 +0900 Subject: thunderbird: 91.2.1 -> 91.3.0 --- pkgs/applications/networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 9c0359ea558..4bae5387255 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.2.1"; + version = "91.3.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "3152f20ad5f0fd3ce2c1672e91f07ab8921ffb5ecf487e6b0d7d7464445c8d8df106eea0bd8d912ffa84ab0ad403dfcfb19be97f50a015150c9091201a0dff6d"; + sha512 = "938de817ed2cad90f665559da1dfc266f34b6ca2e688ee364112edfdb1167183a8225132ed50b672ceb14402be933be82fd1ef8b46f103cdf1534a403fb472d9"; }; patches = [ ]; -- cgit 1.4.1 From e62af5f764d49637ac1d0b7cae22bed056053ec8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 3 Nov 2021 11:32:26 +0100 Subject: lowdown: 0.9.2 -> 0.10.0 https://github.com/kristapsdz/lowdown/blob/d8e4f9b35eaedc214784788d67abad64c33805de/versions.xml#L1208-L1226 --- pkgs/tools/typesetting/lowdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 32907ea3fb7..1cb9c8d4017 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.9.2"; + version = "0.10.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "2dnjyx3q46n7v1wl46vfgs9rhb3kvhijsd3ydq6amdf6vlf4mf1zsiakd5iycdh0i799zq61yspsibc87mcrs8l289lnwl955avs068"; + sha512 = "3gq6awxvkz2hb8xzcwqhdhdqgspvqjfzm50bq9i29qy2iisq9vzb91bdp3f4q2sqcmk3gms44xyxyn3ih2hwlzsnk0f5prjzyg97fjj"; }; nativeBuildInputs = [ which ] -- cgit 1.4.1 From 788f68625f0db040efe1e910d6702ebda53fc90b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 14:59:05 +0000 Subject: minio: 2021-09-15T04-54-25Z -> 2021-10-27T16-29-42Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 7fba57a94be..693d5fc280f 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-09-15T04-54-25Z"; + version = "2021-10-27T16-29-42Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-h1RuYRduCZFCklwa/gvkTZXTi71UDb8ofMPb+X9KIuA="; + sha256 = "sha256-U/1NuWyNX0OUrtysV3ShvbyxiSiYzMFNK3lmAVs6D3Y="; }; - vendorSha256 = "sha256-ccqa5ltblk1Z/RRJkC1h+EpkxylWdKXfNRYOeOzrPb4="; + vendorSha256 = "sha256-GLooogUglKxEk7X9UI4VZvj+mJ9LXLZEjFsxCpzm61I="; doCheck = false; -- cgit 1.4.1 From 2f94a86706cc9fc4cc770edc2c2fa22e961a0a6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 15:02:51 +0000 Subject: minio-client: 2021-09-02T09-21-27Z -> 2021-10-07T04-19-58Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index e36390f8527..e4b91157451 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-09-02T09-21-27Z"; + version = "2021-10-07T04-19-58Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-6G0MyeDYc8Y6eib2T+2VB5mDjyO13FdBsufy57osIEk="; + sha256 = "sha256-FF4blsNzr2M/ZZ2epTBhFkoj6s9Iw5GGXY65mKftojk="; }; - vendorSha256 = "sha256-J1khnNTiHkTPRjNlU2yQu8b+bwKP/KBF1KxTIvGLs+U="; + vendorSha256 = "sha256-GFxB5Gxnc6m91EjF2z108J1WmggCQrUhxwEA+Sih+94="; subPackages = [ "." ]; -- cgit 1.4.1 From 60461a594b1117da57d94da7f6eafba6b5d5aede Mon Sep 17 00:00:00 2001 From: Fabián Heredia Montiel Date: Wed, 3 Nov 2021 11:02:31 -0600 Subject: metals: 0.10.8 → 0.10.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index fc074da137a..a5b8540db45 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.8"; + version = "0.10.9"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-K/Pjo5VD9w4knelK0YwXFoZOzJDzjzlMjHF6fJZo524="; + outputHash = "sha256-Z0wngo7FP5sHpmPkTwitqTvNL0IEqqWwccy3mZpTIKU="; }; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From 0c14a3a2cafa7daa6f136b060158a99d293e36dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 19:20:26 +0000 Subject: packer: 1.7.6 -> 1.7.8 --- pkgs/development/tools/packer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index eafa2b7b85d..aea34c5d57c 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "packer"; - version = "1.7.6"; + version = "1.7.8"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-nZeOtV6sbgzUhDOlWJ5eLzOh0gsaukXFrPg3y8x9ce4="; + sha256 = "sha256-VLHibkyuB8H2zfUCAuk7lBKbW5bl2kJOkwpo/iqsdm8="; }; - vendorSha256 = "sha256-zg4mVFvP/SciCLDF9FopqzeiE5dfpxfZJ6BYjcj2BZ0="; + vendorSha256 = "sha256-NB3oD4IB2xC9+d2eghPa1hnJM7Eop88zvRFlHdQDn38="; subPackages = [ "." ]; -- cgit 1.4.1 From ff0434ecfe02220815c694df55875e7e862391d4 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 3 Nov 2021 22:09:47 +0000 Subject: noto-fonts-emoji-blob-bin: 2019-06-14-Emoji-12 -> 14.0.1 Also just use fetchurl --- pkgs/data/fonts/noto-fonts/default.nix | 39 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 27e414b12e2..bb82a33abef 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -170,27 +170,28 @@ in }; }; - noto-fonts-emoji-blob-bin = stdenv.mkDerivation rec { - pname = "noto-fonts-emoji-blob-bin"; - version = "2019-06-14-Emoji-12"; - - src = fetchurl { + noto-fonts-emoji-blob-bin = + let + pname = "noto-fonts-emoji-blob-bin"; + version = "14.0.1"; + in + fetchurl { + name = "${pname}-${version}"; url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; - sha256 = "0snvymglmvpnfgsriw2cnnqm0f4llav0jvzir6mpd17mqqhhabbh"; - }; + sha256 = "sha256-wSH9kRJ8y2i5ZDqzeT96dJcEJnHDSpU8bOhmxaT+UCg="; - dontUnpack = true; - - installPhase = '' - install -D $src $out/share/fonts/blobmoji/Blobmoji.ttf - ''; + downloadToTemp = true; + recursiveHash = true; + postFetch = '' + install -Dm 444 $downloadedFile $out/share/fonts/blobmoji/Blobmoji.ttf + ''; - meta = with lib; { - description = "Noto Emoji with extended Blob support"; - homepage = "https://github.com/C1710/blobmoji"; - license = with licenses; [ ofl asl20 ]; - platforms = platforms.all; - maintainers = with maintainers; [ rileyinman ]; + meta = with lib; { + description = "Noto Emoji with extended Blob support"; + homepage = "https://github.com/C1710/blobmoji"; + license = with licenses; [ ofl asl20 ]; + platforms = platforms.all; + maintainers = with maintainers; [ rileyinman jk ]; + }; }; - }; } -- cgit 1.4.1 From 37d85bed1d030305bd9b9b06e5fa558547146e3c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 4 Nov 2021 01:38:20 +0100 Subject: bdf2psf: 1.205 -> 1.207 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 72f142105b7..06b8aa4d960 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.205"; + version = "1.207"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-elFmsqtndo4ReR4IoyhC56k0PMqy5QrUxOGUQLGeu0I="; + sha256 = "0k9dv4s44k1khrhr6acsb2sqr5iq3d03ync82nzan5j7mckzs76v"; }; nativeBuildInputs = [ dpkg ]; -- cgit 1.4.1 From 3756460dd08674db4a72b5f1e7e01cdaa9858f28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Nov 2021 11:52:31 +0100 Subject: python3Packages.aiogithubapi: 21.8.1 -> 21.11.0 --- pkgs/development/python-modules/aiogithubapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 7ec85d90f7d..9249df059bf 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "21.8.1"; + version = "21.11.0"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "1l59bb956gymi2dkgg88mr0nc80wqvw2dv69qf4f1xr3jxy03qa2"; + sha256 = "sha256-sxWgLd+oQv9qNOpyAYXsBcqGbo/ugNXzGF5nbdcNLFw="; }; postPatch = '' -- cgit 1.4.1 From 2012a63a7c14a26b3ddbac8dfdbc1e92dd9babec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Nov 2021 12:05:06 +0100 Subject: python3Packages.velbus-aio: 2021.10.7 -> 2021.11.0 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index ac389b0912d..1770472a2d8 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2021.10.7"; + version = "2021.11.0"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-xhJKgOOi5N2oxTpy5KlRtmtb2nepp/k7TvEppkIbtWA="; + sha256 = "sha256-4N1wamy0nqAmVezOd3kBicUAZXRob8gNA89N3fY1Y7o="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From a13bfe7fbc27bacd054ad08d6f840cf1e0acc3c8 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 4 Nov 2021 09:37:07 -0700 Subject: roon-server: 1.8-831 -> 1.8-846 --- nixos/modules/services/audio/roon-server.nix | 2 +- pkgs/servers/roon-server/default.nix | 78 ++++++++++++++++++---------- 2 files changed, 51 insertions(+), 29 deletions(-) diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix index 42da5a10017..566c7cae42c 100644 --- a/nixos/modules/services/audio/roon-server.nix +++ b/nixos/modules/services/audio/roon-server.nix @@ -42,7 +42,7 @@ in { environment.ROON_DATAROOT = "/var/lib/${name}"; serviceConfig = { - ExecStart = "${pkgs.roon-server}/start.sh"; + ExecStart = "${pkgs.roon-server}/bin/RoonServer"; LimitNOFILE = 8192; User = cfg.user; Group = cfg.group; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index d97a5df42e1..16a47795d3e 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -5,14 +5,16 @@ , fetchurl , ffmpeg , freetype +, icu66 +, krb5 , lib , makeWrapper , stdenv -, zlib +, openssl }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-831"; + version = "1.8-846"; src = let @@ -20,47 +22,67 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-SeMSC7K6DV7rVr1w/SqMnLvipoWbypS/gJnSZmpfXZk="; + sha256 = "sha256-BoHvODaAcK5b4/syOm3vpOTpq9ETovpWKUqG+UGr2e0="; }; buildInputs = [ alsa-lib - alsa-utils - cifs-utils - ffmpeg freetype - zlib + krb5 + stdenv.cc.cc.lib ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - installPhase = '' - runHook preInstall - mkdir -p $out - mv * $out - runHook postInstall - ''; + propagatedBuildInputs = [ alsa-utils cifs-utils ffmpeg ]; - postFixup = + installPhase = let - linkFix = bin: '' - sed -i '/ulimit/d' ${bin} - sed -i '/ln -sf/d' ${bin} - ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} - ''; - wrapFix = bin: '' - wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]} + # NB: While this might seem like odd behavior, it's what Roon expects. The + # tarball distribution provides scripts that do a bunch of nonsense on top + # of what wrapBin is doing here, so consider it the lesser of two evils. + # I didn't bother checking whether the symlinks are really necessary, but + # I wouldn't put it past Roon to have custom code based on the binary + # name, so we're playing it safe. + wrapBin = binPath: '' + ( + binDir="$(dirname "${binPath}")" + binName="$(basename "${binPath}")" + dotnetDir="$out/RoonDotnet" + + ln -sf "$dotnetDir/dotnet" "$dotnetDir/$binName" + rm "${binPath}" + makeWrapper "$dotnetDir/$binName" "${binPath}" \ + --add-flags "$binDir/$binName.dll" \ + --argv0 "$binName" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ icu66 openssl ]}" \ + --prefix PATH : "$dotnetDir" \ + --run "cd $binDir" \ + --set DOTNET_ROOT "$dotnetDir" + ) ''; in '' - ${linkFix "$out/Appliance/RAATServer"} - ${linkFix "$out/Appliance/RoonAppliance"} - ${linkFix "$out/Server/RoonServer"} + runHook preInstall + mkdir -p $out + mv * $out + + rm $out/check.sh + rm $out/start.sh + rm $out/VERSION + + ${wrapBin "$out/Appliance/RAATServer"} + ${wrapBin "$out/Appliance/RoonAppliance"} + ${wrapBin "$out/Server/RoonServer"} + + mkdir -p $out/bin + makeWrapper "$out/Server/RoonServer" "$out/bin/RoonServer" --run "cd $out" + + # This is unused and depends on an ancient version of lttng-ust, so we + # just patch it out + patchelf --remove-needed liblttng-ust.so.0 $out/RoonDotnet/shared/Microsoft.NETCore.App/5.0.0/libcoreclrtraceptprovider.so - sed -i '/which avconv/c\ WHICH_AVCONV=1' $out/check.sh - sed -i '/^check_ulimit/d' $out/check.sh - ${wrapFix "$out/check.sh"} - ${wrapFix "$out/start.sh"} + runHook postInstall ''; meta = with lib; { -- cgit 1.4.1 From 6d8923985704b1996b311fd946b983014ba2bae0 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 4 Nov 2021 09:49:03 -0700 Subject: linuxKernel.kernels.linux_xanmod: 5.14.15 -> 5.14.16 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index e21530cba4f..f28f6c0cef5 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.14.15"; + version = "5.14.16"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-Z0A2D2t9rDUav4VpG3XdI13LConfWWs7PtsVfLyEQI8="; + sha256 = "sha256-ro7WnN0BPxW/8sajUyGTnvmbemKJEadSBcFmjZ+Wtrs="; }; structuredExtraConfig = with lib.kernel; { -- cgit 1.4.1 From d3610834b9b8c92e626aa726dd94a132f46edf48 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Thu, 4 Nov 2021 16:51:20 +0000 Subject: python3Packages.editdistance: fix broken version tag --- pkgs/development/python-modules/editdistance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix index a831570363d..41b20ca8969 100644 --- a/pkgs/development/python-modules/editdistance/default.nix +++ b/pkgs/development/python-modules/editdistance/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "roy-ht"; repo = pname; - rev = version; - sha256 = "1qajskfyx2ki81ybksf0lgl1pdyw7al4ci39zrj66ylsn8fssg89"; + rev = "v${version}"; + sha256 = "17xkndwdyf14nfxk25z1qnhkzm0yxw65fpj78c01haq241zfzjr5"; }; nativeBuildInputs = [ cython ]; -- cgit 1.4.1 From 9f8c7459a7fcd2d24da15e6220ef4bd0c7182efa Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Thu, 4 Nov 2021 17:16:02 +0000 Subject: python3Packages.tubeup: fix dependencies --- pkgs/development/python-modules/tubeup/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 49a29356559..65553dc1883 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , internetarchive , fetchPypi -, youtube-dl +, yt-dlp , docopt , isPy27 }: @@ -19,10 +19,12 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" + substituteInPlace setup.py \ + --replace "docopt==0.6.2" "docopt" \ + --replace "internetarchive==2.0.3" "internetarchive" ''; - propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; + propagatedBuildInputs = [ internetarchive docopt yt-dlp ]; pythonImportsCheck = [ "tubeup" ]; -- cgit 1.4.1 From 11a2832dc5042910ed421f51c2c5f419b407042f Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 4 Nov 2021 18:19:25 +0100 Subject: python3Packages.nassl: 4.0.0 -> 4.0.1 --- pkgs/development/python-modules/nassl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 97033224c14..0d3716ca289 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -70,14 +70,14 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "4.0.0"; + version = "4.0.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-6lk2YfI9km10YbJAn38fvo9qa4iXcByL+udCsDe+kvU="; + hash = "sha256-QzO7ABh2weBO6NVFIj7kZpS8ashbDGompuvdKteJeUc="; }; postPatch = let -- cgit 1.4.1 From 076563ebac229d5070b1148faf5a633bc3071804 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Thu, 4 Nov 2021 18:43:25 +0100 Subject: sage: import sympy 1.9 update patch --- pkgs/applications/science/math/sage/sage-src.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 3ba21cf6c8b..ed10121e5cd 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -110,6 +110,14 @@ stdenv.mkDerivation rec { rev = "9808325853ba9eb035115e5b056305a1c9d362a0"; sha256 = "sha256-gJSqycCtbAVr5qnVEbHFUvIuTOvaxFIeffpzd6nH4DE="; }) + + # https://trac.sagemath.org/ticket/32420 + (fetchSageDiff { + base = "9.5.beta2"; + name = "sympy-1.9-update.patch"; + rev = "beed4e16aff32e47d0c3b1c58cb1e2f4c38590f8"; + sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; -- cgit 1.4.1 From 5c6c2600baff67d12d34e4bcf9096fe0f97df452 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 4 Nov 2021 18:03:14 +0100 Subject: arduino: 1.8.13 -> 1.8.16 --- .../embedded/arduino/arduino-core/default.nix | 13 +++-- .../embedded/arduino/arduino-core/downloads.nix | 58 ++++++++++++---------- 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 529be6e2a56..a02739cf7d9 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -80,14 +80,14 @@ let + lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { - version = "1.8.13"; + version = "1.8.16"; name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = version; - sha256 = "0qg3qyj1b7wbaw2rsfly7nf3115h26nskl4ggrn6plhx272ni84p"; + sha256 = "sha256-6d+y0Lgr+h0qYpCsa/ihvSMNuAdRMNQRuxZFpkWLDvg="; }; teensyduino_version = "153"; @@ -105,14 +105,13 @@ stdenv.mkDerivation rec { url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = { - linux64 = "1bdlk51dqiyg5pw23hs8rfv8nrjqy0jqfl89h1466ahahpnd080v"; - linux32 = "0mgsw9wpwv1pgs2jslzflh7zf4ggqjgcd55hmdzrj0dvgkyw4cr2"; - linuxarm = "08n4lpak3i7yfyi0085j4nq14gb2n7zx85wl9drp8gaavxnfbp5f"; - linuxaarch64 = "0m4nhykzknm2hdpz1fhr2hbpncry53kvzs9y5lgj7rx3sy6ygbh7"; + linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po="; + linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE="; + linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM="; + linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; - # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS # so 'save as...' works: diff --git a/pkgs/development/embedded/arduino/arduino-core/downloads.nix b/pkgs/development/embedded/arduino/arduino-core/downloads.nix index 76fa7664f0e..14ce93d2c50 100644 --- a/pkgs/development/embedded/arduino/arduino-core/downloads.nix +++ b/pkgs/development/embedded/arduino/arduino-core/downloads.nix @@ -83,17 +83,17 @@ url = "https://github.com/arduino-libraries/SD/archive/1.2.4.zip"; sha256 = "123g9px9nqcrsx696wqwzjd5s4hr55nxgfz95b7ws3v007i1f3fz"; }; - "build/Servo-1.1.6.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Servo/archive/1.1.6.zip"; - sha256 = "1z9k9lxzj5d3f8h9hy86f4k5wgfr2a9zcvjh76qmpvv6clcv3js3"; + "build/Servo-1.1.8.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Servo/archive/1.1.8.zip"; + sha256 = "sha256-8mfRQG/HIRVvdiRApjMib6n1ENqAB63vGsxe6vwndeU="; }; "build/LiquidCrystal-1.0.7.zip" = fetchurl { url = "https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip"; sha256 = "1wrxrqz3n4yrj9j1a2b7pdd7a1rlyi974ra7crv5amjng8817x9n"; }; - "build/Adafruit_Circuit_Playground-1.10.4.zip" = fetchurl { - url = "https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.10.4.zip"; - sha256 = "194az5pxxzs0wg4ng7w0zqrdw93qdyv02y0q2yy57dr4kwfrm6nl"; + "build/Adafruit_Circuit_Playground-1.11.3.zip" = fetchurl { + url = "https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.11.3.zip"; + sha256 = "sha256-YL4ZAi9Fno+rG/bAdjxnXIglfZnbN6KpXFpj23Bf3LQ="; }; "build/libastylej-2.05.1-5.zip" = fetchurl { url = "https://downloads.arduino.cc/libastylej-2.05.1-5.zip"; @@ -103,20 +103,24 @@ url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2-2.zip"; sha256 = "0sqzwp1lfjy452z3d4ma5c4blwsj7za72ymxf7crpq9dh9qd8f53"; }; - "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip" = fetchurl { - url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip"; - sha256 = "0bs5qdglsfc2q5c48m6wdjpzhz4ya4askh1g8364dp6p7jmg6w0d"; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.12.0/WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip"; + sha256 = "sha256-6RM7Sr/tk5PVeonhzaa6WvRaz+7av+MhSYKPAinaOkg="; }; "build/avr-1.8.3.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2"; sha256 = "051wnc0nmsmxvvs4c79zvjag33yx5il2pz2j7qyjsxkp4jc9p2ny"; }; + "build/arduino-examples-1.9.1.zip" = fetchurl { + url = "https://github.com/arduino/arduino-examples/archive/refs/tags/1.9.1.zip"; + sha256 = "sha256-kAxIhYQ8P2ULTzQwi6bUXXEXJ53mKNgQxuwX3QYhNoQ="; + }; } // optionalAttrs (system == "x86_64-linux") { - "build/arduino-builder-linux64-1.5.4.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.4.tar.bz2"; - sha256 = "1cgvwlvxzzpjaj4njz1mrsif27l26dwkz9c7gbhdj0lvlk3xsa7s"; + "build/arduino-builder-linux64-1.6.1.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.6.1.tar.bz2"; + sha256 = "sha256-QUHuC+rE5vrMX8+Bkfuw+59UQdJAekeoaZd1Mch7UXE="; }; "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2"; @@ -133,9 +137,9 @@ } // optionalAttrs (system == "i686-linux") { - "build/arduino-builder-linux32-1.5.2.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.5.2.tar.bz2"; - sha256 = "1slzw8fzxkqsp2izjisjd1rxxbqkrq6n72jc4frk5z2gdm6zfa0l"; + "build/arduino-builder-linux32-1.6.1.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.6.1.tar.bz2"; + sha256 = "sha256-GX2oGUGYYyatLroASBCBOGjsdCws06907O+O5Rz7Kls="; }; "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-i686-pc-linux-gnu.tar.bz2"; @@ -152,9 +156,9 @@ } // optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.5.2-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.5.2-signed.tar.bz2"; - sha256 = "1pa795vwly1z9h1bp5qzbx2c2pq4n6p7ab5ivhmd3q89z0ywyqgz"; + "build/arduino-builder-macosx-1.6.1-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.6.1-signed.tar.bz2"; + sha256 = "sha256-icMXwovzT2UQAKry9sWyRvcNxPXaFdltAPyW/DDVEFA="; }; "build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2"; @@ -175,13 +179,13 @@ } // optionalAttrs (system == "aarch64-linux") { - "build/arduino-builder-linuxaarch64-1.5.2.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.5.2.tar.bz2"; - sha256 = "14k7h7anjizbs2h04phw784slpfbi6hch9skvhy5ll805dmr24ci"; + "build/arduino-builder-linuxaarch64-1.6.1.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.6.1.tar.bz2"; + sha256 = "sha256-BLcAIvGt0OQfjN87W1aLpLAQchhdFHoBqJPCcIWyHxQ="; }; - "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-aarch64-pc-linux-gnu.tar.bz2"; - sha256 = "040cspc41iv59fb2g9fzc6w5523dvqa1bavxni7s8w731ccp176x"; + "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino7-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino7-aarch64-pc-linux-gnu.tar.bz2"; + sha256 = "sha256-A9Miud9toXKJ6efGIzw0qFNdnGRcGe/HcroZ5WkU8zk="; }; "build/linux/avrdude-6.3.0-arduino17-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-aarch64-pc-linux-gnu.tar.bz2"; @@ -194,9 +198,9 @@ } // optionalAttrs (builtins.match "armv[67]l-linux" system != null) { - "build/arduino-builder-linuxarm-1.5.2.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.5.2.tar.bz2"; - sha256 = "1vs2s5px07jb2sdv83qxkf9lxmsy8j4dm7bn3vpw5dcjqd3qdyww"; + "build/arduino-builder-linuxarm-1.6.1.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.6.1.tar.bz2"; + sha256 = "sha256-VtJxhRaOOKdBxmTWjTYnSPAXl728hMksBKSKS49qiMU="; }; "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-arm-linux-gnueabihf.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-arm-linux-gnueabihf.tar.bz2"; -- cgit 1.4.1 From 80b0bf1042e7f75d45f01e611bdf686646851f5c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 4 Nov 2021 20:25:28 +0100 Subject: teensyduino: 1.53 -> 1.55 --- pkgs/development/embedded/arduino/arduino-core/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index a02739cf7d9..a0184eb94e5 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -90,14 +90,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-6d+y0Lgr+h0qYpCsa/ihvSMNuAdRMNQRuxZFpkWLDvg="; }; - teensyduino_version = "153"; + teensyduino_version = "155"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = { - linux64 = "02qgsj4h4zrjxkcclx7clsqbqd699kg0dq1xxa9hbj3vfnddjv1f"; - linux32 = "14xaff8xj176ih8ifdvxsly5xgjjm82dqbn7lqq81a43i0svjjyn"; - linuxarm = "0xpg9axa6dqyhccm9cpvsv2al7rgwy4gv2l8b2kffvn974dl5759"; - linuxaarch64 = "1lyn4zy4l5mml3c19fw6i2pk1ypnq6mgjmxmzk9d54wpf6n3j5dk"; + linux64 = "sha256-DypCbCm4RKYgnFJRwoHyPht6dFG48YvWM4RzEDdJE6U="; + linux32 = "sha256-MJ4xsTAZPO8BhO/VWSjBAjBVLrKM+3PNi1fiF8dsuVQ="; + linuxarm = "sha256-x5JdYflLThohos9RTAWt4XrzvksB7VWfXTKqgXZ1d6Q="; + linuxaarch64 = "sha256-N18nvavEMhvt2jOrdI+tsXtbWIdsj1n4aMVeaaBlcT4="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; # Used because teensyduino requires jars be a specific size -- cgit 1.4.1 From 1549123435034220872ddf8e11edbad56b5cd9b3 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 4 Nov 2021 12:59:32 -0700 Subject: thefuck: fix build on darwin --- pkgs/tools/misc/thefuck/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 13509af98c0..a3aa31d4ded 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication +{ lib, stdenv, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six , go, mock, pytestCheckHook, pytest-mock }: @@ -18,6 +18,23 @@ buildPythonApplication rec { checkInputs = [ go mock pytestCheckHook pytest-mock ]; + disabledTests = lib.optional stdenv.isDarwin [ + "test_settings_defaults" + "test_from_file" + "test_from_env" + "test_settings_from_args" + "test_get_all_executables_exclude_paths" + "test_with_blank_cache" + "test_with_filled_cache" + "test_when_etag_changed" + "test_for_generic_shell" + "test_on_first_run" + "test_on_run_after_other_commands" + "test_when_cant_configure_automatically" + "test_when_already_configured" + "test_when_successfully_configured" + ]; + meta = with lib; { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; -- cgit 1.4.1 From 7bffde6dbc8900ac6b50ff653110674bcaad9343 Mon Sep 17 00:00:00 2001 From: Eli Flanagan Date: Thu, 4 Nov 2021 16:19:01 -0400 Subject: docs: fix Rust language typos I tried to use aspell following https://github.com/NixOS/nixpkgs/issues/34308#issuecomment-361431632 but there are too many false positives! --- doc/languages-frameworks/rust.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 9962e7520bf..28540a91670 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -411,7 +411,7 @@ you of the correct hash. `rustPlatform` provides the following hooks to automate Cargo builds: -* `cargoSetupHook`: configure Cargo to use depenencies vendored +* `cargoSetupHook`: configure Cargo to use dependencies vendored through `fetchCargoTarball`. This hook uses the `cargoDeps` environment variable to find the vendored dependencies. If a project already vendors its dependencies, the variable `cargoVendorDir` can @@ -672,7 +672,7 @@ Some crates require external libraries. For crates from `defaultCrateOverrides` package in nixpkgs itself. Starting from that file, one can add more overrides, to add features -or build inputs by overriding the hello crate in a seperate file. +or build inputs by overriding the hello crate in a separate file. ```nix with import {}; -- cgit 1.4.1 From a163ebf80549767f66ff155cb86a77f9f8de974e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 4 Nov 2021 21:36:38 +0100 Subject: acsccid: Run nixpkgs-fmt --- pkgs/tools/security/acsccid/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index da461a96957..cded7ccf9da 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoconf , automake -- cgit 1.4.1 From b4fb63fa2bb65d2d07ab2dfafe4f532ec3360859 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 4 Nov 2021 21:36:55 +0100 Subject: acsccid: Remove myself as maintainer I don't use it anymore. --- pkgs/tools/security/acsccid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index cded7ccf9da..f471393b2cf 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; homepage = src.meta.homepage; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ roberth ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } -- cgit 1.4.1 From beb78c946893ce5910bfe05e61351ff2dcb32c34 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 4 Nov 2021 21:43:27 +0100 Subject: telepresence2: 2.4.0 -> 2.4.6 --- pkgs/tools/networking/telepresence2/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index e7ae903e868..9a2e1b4bbc7 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -1,17 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, kubernetes-helm }: buildGoModule rec { pname = "telepresence2"; - version = "2.4.0"; + version = "2.4.6"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "1v2jkhdlyq37akqyhb8mwsh7rjdv2fjw8kyzys3dv04k3dy5sl0f"; + sha256 = "09w7yk7jk5m6clq3drbgdr61w60b21jmfd635brfahms8pykmmzl"; }; - vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; + # The Helm chart is go:embed'ed as a tarball in the binary. + # That tarball is generated by running ./build-aux/package_embedded_chart/main.go, + # which tries to invoke helm from tools/bin/helm. + # Oh well… + preBuild = '' + mkdir -p tools/bin + ln -sfn ${kubernetes-helm}/bin/helm tools/bin/helm + go run ./build-aux/package_embedded_chart/main.go ${src.rev} + ''; + + vendorSha256 = "0przkcqaf56a0sgan2xxqfpbs9nbmq4brwdv1qnag7i9myzvixxb"; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" -- cgit 1.4.1 From 4825cb2cb5cf099acd618856a5e46aa614bd3d1a Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Thu, 4 Nov 2021 14:40:53 -0600 Subject: credslayer: remove failing tests, add missing runtime dependency --- pkgs/tools/security/credslayer/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/security/credslayer/default.nix b/pkgs/tools/security/credslayer/default.nix index 0de8d37c0db..223f9dd70eb 100644 --- a/pkgs/tools/security/credslayer/default.nix +++ b/pkgs/tools/security/credslayer/default.nix @@ -29,10 +29,20 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Requires a telnet setup "test_telnet" + # stdout has all the correct data, but the underlying test code fails + # functionally everything seems to be intact + "http_get_auth" + "test_http_post_auth" + "test_ntlmssp" ]; pythonImportsCheck = [ "credslayer" ]; + postInstall = '' + wrapProgram $out/bin/credslayer \ + --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}" + ''; + meta = with lib; { description = "Extract credentials and other useful info from network captures"; homepage = "https://github.com/ShellCode33/CredSLayer"; -- cgit 1.4.1 From e0cfb5db6767308dbe3f58122be2507b49782e10 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 4 Nov 2021 22:23:37 +0100 Subject: lavalauncher: 2.0.0 -> 2.1.1, fix broken build --- pkgs/applications/misc/lavalauncher/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lavalauncher/default.nix b/pkgs/applications/misc/lavalauncher/default.nix index 533d3757a6e..f6071978b86 100644 --- a/pkgs/applications/misc/lavalauncher/default.nix +++ b/pkgs/applications/misc/lavalauncher/default.nix @@ -7,24 +7,26 @@ , scdoc , cairo , librsvg +, libxkbcommon , wayland , wayland-protocols }: stdenv.mkDerivation rec { pname = "lavalauncher"; - version = "2.0.0"; + version = "2.1.1"; src = fetchgit { url = "https://git.sr.ht/~leon_plickat/lavalauncher"; rev = "v${version}"; - sha256 = "MXREycR4ZetTe71ZwEqyozMJN9OLTDvU0W4J8qkTQAs="; + sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ cairo librsvg + libxkbcommon wayland wayland-protocols ]; -- cgit 1.4.1 From 47d8506f90c0b9fc9f015bba65fc873139094b69 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 4 Nov 2021 17:24:46 -0400 Subject: kodi.packages.libretro-genplus: init at 1.7.4.31 --- .../kodi-packages/libretro-genplus/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/video/kodi-packages/libretro-genplus/default.nix diff --git a/pkgs/applications/video/kodi-packages/libretro-genplus/default.nix b/pkgs/applications/video/kodi-packages/libretro-genplus/default.nix new file mode 100644 index 00000000000..064375107e2 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/libretro-genplus/default.nix @@ -0,0 +1,31 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }: + +buildKodiBinaryAddon rec { + pname = "kodi-libretro-genplus"; + namespace = "game.libretro.genplus"; + version = "1.7.4.31"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "game.libretro.genplus"; + rev = "${version}-${rel}"; + sha256 = "0lcii32wzpswjjkwhv250l238g31akr66dhkbv8gj4v1i4z7hry8"; + }; + + extraCMakeFlags = [ + "-DGENPLUS_LIB=${genesis-plus-gx}/lib/retroarch/cores/genesis_plus_gx_libretro.so" + ]; + + extraBuildInputs = [ genesis-plus-gx ]; + propagatedBuildInputs = [ + libretro + ]; + + meta = with lib; { + homepage = "https://github.com/kodi-game/game.libretro.genplus"; + description = "Genesis Plus GX GameClient for Kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 53730739622..e7c848ab556 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -3,7 +3,7 @@ with lib; let - inherit (libretro) snes9x; + inherit (libretro) genesis-plus-gx snes9x; in let self = rec { @@ -74,6 +74,8 @@ let self = rec { libretro = callPackage ../applications/video/kodi-packages/libretro { }; + libretro-genplus = callPackage ../applications/video/kodi-packages/libretro-genplus { inherit genesis-plus-gx; }; + libretro-snes9x = callPackage ../applications/video/kodi-packages/libretro-snes9x { inherit snes9x; }; jellyfin = callPackage ../applications/video/kodi-packages/jellyfin { }; -- cgit 1.4.1 From 98749ffa5fbfcf733ef1d82f9e75791b644f233a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 4 Nov 2021 15:20:06 -0700 Subject: nixos/tests/wine: syntax fix --- nixos/tests/wine.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 30d417ce9fa..c46c7d338b2 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -1,7 +1,6 @@ -{ system ? builtins.currentSystem, pkgs ? import ../.. { - inherit system; - config = { }; -}, }: +{ system ? builtins.currentSystem +, pkgs ? import ../.. { inherit system; config = { }; } +}: let inherit (pkgs.lib) concatMapStrings listToAttrs; -- cgit 1.4.1 From 2b1b6105830424ce5d4567e9ac95cf3205d588f7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 4 Nov 2021 15:32:34 -0700 Subject: hqplayerd: 4.26.2-69 -> 4.27.0-70 --- pkgs/servers/hqplayerd/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index a461608badf..ecd3063e093 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -11,6 +11,7 @@ , lib , libgmpris , llvmPackages_10 +, mpg123 , rpmextract , wavpack @@ -44,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.26.2-69"; + version = "4.27.0-70"; src = fetchurl { - url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-zxUVtOi4fN3EuCbzH/SEse24Qz7/0jozzDX1yW8bhCU="; + url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm"; + sha256 = "sha256-12EMKkMMMcQZwgvK0YjuHknv2JLqU3REcJUTPUmYZ6A="; }; unpackPhase = '' @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { gupnp-av_0_12 libgmpris llvmPackages_10.openmp + mpg123 wavpack ]; -- cgit 1.4.1