From c49a70ffff40a59997c05658e2dc4cba2e4e2d3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 00:36:44 +0000 Subject: [PATCH 001/132] ocamlPackages.ctypes: 0.20.0 -> 0.20.1 --- pkgs/development/ocaml-modules/ctypes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 6e9aa98e1cca..e1bfab4d16e1 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ctypes"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-ctypes"; rev = version; - sha256 = "sha256-fr60H/hiSVjEg11qM8LF1Y5CotS3FEyFdCcIh0A0uI4="; + sha256 = "sha256-H1QR0MJCqRdXxRufCA663wzTNWQ8MYYAy2nz/XHCn0Y="; }; nativeBuildInputs = [ pkg-config ocaml findlib ]; From f043865fc3bd5a65df0637150d6af4a7cd172bef Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Wed, 26 Oct 2022 17:40:15 +0200 Subject: [PATCH 002/132] ddnet: 16.4 -> 16.5 --- pkgs/games/ddnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index eed383a3ab1e..1b5a2785f255 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.4"; + version = "16.5"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-8t4UKytYmkELEMQ06jIj7C9cdOc5L22AnigwkGBzx20="; + sha256 = "sha256-fHe72ew+qoSyOqXU9Hs9EyecrYDjEqTm+Ii9Zja9up4="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; From 9c89d9e1fe8d32c2f91c75e9ae3f75da322b125c Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Wed, 26 Oct 2022 22:16:00 +0200 Subject: [PATCH 003/132] ddnet: remove unneeded cmakeFlags --- pkgs/games/ddnet/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 1b5a2785f255..4a1cbf08c534 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -63,9 +63,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DAUTOUPDATE=OFF" - "-GNinja" ]; postPatch = '' From 64862b650b387d98a0eeb35308211a770bcfdd72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Dec 2022 12:15:15 +0000 Subject: [PATCH 004/132] ocamlPackages.optint: 0.2.0 -> 0.3.0 --- pkgs/development/ocaml-modules/optint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix index 06729bb8799e..d98f6cf5ee2f 100644 --- a/pkgs/development/ocaml-modules/optint/default.nix +++ b/pkgs/development/ocaml-modules/optint/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { minimalOCamlVersion = "4.07"; - version = "0.2.0"; + version = "0.3.0"; pname = "optint"; src = fetchurl { url = "https://github.com/mirage/optint/releases/download/v${version}/optint-${version}.tbz"; - sha256 = "sha256-HcvgtrYDH3fbMwKMhxOP2zv5D5KRXjtmKd3rMKDTAAs="; + sha256 = "sha256-KVz/LBNLA4WxO6gdUAXZ+EG6QNSlAq7RDJl/I57xFHs="; }; meta = { From 4153a15706fc0616f5cde0a80b777b33ff23d4a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 02:03:55 +0000 Subject: [PATCH 005/132] kubedb-cli: 0.29.0 -> 0.30.0 --- pkgs/applications/networking/cluster/kubedb-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index af41b7ba9dea..d1807d1c6e0b 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-MVvhXvf/R7Cku8S4zbs1MlH4NuEwkxCsbbc2ASCF67c="; + sha256 = "sha256-i8kv/YzEWAFQJwIkwot2huIEAZYMUGQqSak4nUMRjn4="; }; vendorSha256 = null; From 7cec36f3551c27f8270da00ecba696fd5533fa7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 08:11:11 +0000 Subject: [PATCH 006/132] ocamlPackages.cairo2: 0.6.2 -> 0.6.4 --- pkgs/development/ocaml-modules/cairo2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 1801a0679b56..0b560f2004f6 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -3,11 +3,11 @@ buildDunePackage rec { pname = "cairo2"; - version = "0.6.2"; + version = "0.6.4"; src = fetchurl { url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; - sha256 = "sha256-a7P1kiVmIwT6Fhtwxs29ffgO4iexsulxUoc9cnJmEK4="; + sha256 = "sha256-QDVzUtcgXTpXNYVWQ4MMs0Xy24OP+dGaUyAYdg1GigU="; }; minimalOCamlVersion = "4.02"; From c6313c6a082749f70f5eb83c026960ce8abe25c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 16:03:06 +0000 Subject: [PATCH 007/132] sublime-merge-dev: 2078 -> 2081 --- .../applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 87ad6a287667..ceee5d6b4886 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2078"; - x64sha256 = "33oJOnsOUr9W+OGMetafaGtXUa+CHxxLjmtDoZliw0k="; + buildVersion = "2081"; + x64sha256 = "QzJP25KxczmrR5PZ9ujRSM3V+TrKqiH82plo1bTv48s="; dev = true; } {}; } From 72d43ddf528026416c84a7acf08c2922e9ce1e51 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Fri, 30 Dec 2022 10:34:59 +0000 Subject: [PATCH 008/132] zxfer: init at 1.1.7 Fixes #174660 --- pkgs/applications/system/zxfer/default.nix | 86 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 88 insertions(+) create mode 100644 pkgs/applications/system/zxfer/default.nix diff --git a/pkgs/applications/system/zxfer/default.nix b/pkgs/applications/system/zxfer/default.nix new file mode 100644 index 000000000000..b62c1262430c --- /dev/null +++ b/pkgs/applications/system/zxfer/default.nix @@ -0,0 +1,86 @@ +{ lib +, bash +, fetchFromGitHub +, installShellFiles +, coreutils +, gawk +, gnugrep +, gnused +, openssh +, resholve +, rsync +, which +, zfs +}: + +resholve.mkDerivation rec { + pname = "zxfer"; + version = "1.1.7"; + + src = fetchFromGitHub { + owner = "allanjude"; + repo = pname; + rev = "v${version}"; + hash = "sha256-11SQJcD3GqPYBIgaycyKkc62/diVKPuuj2Or97j+NZY="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + # these may point to paths on remote systems, calculated at runtime, thus we cannot fix them + # we can only set their initial values, and let them remain dynamic + postPatch = '' + substituteInPlace zxfer \ + --replace 'LCAT=""' 'LCAT=${coreutils}/bin/cat' \ + --replace 'LZFS=$( which zfs )' 'LZFS=${zfs}/bin/zfs' + ''; + + installPhase = '' + runHook preInstall + + installManPage zxfer.1m zxfer.8 + install -Dm755 zxfer -t $out/bin/ + + runHook postInstall + ''; + + solutions.default = { + scripts = [ "bin/zxfer" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + coreutils + gawk + gnugrep + gnused + openssh + rsync + which + ]; + fake.external = [ + "kldload" # bsd builtin + "kldstat" # bsd builtin + "svcadm" # solaris builtin + ]; + keep = { + "$LCAT" = true; + "$LZFS" = true; + "$PROGRESS_DIALOG" = true; + "$RZFS" = true; + "$input_optionts" = true; + "$option_O" = true; + "$option_T" = true; + }; + fix = { + "$AWK" = [ "awk" ]; + "$RSYNC" = [ "rsync" ]; + }; + execer = [ "cannot:${rsync}/bin/rsync" ]; + }; + + meta = with lib; { + description = "A popular script for managing ZFS snapshot replication"; + homepage = "https://github.com/allanjude/zxfer"; + changelog = "https://github.com/allanjude/zxfer/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with lib.maintainers; [ urandom ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f33f49a051fc..4046f5f6b815 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33847,6 +33847,8 @@ with pkgs; inherit (nodePackages) zx; + zxfer = callPackage ../applications/system/zxfer {}; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { guiModule = "zest"; fftw = fftwSinglePrec; From 910d7035d79aad8879bf76103fecc2de1f5b97c3 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 15:35:08 +0800 Subject: [PATCH 009/132] maintainers: add deepin team --- maintainers/team-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index b37d2d0a28a0..1851128b1104 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -168,6 +168,15 @@ with lib.maintainers; { shortName = "Cosmopolitan"; }; + deepin = { + members = [ + rewine + ]; + scope = "Maintain deepin desktop environment and related packages."; + shortName = "DDE"; + enableFeatureFreezePing = true; + }; + deshaw = { # Verify additions to this team with at least one already existing member of the team. members = [ From f2ab2d558c274ba37f278c87baa843bd28ed5328 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 15:37:54 +0800 Subject: [PATCH 010/132] aliases.nix: remove aliases of deepin --- pkgs/top-level/aliases.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 872b74a79d48..ba11d3618caf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -341,7 +341,6 @@ mapAliases ({ debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22 debugedit-unstable = debugedit; # Added 2021-11-22 - deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 From 099caac0a827e3b0a20521728653dd77d80a362b Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 15:39:59 +0800 Subject: [PATCH 011/132] nixos/modules/rename: dont set deepin as a removed module --- nixos/modules/rename.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index d88baac7a5d4..7ad7c505f39a 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -49,7 +49,6 @@ with lib; (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") - (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") From c4965721557b3263cf9aadb4a53946f8764725d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 09:55:43 +0000 Subject: [PATCH 012/132] rsnapshot: 1.4.4 -> 1.4.5 --- pkgs/tools/backup/rsnapshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 7a903288c671..57883c4f68e4 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rsnapshot"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz"; - sha256 = "sha256-wct8t0jFqWVsOGNivfbCZ5WXN3JKu1Bfv56UCp2YhXk="; + sha256 = "sha256-ELdeAcolUR6CZqrNSVUxl1rRqK1VYha2pXx20CizgkI="; }; propagatedBuildInputs = [perl openssh rsync logger]; From 15bfeddda5586f9757226c552a08161e5321ce5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 00:51:30 +0000 Subject: [PATCH 013/132] air: 1.40.4 -> 1.41.0 --- pkgs/development/tools/air/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 3b4103626b8b..819cb38fef08 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.40.4"; + version = "1.41.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-MipTBepFLcP3TJQtCLi/33D6HCJu4oX48tGnSGG5qho="; + hash = "sha256-31C1iNiYokClAZlk9KOVE12lFdOKJBSOwQK+zOp082k="; }; - vendorSha256 = "sha256-+hZpCIDASPerI7Wetpx+ah2H5ODjoeyoqUi+uFwR/9A="; + vendorHash = "sha256-i3bXf/EsPAJOg2aWh4mANtNeRXnie4jtuLCd/01DB/0="; ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; From 3efc69523fdb04250a3472a13737b826b206eea7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 07:17:34 +0000 Subject: [PATCH 014/132] wesnoth: 1.16.6 -> 1.16.7 --- pkgs/games/wesnoth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index a98e695950bb..6b5e0c117cc5 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.6"; + version = "1.16.7"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-oQRjVjVjLIvCCafLr0FXvLwnKDjJY2FU20dYGLtNFiU="; + sha256 = "sha256-YcBF/iNr6Q5NaA+G55xa0SOCCHW2BCoJlmXsTtkF1fk="; }; nativeBuildInputs = [ cmake pkg-config ]; From d59eb2ffba25b5132651a5c8f0589d2690637cd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 07:20:34 +0000 Subject: [PATCH 015/132] libunibreak: 5.0 -> 5.1 --- pkgs/development/libraries/libunibreak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 7dee1d6b1eca..f740bd82bb73 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libunibreak"; - version = "5.0"; + version = "5.1"; src = let rev_version = lib.replaceStrings ["."] ["_"] version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "adah1972"; repo = pname; rev = "libunibreak_${rev_version}"; - sha256 = "sha256-ju+DNCzwD+y/ebLVBU96iNpE1Wt7/K0qLcZHzWGzrWQ="; + sha256 = "sha256-hjgT5DCQ6KFXKlxk9LLzxGHz6B71X/3Ot7ipK3KY85A="; }; nativeBuildInputs = [ autoreconfHook ]; From 0b4b7586f1e9bb78d5e1f9ec2e09594fd1557229 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Jan 2023 07:51:34 +0100 Subject: [PATCH 016/132] ocamlPackages.piaf: use Dune 3 --- pkgs/development/ocaml-modules/piaf/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index 7239a70a0b74..e148dbcc26b9 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -2,7 +2,7 @@ , buildDunePackage , ocaml , dune-site -, fetchzip +, fetchurl , gluten-lwt-unix , lib , logs @@ -22,9 +22,11 @@ buildDunePackage rec { pname = "piaf"; version = "0.1.0"; - src = fetchzip { + duneVersion = "3"; + + src = fetchurl { url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz"; - sha256 = "0d431kz3bkwlgdamvsv94mzd9631ppcjpv516ii91glzlfdzh5hz"; + hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU="; }; postPatch = '' From 4f61c925d7a3fde4bd6626ba57d874ae8c7b241d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 21 Jan 2023 21:08:21 +0100 Subject: [PATCH 017/132] python310Packages.scripttest: little cleanup, update homepage --- pkgs/development/python-modules/scripttest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index 5fe4b2b2ee6f..c6102f145310 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -5,8 +5,8 @@ }: buildPythonPackage rec { - version = "1.3"; pname = "scripttest"; + version = "1.3"; src = fetchPypi { inherit pname version; @@ -20,8 +20,8 @@ buildPythonPackage rec { meta = with lib; { description = "A library for testing interactive command-line applications"; - homepage = "https://pypi.python.org/pypi/ScriptTest/"; + homepage = "https://pypi.org/project/scripttest/"; + maintainers = with maintainers; [ ]; license = licenses.mit; }; - } From 7ae669fb7869486127ac530b3f63574a80d4d978 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 23 Jan 2023 16:48:43 -0500 Subject: [PATCH 018/132] spirv-cross: MoltenVK-1.1.5 -> 1.3.236.0 --- pkgs/tools/graphics/spirv-cross/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 0c5b936093cb..4a75e28deb8a 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "MoltenVK-1.1.5"; + version = "1.3.236.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; - rev = version; - sha256 = "/t6hAlGY3+bddWg5ERFbqeU4/MAjq+/AEVv1Jy2C0HA="; + rev = "sdk-${finalAttrs.version}"; + hash = "sha256-zx/fjDKgteWizC3O1bL4WSwwPNw2/2m0xCnCiOttgAo="; }; nativeBuildInputs = [ cmake python3 ]; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; }; -} +}) From eb03da87851bb4354e94351db8475510ca0885ca Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 23 Jan 2023 16:49:19 -0500 Subject: [PATCH 019/132] moltenvk: build against dependencies in nixpkgs --- pkgs/os-specific/darwin/moltenvk/default.nix | 71 ++++++-------------- 1 file changed, 19 insertions(+), 52 deletions(-) diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index 4a1435ba5d28..9aa935e5787c 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -25,61 +25,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; version = "1.2.0"; - buildInputs = [ AppKit Foundation Metal QuartzCore cereal ] - ++ lib.attrValues finalAttrs.passthru; + buildInputs = [ + AppKit + Foundation + Metal + QuartzCore + cereal + glslang + spirv-cross + spirv-headers + spirv-tools + vulkan-headers + ]; nativeBuildInputs = [ cctools sigtool xcbuild ]; outputs = [ "out" "bin" "dev" ]; - # MoltenVK requires specific versions of its dependencies. - # Pin them here except for cereal, which is four years old and has several CVEs. - passthru = { - glslang = (glslang.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "glslang"; - rev = "5755de46b07e4374c05fb1081f65f7ae1f8cca81"; - hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk="; - }; - patches = [ ]; - })).override { inherit (finalAttrs.passthru) spirv-headers spirv-tools; }; - spirv-cross = spirv-cross.overrideAttrs (old: { - cmakeFlags = (old.cmakeFlags or [ ]) - ++ [ "-DSPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross" ]; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Cross"; - rev = "f09ba2777714871bddb70d049878af34b94fa54d"; - hash = "sha256-yVpLW1DbcHDuM9Bm3uGhAC0v9XjmpBoU9x7kmWdg6/o="; - }; - }); - spirv-headers = spirv-headers.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "spirv-headers"; - rev = "85a1ed200d50660786c1a88d9166e871123cce39"; - hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30="; - }; - }); - spirv-tools = (spirv-tools.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "spirv-tools"; - rev = "eb0a36633d2acf4de82588504f951ad0f2cecacb"; - hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0="; - }; - })).override { inherit (finalAttrs.passthru) spirv-headers; }; - vulkan-headers = vulkan-headers.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Headers"; - rev = "98f440ce6868c94f5ec6e198cc1adda4760e8849"; - hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g="; - }; - }); - }; - src = fetchFromGitHub { owner = "KhronosGroup"; repo = "MoltenVK"; @@ -98,6 +60,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ --replace '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \ --replace '$(git rev-parse HEAD)' ${finalAttrs.src.rev} + # Use the SPIRV-Cross packaged in nixpkgs instead of one built specifically for MoltenVK. + substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \ + --replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross + substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \ + --replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross # Adding all of `usr/include` from the SDK results in header conflicts with `libcxx.dev`. # Work around it by symlinking just the SIMD stuff needed by MoltenVK. mkdir -p build/include @@ -108,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = [ "-isystem ${lib.getDev libcxx}/include/c++/v1" - "-I${finalAttrs.passthru.spirv-cross}/include/spirv_cross" - "-I${finalAttrs.passthru.spirv-headers}/include/spirv/unified1/" + "-I${lib.getDev spirv-cross}/include/spirv_cross" + "-I${lib.getDev spirv-headers}/include/spirv/unified1/" ]; buildPhase = '' From f46a7bce869ae60bb0fc6ac06f58b39d8c0ff0b3 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 23 Jan 2023 16:53:12 -0500 Subject: [PATCH 020/132] moltenvk: 1.2.0 -> 1.2.1 https://github.com/KhronosGroup/MoltenVK/releases/tag/v1.2.1 --- pkgs/os-specific/darwin/moltenvk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index 9aa935e5787c..07645c5e61c6 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; - version = "1.2.0"; + version = "1.2.1"; buildInputs = [ AppKit @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${finalAttrs.version}"; - hash = "sha256-PqrKGNGw7nJbirRgIargIV6Jbgoblu+2fn5qdHKI6BI="; + hash = "sha256-JqHPKLSFq+8hyOjVZbjh4AsHM8zSF7ZVxlEePmnEC2w="; }; patches = [ From d01f0dbb088c5f2fb3bccf32394495eb6e24679e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 01:11:41 +0000 Subject: [PATCH 021/132] firefox-devedition-bin-unwrapped: 109.0b6 -> 110.0b4 --- .../firefox-bin/devedition_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d2d4ea9e741f..de77cd97f8e4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "109.0b6"; + version = "110.0b4"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ach/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ach/firefox-110.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "8963843b90eaab67194c344a3c5dc329de16725869917ce03d9be64ae31813fe"; + sha256 = "79aef93220d4ac9765eb2b16dde0a10cb375e08b3d0e94397c17a446801aa95c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/af/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/af/firefox-110.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "16cb8d7b81535243792110635cdbaf664bc87bb72971a641d54fa140d8a8d513"; + sha256 = "fa1d27a73425be89b34f3bfcebe71b5b29c300b297266b4afe764a7660dfed0d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/an/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/an/firefox-110.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "413cb55e1107a3ce4819d8821a8b7280acda3dc88ca5141b6f9a2710ba3f54cd"; + sha256 = "3d67d3eb19a9b6f2f8893734e7386e6725b6e5eb70aad4957e1809228b960ed0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ar/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ar/firefox-110.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "87c15a4bd1de2f9ec72a04f09a2c71298df771571d7cdbe2dee0c2c7709fe8da"; + sha256 = "e8177c8011a467d24537de69c0f246f21e2cb4a24384fb1072ab64cfdee7cdab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ast/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ast/firefox-110.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e7f36b517c1988c49309d4c1748d784393d7435f4654f0dc4e157348e2a326c8"; + sha256 = "1c135b7c3ea17d4b9b87e7d12f1f7dfa9c85d71678d001d9cd078708d59e8d34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/az/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/az/firefox-110.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "43ed16939646c715d86507c597130a2f22f519c3a8ccae479abf249c8ceb1612"; + sha256 = "e1355d18563990ceda932955fdb06bdaef4280630e03a16e2498ac244ba2bafd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/be/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/be/firefox-110.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5dd9975563073a441b2ea4255c09b06c5a51b91312423850f06dfc1d25465894"; + sha256 = "bcd3643714d6ef6b1dd2da4804ad72f06ae5cf91262caf2fc3980d833d280bf6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/bg/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/bg/firefox-110.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0606249c7bda6d890b921202b4b276ff5cd713e67aa7d232def6d69d80d1a7a6"; + sha256 = "40937098cdb307fa3375038691c41ea25bdeda96ad1ce403d71ece9a9a11d4c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/bn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/bn/firefox-110.0b4.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a543c108fe17795c6873c48d7547a8600709d7cf11844311e6c8b488597f72a3"; + sha256 = "5eef8728e7e992deb4e8d1189e33c082145d500ea138166839b02a09ae58294d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/br/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/br/firefox-110.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "3182406fdbed589a24ebd100331f9fe39e0f802e807ff269aecb9940fa7017ed"; + sha256 = "c8c947898ddb8ddbd0c7410e9c8835d883b7bfb10d0789a8df0002843f1b9d65"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/bs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/bs/firefox-110.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "5e2f2ea112fca3ad70daf614ce8f5353376a858dbb827dbafcc9cca58e8cd73b"; + sha256 = "f7b50052bd7786cfe339dd7524d6245ed50aacef08e1a398668880edddcb7682"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ca-valencia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ca-valencia/firefox-110.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "ca020b62eb8191aedb3beb209edd37f9e048389d1189008c119cac3e516d1851"; + sha256 = "9473df4fbaf27848ac09b20d944e40cba52b8af327560c55641f3b0e9a0db317"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ca/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ca/firefox-110.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "64230635ad1bb9a5ca8d701bb20b0cfe0f906f5c346bfef84f477a2f9f7ec792"; + sha256 = "1bd644d485d8d9b50f0a57873f99a631c799ad2b75d54544ef1e7fbf589a37f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/cak/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/cak/firefox-110.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "8eb27b956da7c692ce11a478651e70e414b0e13db2da2d7dfede0bbd36bcd12c"; + sha256 = "94be93e482c2de595a89ecedbe163d97b8d2cad246f309da18490010f4218bdd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/cs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/cs/firefox-110.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d2a3a2e9834f439d942a779cc3b025bb725a353db6a040b0fc243f0c61beac1d"; + sha256 = "7a383065cc61d3afb38a53cebbcd1380c76fe8c2677471cd2f4c5205aec1d0e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/cy/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/cy/firefox-110.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0b10019898be0886cc759df75f15021dd07cecb08c7d30ec0dc9af73183c3c51"; + sha256 = "b3852c149fbbc7dd90f3316e1375f2a56e4488ec89bda2f1c5d29fb8dc01ea00"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/da/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/da/firefox-110.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8b32aac9e98c68e8d229efceeeb341a7d6eeb1ddf2d37b84bc05f30ae1bee695"; + sha256 = "290e82778a26c99a0cb21272a75ddd0a30fd99c9326d7e182a354999da17f368"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/de/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/de/firefox-110.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "28342c1f3324b66d350516dd1c06487050b52f8a2152a5f8601421bcd702bdf9"; + sha256 = "6ab2b19451f60318aef65715af7154ce17197fb596810a572d8721e1de39dd13"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/dsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/dsb/firefox-110.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "80733097438a7f694c6fc8d79a93416496b4e845070de648fad06a61bceacd2e"; + sha256 = "bd820c0b5485ffaeb8b978e662c5fa3f1b8c9c17cea49a26338160a6e7a4ff3a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/el/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/el/firefox-110.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2dd8fe5726a3fb43796d4608c7a3ce076e47cceeb75c98ab8ffc6dcdeabfc139"; + sha256 = "532b738bd86ebf327b06ee00e0b375ad45bf75459c0bcafc093d7cbb73136c12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/en-CA/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/en-CA/firefox-110.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ad62b030296da6049848ea83ec10cc05657099a8bccbfdba95c4268e97623988"; + sha256 = "b5a4c77cb687383b5448879387027f6bc5a40e7eccab58997cd8b9020111a180"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/en-GB/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/en-GB/firefox-110.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "52940c1002c0e5cc29712a9b430a209c24c9d5b4dede131c955237299ccb9e74"; + sha256 = "c872cd171dbe3db7ac2e8b0d8d2dde43a80ba6fce99e8f2508ec0f215ca873cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/en-US/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/en-US/firefox-110.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d033dc84fb3f054865fd0f2497af4a60fde033f9a42c4ed6130f5fea048437fe"; + sha256 = "716d742eafe2ef95d13021e5cfa1df9f24650522fd988addd9a3d3c8a1f78a52"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/eo/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/eo/firefox-110.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "dc55d45ad8c22b5ab4290cdce6ac1f648ae2f48ddfaf9255a6e3cf1a1c42f1f9"; + sha256 = "7fcda871328d6bff9454c2749aa29e05db0cca0a6d42457f9dc55d31993bddf3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-AR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-AR/firefox-110.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "28bef42268819cc8ab4ca0edd643bf444d92c76795be944ea20361fc293cef62"; + sha256 = "d50d47f0f26b11deaeb0aae9f190a89de6118f5dc281ffbb66488e2056f6dc9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-CL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-CL/firefox-110.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "948f601cf86e04af37c3587a1b62c6d91e49483fcb2c1af142007d1de864bba7"; + sha256 = "b5d4b2d40776fe3df72f8ee9da7772056e81d875115b9e839e228f32214b2f7b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-ES/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-ES/firefox-110.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c3aca3a4eb8731f30559df8137a58288a31449f708356659fcda97b8a1d24050"; + sha256 = "3ca3254daef1ac127c3665e841914963c12b846a70babe73bc67706aebd31132"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-MX/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-MX/firefox-110.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e32d31832d542933f6caf10bddce23841ab181e1d74d9c2ba1aff069ed47c4e9"; + sha256 = "3cbdb1b4a493753b95d0c15bf77711c7c9a2521fa0f5bb5398b4a21aa3fd1ca6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/et/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/et/firefox-110.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ae9af0467dfadfc5f3d25ac79b41bdc1d52b329819c9115cd086c52651fb3931"; + sha256 = "db979aba962b4b28c1d9c992496f535f8dd49fc53592cbad9d5868095ce3f57b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/eu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/eu/firefox-110.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6db620908bdc5844d4c448e1e5bb8a91994eefce9636a7e1513bdaf44e822862"; + sha256 = "8b7941e539d773a82f934047d6d1a961a13ad5a3481dbf4f1a6379e42a0b7f07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fa/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fa/firefox-110.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8b064dabe1f7476413343bdd4f043f2af5b4b1ba69a9aa87241befd2b8983465"; + sha256 = "85f6ecb803f35a8832bb5a175875d6e50f79c84ee3e0acf7396c9335a513398d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ff/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ff/firefox-110.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "c37f319437ecafb75eb864d903ea670c4047af96944eb6163a69a71f0570c7da"; + sha256 = "11205063e7496360a48ed320d240454175448a02fc720cb7f716a72c48998697"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fi/firefox-110.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "6e67ee392b95554d0b554fdc4f090fdffbfcff008c1d8fc5f6eb4c07ade3a936"; + sha256 = "e00863c7a2e3aaee23591a762c49fb522d1b1dad56a4ad51efd742d999e277a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fr/firefox-110.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d1752fa0522b713d4da15e3697f7446e20a73cd7af221c6ade0266767cca8258"; + sha256 = "ba0784ac17f95eaf177a265c5657f43397321d3380eab2187b1d4435114be006"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fy-NL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fy-NL/firefox-110.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "7ee4a7d70d4d247e1b87d01e609bf354569792d8dc82c7fad32caa1bd010fc1c"; + sha256 = "e6e333da9a6b874c31905da2b9466988d8d94cd0eac7098f3cc816cfd36b6bf9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ga-IE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ga-IE/firefox-110.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b129e94f5170cb9bcd2610f3bf8ee70033d703448d4c7387668d2d5b86fc5eb7"; + sha256 = "c684a8628360647bfb582da7506201acb7c655d42a69ab48d2f45b91a235f544"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gd/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gd/firefox-110.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2d84c1337cf1f86ad663ffa0b6d476409535d0c44ec9888757104543217c50a2"; + sha256 = "bcec9bcaf9f5ea21d4bdb2b8cf2d1b479bcf4678349eda4ab8015f6a43d0e11e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gl/firefox-110.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "42c42d4852f59a7801e2ae8417697e57afb595f7eaffeb1129a5fff7471be895"; + sha256 = "80eb1934b2e90ac41736324cf21241ec303839c13f000cb1e9d1365a70709255"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gn/firefox-110.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ae4dca721ff5d36cc7606e47e49c58ae6571102db45d08c69e08cb78a8a8f44e"; + sha256 = "1f2307c7856c83d0dad1ae3675cc08809616c928373e9adafb5a46083fdbb262"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gu-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gu-IN/firefox-110.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "d502ef5aa86adb6faf1ed511983cadf5263e405d38b622ade74fb54e5cb95bc7"; + sha256 = "e04ba6865ad2c2a618c3dce13b0c66b4be4a47629d92a79780fd8946eaa4c029"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/he/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/he/firefox-110.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "44dcf29064071af9b9e60af405ca846ad22f3222d809bc7b92dbc9a3985c9d54"; + sha256 = "f502e8823a4b1017dfc1a5786333f68f82704a27c6e87f3a97978a3fb6d5f1eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hi-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hi-IN/firefox-110.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9ecd5fbc6fbecc142a69893bae5a54d819f13ffc01881a3bed6d99c258a13664"; + sha256 = "0756e68ebb357dc4c2d0367923e3e6f77da4d0e873d1f7889a79f8ebd0cf527d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hr/firefox-110.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "cf5189fa145a5a7166a4350402e2c490a5a816dcb85bdec60cc87b7f10d5fa04"; + sha256 = "19d55919ccf2bbe9a6d651fce8e126c0cffb4a0b254b0635512fb3c82a191b05"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hsb/firefox-110.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6fa4c9ecc43f2fba816197ce103221cd224bd0d50b742768ee57c7a14cd8665c"; + sha256 = "2005925a8b0da8e28fff97cca8acf979eb4236100fbd0e6138a2cb4f75a2aff9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hu/firefox-110.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2b9f0b7910f859f63748721c7eb556154e3679ac1e02cc265dcecbe387b35e07"; + sha256 = "45e01f13ff46efcc43fb059107104a1b0ba39126530774d2dd19381e5f6ca5bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hy-AM/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hy-AM/firefox-110.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f3f41e9fb027a08c42092175e6a32888e2b4add89b8f73bc77e672563479cbc2"; + sha256 = "624c487076433db825419dcc9f7ee5e45b0995350835ac43e276e0a616d8d862"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ia/firefox-110.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c652cfeb05449620b7e2a578e93c6112ca0cb9e086271048c2eb1190ae6ead02"; + sha256 = "600b3303131b986656e5f6c06a01430010a940763b4a2d38c521cb640cfc36f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/id/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/id/firefox-110.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "37fb22407e5c1b6df25bb7a607472331d5b8e5b961a2c7feec3db712b3f3a692"; + sha256 = "272f9cd916ba70711f94f09afe3caad5d7b25c9b31bc50a7f6dc07a52074e6cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/is/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/is/firefox-110.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1a8ce80a4948b714c1a6c8d5dc23d59273c31190efbcb7ba483c63302b0032cd"; + sha256 = "d45d8343dc3c65c7d7561f17b8cb2c9f4eccd5b8eb242a4a53696e38ed05159f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/it/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/it/firefox-110.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0f9efbb387cc609792ccd89ac53855b32482723f8e383fc1ac27a00968317382"; + sha256 = "32be61fa1d7061c5012147f58626b1ceb2dcce9daa1ecb71dd573aef00bb32f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ja/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ja/firefox-110.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b1e6a24e6b35dcf65c92b995615e60c7c5b48e66634343d8c56338e18c0525ff"; + sha256 = "a01627875673579adf0f5c9819d33c0b901558034a6878b2871d91b9ebaa31c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ka/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ka/firefox-110.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d145b1b2592a1173c8cb897d886cddcbd63c4e718adffcd21d280c57ca331b0a"; + sha256 = "b2c0a63cfdc32afe89ef513674316435f176b1657f2f6f6abfc7f0527cac07a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/kab/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/kab/firefox-110.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "52d6a3ad3d11ae3ea5a913c2c6b0d9277b4996ca9e6f91344bc0462f35cad436"; + sha256 = "6bedeafafb5c746f39fe97bbd383d258d03275b842e14aa80c087d628540717f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/kk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/kk/firefox-110.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "54c95d0948df3631a23442220afb2ced0533b7ac1a5432dbd1bf71ee43153749"; + sha256 = "aa82ec6a68e1a3ba17947f38d8c8244403587afb81d3624fa35ade0b9143ee28"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/km/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/km/firefox-110.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "ec449661503444aff1fc173a5cf24916107ec08aa33a03f264ece19f772246c3"; + sha256 = "2ab1e3a97061736126616e74465f0c0c3008806957bec58047c808bf3cbc99dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/kn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/kn/firefox-110.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "93ff15cf17fd99ba549ea5a23613722cef18b0794b5990880141833dad532f6f"; + sha256 = "f495b6252bdd160aff2c79478c4845b7968b298200f348d20a10e815fe022816"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ko/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ko/firefox-110.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "cb2751c4f9314dbecf34618fae4fce13a2f2065c7826b3d597db161654f23bf9"; + sha256 = "d98f599ee71646eeee3007be682f74a52bcaeb77684c217d06ea6d0743dcbd4e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/lij/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/lij/firefox-110.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b74a6706e4fc8d95aafff6fb2c0ecd9460a834e6742384c08ad338127cb3e563"; + sha256 = "d95e2cc6209c050528247404b65c0269c74a49d0aeb667eeb0c54cc892e1e7a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/lt/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/lt/firefox-110.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4eff1a8f24110849032a35b1475fc6bff13113a770151f647c2f58040341b6b7"; + sha256 = "cfbc237a6b1a3ae245bcadb4a7dfc6424d1033d7bbc4c30e131c1a4297bd39ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/lv/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/lv/firefox-110.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b7ae8f49d245ff94ac594d4ce764fb89072122e7b3995e5f55819e0225a0516f"; + sha256 = "706220e213b96ef2dcdbdb115b1f53c8f2c125955603bb55b4a36163b9f2abd3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/mk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/mk/firefox-110.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3fd85290cddbf2b6fac943cfa1bbf3517f9d9322c0bdd46eeb927379469af392"; + sha256 = "c1897fc0f200c7d4a359da03bc3770938d1b4f1bf815b9c3a2f5fabe85a82c95"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/mr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/mr/firefox-110.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "807f5e9a7676c89072385f788bc2386cebb8df5913d0a531650cdbd4ef32cca9"; + sha256 = "cf3114bc3188480ebbe0413e7330dbe59f62776bcccdef3b5b793956cc11f5f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ms/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ms/firefox-110.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "68f563f9815aa96fc12534f7d1809e529d9f87da9e2ad4e4f416cbefe9e43994"; + sha256 = "6b8a2c7ccbb27c582531eec4592713032eb5166ad96ddfe3e5c684704e8eee28"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/my/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/my/firefox-110.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7b0a6bf57faf08ff121b8478ff682ab17930039b903883cdcee0c65dedaa3e37"; + sha256 = "571d0b56beaf78209e1996fa0fbe4aa2653ebc5e8edcdb47addd154a9219c959"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/nb-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/nb-NO/firefox-110.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "81415ed3aca0d2fee858f17f6fffe5473f696df80cadb3dc2ffe31cadf605bcb"; + sha256 = "b0a0d1126cb0213b2d22a786fb838b39eed5cb8b56e372f641b365941c1f8454"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ne-NP/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ne-NP/firefox-110.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "477254383468b5c027db5eafae857127009a53c370e207f178a35c9c788cd679"; + sha256 = "a6baf499beebf302ad6dc519bca3d65c4fff689630bd99322a1f03c83d2f2b04"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/nl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/nl/firefox-110.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "903c504704a727f64310999512fef8573cc9aff0aeb6ab3ccb2f05aa6b073e9b"; + sha256 = "793a35069d829db2fd1bcdaa5ded586ce9feeb3ca56ba1fd6e858f1213de6322"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/nn-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/nn-NO/firefox-110.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5c76822f248c4e654fe98f93ed3a92cd05c7843aaa1826d8ab1d443f845e1433"; + sha256 = "ea1582727d42c5b6f6da3d94ca1219c12dd5af0de9f99edd95045370e1dcdb0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/oc/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/oc/firefox-110.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9540a86d41ca55c71dfd3eb700d51cc6e98810e41c83cbe4cef5fe32067449d8"; + sha256 = "a168cab442c45ba88d47d9987c0daf24b88ba30d24296aa4676bda707e42c31c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pa-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pa-IN/firefox-110.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "0e93716de0e1c5237f699824f50424b4af74a0da2c1475be42323b18478ffcf0"; + sha256 = "809f5ccdce6b742700efde23f94ddf2cfea24269bda990bdaf6693f9fbfe91aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pl/firefox-110.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "0506596bf6e04c4416c4cfde7ef6a0c066d0e2a8e008f2280319a2127dacd5c3"; + sha256 = "846738b0c957cf70d4fc6867aa6b0a40dad339369ec83ad9c5df973d7ebfe536"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pt-BR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pt-BR/firefox-110.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "9bf1c8d46c5cf5f87825d124b8dd5bd4833a0a733a380843d3c31aefee7d0898"; + sha256 = "5ca2253640fde7a7a20975e6e83ba3ff089d484effb8999dad84cde861f93742"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pt-PT/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pt-PT/firefox-110.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "80e5a37922cb7de806331d39f3ce9b316a3311f7b29082736da594c9d577b3f5"; + sha256 = "9bfbc283ac2e353f5b06c6b4156b84f9c7bc761a394369d21487ca25dc62897a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/rm/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/rm/firefox-110.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "17624a24e93845efe04a5478c88c8db4a3dab1b1adf36e08cab4b74c7d1be077"; + sha256 = "f0f2e77eb84222e0c0e562dae0be17fd64b3fc7980d84092bdb3e8174979ab7d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ro/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ro/firefox-110.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6396edc2baaef91581257501fdd066c4303596d82b72037e3a4cb6ae6c688c85"; + sha256 = "14e789655e9ee9e55d57c102740c51d1144047c2e8b6822f827be65d89f29ca8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ru/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ru/firefox-110.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "58239fcd06b3f24a6a333a5fefd05f3c61db175b66e4444317dadb767c3abf6c"; + sha256 = "7460a7604204d6a126bffa083c23db82ce6cf926e51c3b602c2571926d2d7183"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sco/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sco/firefox-110.0b4.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "bb04339afed59eb0672a2009616c1cd155328b169ed4eb8d2a2062575a42f10e"; + sha256 = "cc20511f344395da551848e7b8622af33b4c2ba22670332b8334da753edd9ca3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/si/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/si/firefox-110.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4a0b83beaebbff9ed0734d72cc5cc57f1b0633145a22729f75925e7c2a85daa3"; + sha256 = "fcd5ff2aca96ae655ea60d453195037aa75c6622d2786c477414e8483e7d7c46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sk/firefox-110.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "205ff3dd21f368c47f5bc93f1630162b985a81b744bc6641caabe71b8824d8dc"; + sha256 = "1925a202a2f280884f0b7e25dc3e88816cd2f4903d3047da6696bd207513150c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sl/firefox-110.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "289dac2addf1f9ceecfc97e25f206b2f4b8792042c6eb712fec897eb7413e909"; + sha256 = "072e1818082dfbc677743accbce10e68d9e480561459906bff7720317edd63ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/son/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/son/firefox-110.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "d1d4567e68f6eec483ac938dba9bb2de1bcad451132e38da48af711fec6041dc"; + sha256 = "e722a643ab7819b96f44e64cdaa7aba66b71556493a7afd18764dea7a67bb7ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sq/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sq/firefox-110.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e5b19462f11933671f59144eaff72b1cdd87e59c40dcbdb21d39e16b6c771eb1"; + sha256 = "74ed35e88aba30f23a4184ad16f31fd5907afe97e3705367e2710b7c666712e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sr/firefox-110.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7295466d7bb5e04a439b6155b7cc79a96111c9951bb4cc9f51babfb4786c74b3"; + sha256 = "18c3454af47dabc69eaf96fc9223c9d97f7702e0ad4783508a29898d43087c24"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sv-SE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sv-SE/firefox-110.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "9342438f3d48f87aefc41eab6bb317a9328f3ce25e180ada327fd6752e67411b"; + sha256 = "c9328ac05170f9d2de8228e7396f567f873514b9402d8e3e54dfec8b6dd17bf5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/szl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/szl/firefox-110.0b4.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "7ff03a1c8c542462ce4e67196f55ff8378dc649baf3ab9cc9cb79d307fde9cd5"; + sha256 = "2272695f8f355115c8e98e9c7d08bf875736dd32df3287a5a876dc48da942342"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ta/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ta/firefox-110.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ff7cc22bab69027967927c2aa3174c536fae4a5ae2b232962e6a77dccfde4a45"; + sha256 = "32a7ffbf1e08cffdc7a2dda2ca80c3e4760eda205a15870168c628d0b4991757"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/te/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/te/firefox-110.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "366306f278a5930b4389ae70e81a35095204ac50a650602e7160a609d6d272c0"; + sha256 = "de8e18e7722184f95ba294fd0b425a341a2d91956a7e20ff06664485b8dafd35"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/th/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/th/firefox-110.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "de68926b8a6feea9b0d84869811230ac800205fc541061dd1e2f5cfabf6e23cc"; + sha256 = "cebb719fc885dd17c9d1d66abc8760647b53b27e8d478ebab33f8983a83f644d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/tl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/tl/firefox-110.0b4.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "02e81afe57f3fab02d7886fbe3fb3b38a37707635abe358ec77f4c46313e778b"; + sha256 = "08fc5f815505c637625f9b74786347dd439dec29e658df5a66c003ad0f86b4a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/tr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/tr/firefox-110.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1725ab0df146f01457025c118d7bd74a5105060ee6c54ac05251c63793dd7b86"; + sha256 = "d581cbae7f241af8a186b6cb18f3410c6eaba6eb45142ea1ae1441aee41f242f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/trs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/trs/firefox-110.0b4.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "72c41adcacb9b4071f40a36246357ec3c4377d5a3f1265de7a6c2bd4a5bfe7fd"; + sha256 = "b4b65c806e520a0a330dffc95a3ce2a6cd66dee21c51e1920c4206bd6c536f55"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/uk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/uk/firefox-110.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "60f226b017022fbae92d3238fbbc66b5b80a8a428cffc680bee7380bb492d13a"; + sha256 = "f892034091072a6d5f2a188231ddf1916d07043d23e5f939c0f49b7cac5507e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ur/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ur/firefox-110.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "18eab55243a30490ee84cc1cf7eff37141e5a9c31872b51bef84db5f33cb0885"; + sha256 = "2694b8f790584bb95c922193fdb427d7734d451a24ebd8317ce95e042bc69e6a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/uz/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/uz/firefox-110.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "abd767b20dd0a1e442dde976f2389293244c0ed4025ab7c6b82eaa81e615ef7b"; + sha256 = "e5e6fa9a717b11c8b0058920509f04b6192cd4cd4e3d0ebbcfb333425f2ea712"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/vi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/vi/firefox-110.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8058c7c336213fe1b6ee419960a1df4c7651830a911bd4ab0d799f4e5d2f70be"; + sha256 = "988d9b206b1429fb3702ad90839c5744b81d517578ae73a289f63ad64caf8528"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/xh/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/xh/firefox-110.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "2943e6f92b1951bc63ad45a78a852012537b29fe7ca59137d56a724be9159357"; + sha256 = "b441faabb6cb56d8c95217ab04e9c01d56beefd6f93782354d5d6f1cf9883f87"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/zh-CN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/zh-CN/firefox-110.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "8b111607dfedc130e31e9d51dd72e9eb3be947565ee3bfcfc91c07da792af928"; + sha256 = "bae64efd20a0d663646cda2622c9eb2a7202cfd5d889456f4b5d050c21e57940"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/zh-TW/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/zh-TW/firefox-110.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8ec2ad39e4e8db4d50d9ed2a24361bea76ffbcf38dd9521e235b0fafb45d3947"; + sha256 = "118b3fc9452d3cd11b3808b554561a29802922f22cb9484f45ad7717234623bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ach/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ach/firefox-110.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0dbbc46496169ca1331d87b87b8148502123dd9b909ddf41bfd6c94a8deb506e"; + sha256 = "26f7fd835de5984a40baac0811cd4a5953b302d3f2432032b0e5ba6b60d914e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/af/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/af/firefox-110.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8179eb2c61535118b859204023a421a0a4bc85e43f07bbfe93aaac439ca9b4bd"; + sha256 = "bfe3928a795da58b373a13e0f586e6f845193c85bc124a1d6b53cb6e42b2255c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/an/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/an/firefox-110.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ecf07700fce298ac673acf886067ecb1cd4b7e9b58d870176c474c80ffebb988"; + sha256 = "264e9cbe27578446119afa5b6ad393fa63f61404a0e2045101979674e4f129c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ar/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ar/firefox-110.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "da4b1e9fc735cbb3887b7601ae87ff426bf2d97cff5aeeb4da5f53e7e8ce849b"; + sha256 = "e15f110344582c732182d17615975825ad1abd67a0b65dbf6fd5f2aa1869ce5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ast/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ast/firefox-110.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "11f6cfb00f3acddc7daf988c59dbe8fa09533ddcafcf17434f85d6d963b38f2a"; + sha256 = "71d88036fd99b8407a10572035ee69f1aad922a96899ee8a6ff82fb87e561474"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/az/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/az/firefox-110.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c94c20828469c9c00c39d6f3d5d20ae97a5b00e40be2b0381aa9d6978a05b4a8"; + sha256 = "8ee11b4f3b9f705497ba4e8cf91f9a97afbb37f7bed9e84e832af7e617c65f3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/be/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/be/firefox-110.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "3ff50dbed1d2e136b06e9e057c21b8f7072017d46f3c0211fc8df913eabf8eff"; + sha256 = "fe3c0070de7156dfed3bd8d83c2a7932edd8e917ecd525784206c740da0360b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/bg/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/bg/firefox-110.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2392ab96c9f4acda6aab08b9269e311128174688f4468c17f32f174cc53fc0b3"; + sha256 = "8ca7a4c913b560ed79596f2013eb94b8a3a0ba6fe264175f19066d92b890c42e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/bn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/bn/firefox-110.0b4.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "242d6d3bf76674906a199fda2f630c39d1c64827b951abec417b9a88b6c1a051"; + sha256 = "4e99ade8b0c5c9387103cf1a252d4b198a48d8611e50cf5f9d295c1df550dd1e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/br/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/br/firefox-110.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "73596148b62699f7f9b5a9f799d16f725b98356c4f41939a1eb947826729a7c6"; + sha256 = "09d02313cc51b119ebac24db153638431f62ab1d49ce9ae3e9c1e72d457016fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/bs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/bs/firefox-110.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "f48258de891f463e7ab0b8d99e9d90e350cc59f84429b78cdd998ccf4655150e"; + sha256 = "3d6faba008adb139cc3c260faead8555d38ca1ce59f4f4b900b6d3edeb185827"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ca-valencia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ca-valencia/firefox-110.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "2bfde9ad05bd74543d661f6a46f226cf2dfe6fe142f9e93710031612e9db1f78"; + sha256 = "9203b546400fc902c856eb9d0e9ca6cc5dc0fd937f5afd6110f5d86f5ca59f1a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ca/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ca/firefox-110.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ab33f070d3824655165ae73982896a07e14a09621f45fc4bef08a9ffc900f6e9"; + sha256 = "8b153a22185fa8bf3910d077e2baa2221c5b813b299949db2eef1530c6d6a7bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/cak/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/cak/firefox-110.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a573be6a12bc57f26b0ac9fe64049dde38378253fd12e4e74d873a74945388cf"; + sha256 = "335bc9e0d6fa9136019d7140d342040a59055af9d3276c0dd101aefadbfdc557"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/cs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/cs/firefox-110.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1fd4304eab350c9e4429cd89f291ac82cb26f445433e5f4eae30c880f9219d7c"; + sha256 = "5dcdc99962152ab687eb91c1e94b516b6572bd8dc0bc65ba5edb63e17e27f2df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/cy/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/cy/firefox-110.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4d9fea847c16fd2c3b13c9d5572bd4fc9adbebff3024a16c0d1bb6a75aa33139"; + sha256 = "875d60739f3b52f79107f87069df8d0fa2a2fe369fe55b2db606b894329457a9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/da/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/da/firefox-110.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d775a720ee867d28739baeb48b4ad1da55b6068cb4e635255b03d31fc49000bd"; + sha256 = "99c92de7946b369c144d9a1a830749406e1896fe103eda023b8615f02eb27c5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/de/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/de/firefox-110.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b6fedcc823112d5641453e5a7c2702aed141430be299568158b345882299556f"; + sha256 = "d9c83d5cf21d6f1f3dfbac933b08284d222ca9dce6ee7f0dbe7edc3bec484f5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/dsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/dsb/firefox-110.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "32430f2fede1c15a0940a3d6793ce62c2e1a8a588556fc037f6abadbfca9b793"; + sha256 = "bd3adfa6b436ff003029c5f636d71e9ec6efd9d3f12884d496e18fc49d0f749a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/el/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/el/firefox-110.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "474aee143ae3bb9428f37b58d3956eda03290c66d32b9506f072c080e8947d49"; + sha256 = "2d58bf194720337581ef39d9304dd25c76d868c559188b483e5b7bcccff594fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/en-CA/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/en-CA/firefox-110.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "118ff11e80902624afe7fb0d4f8b813a0c8bccb0aaa18816349f160f5a4db034"; + sha256 = "46e49ee6bc243047cbfc6caed78ac7229ce1c25f3454d773b001ab53b70ddf25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/en-GB/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/en-GB/firefox-110.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "13308c1285c9c7b2242b569c5f7a234af7014b938506827c6ba16c5a74f154e1"; + sha256 = "ed4727ebf052500046bfd0bab3194322715e26b346e3becc1bbc35d6b5cc32f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/en-US/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/en-US/firefox-110.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "68ada04e8720d492ea0e3e47a7bdcf9f6409e02ed4000eaf3819baf66dc15097"; + sha256 = "9f198ea55c49042b411e0dad2e14deed9a83f49139338baed49105238ebc0cf8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/eo/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/eo/firefox-110.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "797788a6ac192906e877361d16a9834521a4c3d82fedec15507358b56b3f8bed"; + sha256 = "8c940f0f4d47bd4bcaa06274c882bdb9ab079927c32e40e121edb14d629c80c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-AR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-AR/firefox-110.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "323763965eb1bf68b80591e39737899bad295115950f4ebbd180b4eb4c3dfa03"; + sha256 = "2252094fef1422b9ed6d184898c1bcbeafd6b80401d03a052a4ddfbaee8cb0d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-CL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-CL/firefox-110.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "b63e6d8cacf9e5025b91bd3ee5be53ddf32e51d1dda68685411a7b744306f97b"; + sha256 = "61d5d2884cbf7e95dfb642eaab6ff89b51b04c51378e665b45f4bdaed41b9d70"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-ES/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-ES/firefox-110.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2b26b1ec4a83966fb9fd0e205dc232e523a2e5279bdd28b108742f67f29401ef"; + sha256 = "e6babf0af3a058112125b6f576cc089f08e7d93562728c65199a5888413d99ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-MX/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-MX/firefox-110.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6e752d3752fc37dca4263da817f8ba2d48df30548bae78fb51f77336687f5080"; + sha256 = "c6f51f853aba37d03a3ec86ae8897485571d3f1cfd70fe0c571c68e601631fed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/et/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/et/firefox-110.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "086778327dcf24bcec7488444d647f670d71493a61415fbfd54b9eb14319d376"; + sha256 = "b5d2ae763e2b504fe9a5179087571dc38d859b66548ccb4bbdd9cede046c650a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/eu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/eu/firefox-110.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "767667b8919b4e93f08cc61dd7c9fee38cfb8e0f2762c6f7b8d1cec924fdfbbd"; + sha256 = "9f61c73b8eb62d64317f28e21e0d9afe638e91193137ed1253ebea0f21ef492d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fa/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fa/firefox-110.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "b100933c810cb7aeedf37c8f91a701e2c7a54678807cc10dcdc7e39619c0183f"; + sha256 = "f1907dcaecef5f91467bf483fca9c35d22511fe873deb08885e7155f79340a48"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ff/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ff/firefox-110.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1b435af69429797ff657cd798874cde9e27fce62db2bebeb84ed34e11ccd9cf4"; + sha256 = "74e1fd6a903afd7c80e779f7c4beea9fc14b7f439ecade22fa13aeff00867457"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fi/firefox-110.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ceb39147a069a997655b92cf62ce2cf3f737b9fe7f6330dc125a4397cfc13f81"; + sha256 = "86e8148af4544ad449e68b89e684b9ed7ea988fb2ffba3e7e1973e6431a96210"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fr/firefox-110.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bdd9d494c1243180553dd4ac5e07bdf0111a5c4eaf5414cac109e3f381d5043e"; + sha256 = "b91d34fa10d4f5a2415d823a04197042108a6b61c881148995831554cc40019d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fy-NL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fy-NL/firefox-110.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "dcf1d2de6e6f7e3073f13a4ec35e8fab7b17e3c2eb16b884ae8f54cb65ad9fd2"; + sha256 = "c78946f87c910f940b837611e681c718732afe43e801093e49f4fd573a09534b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ga-IE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ga-IE/firefox-110.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fd68b5c0bf263cf853672055eb6f5c0c2ae47020c9e7abae94eacc272c710627"; + sha256 = "b804ea25d35a9e5c85e32e7ff282313b0da74e892d7f1c3dcb771cb8a7099a32"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gd/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gd/firefox-110.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2aa6a04126d84aea6827ec1d3e2334067dfdf85e916d859c89b19fe067aecbab"; + sha256 = "7937b23dd5fa96f029e2044ed43eacaa8ac8a709c89edb1f978fd2fdb87b7d93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gl/firefox-110.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a2b35efa90e5660fad92264baed540bb26983eb80c4d5c546da4dc1101f75160"; + sha256 = "6c4455ced369da61a3182e2ef28fc6d3364e5da6c7a694463bf122e488522b4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gn/firefox-110.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "bba1a62addb6f7822fff493b10f2dd2de8eceba78fbc8381493bf2916a37fa1b"; + sha256 = "ef3c41617b962333bdc85bf3e3c5c6b798bf8b87dc42c0b3a7fc8efd03baa6e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gu-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gu-IN/firefox-110.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c5ab20cb7bd45a6eef11f9306e3677498a2b7e4576c2a684aea28438077a3ad3"; + sha256 = "ff25c34e72cd93436c0a6c82a48cc1c7bf7c0885e46ea3b75c246536a932c981"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/he/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/he/firefox-110.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1065459c93318f644e0f014b670d31951a64c4ea5387cea0ccbe078a14951d21"; + sha256 = "6a216279106adb13ddf196a7bc7e05c61e8984f82ab811fe465abd7cf0af2ad9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hi-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hi-IN/firefox-110.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7a7654d985ad1c43b65e7ac0a61bbf91365de50cdfa63dcb93f0d76f2a3b6c5d"; + sha256 = "778dd4a7a0f589368dd618fc2d4c7513a97fa209347d30e4f53f54862b52e35f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hr/firefox-110.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "70ffea6fbea09b8509e3cb4d14ffde3e868842038bc0ce92d84b4b64218f59df"; + sha256 = "3b5e213b6dd09f9b1b1cfb6fccc57a60f9ac6bcdeb45286964afa3b11ef58ce8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hsb/firefox-110.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9b6458f322a22c995d8fded291d3c29343bcac02a4fe05d5869b40b6ec0441da"; + sha256 = "e49fb0f6487ef29d7848a185316908f28678650d17146af852382a7315687462"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hu/firefox-110.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8f39e43afd357795606b02843ecdae313c12aed788ad1f584bee761dce19cdf9"; + sha256 = "7dfe91a7c668f58aedc8a42b4988ecc6f3d37d3e8a152c6ab6c79f994e4c4944"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hy-AM/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hy-AM/firefox-110.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "635ec02dadceed704593eaf0d758ca2ae4280348d61e022c120c2a55e504b04d"; + sha256 = "613100fd8c421975fc1abf3a0e08ebf973c0e1af167a98274293b776a5a7fd6c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ia/firefox-110.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a579662d968ef168fd09e3ff1e6bf590b29972cfcb204530493cef77b3afc640"; + sha256 = "6f38ac594c8fd12372e7db61f3ea5937b84ab39fa2ee30212d9748af4c260194"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/id/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/id/firefox-110.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d3daff6b081caeb14ef1a520618d4b30735de82fcc5769b3f2a78b145a62e84a"; + sha256 = "fbdb547f865b873b3eac4069a4992b4b7b4ce6c3ce5202f50462c45870ebae25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/is/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/is/firefox-110.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "9780325e6860ee71e93ab3c2f7340aaee8c113c90608ed15ba44a572b32ecd25"; + sha256 = "20eede127ff7c6ccf5905f8c1b7dbad4a1a6921465ef9a20f17dcb1b11f31013"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/it/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/it/firefox-110.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f5dcd00febcb098b7e658aa0bf5dd716adb7ed62e3c6db3cd27e47b3653f12b4"; + sha256 = "f4cdf1e8a584ea7bf36ba7f4e9455fc603a44ada003630f31030d2248f599ed6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ja/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ja/firefox-110.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9d01e50c9a868a3e1784a56c98d46e5d73300045f1c87da01bca0afcb13edc56"; + sha256 = "9365b6cda1c107cda840c254b4e0be1eea113e1ba0a7310c81a9c1e4ac720b59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ka/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ka/firefox-110.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "36b53fbc7de3a55a76592992406c64a255015ad093dc0ba8826552a2ba05922b"; + sha256 = "20a350dc82e3aa8dddcb08374a5f114dd50bac7c6179b9f1e2e1192edda756fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/kab/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/kab/firefox-110.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2dfe85e6b60acdba2d1bf546067e6d8a64cb04c6c99669cba2ae9f2bcb684532"; + sha256 = "c2a7b9b1153fe0f06d619f291b8810f8fe6a18f8e38ba261ae7cbad30419f866"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/kk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/kk/firefox-110.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a7de228d5430ab08cfd385c9418493ca581c1aac9aa542427937e43a25f189a6"; + sha256 = "f01ce34e338c1eef4316724b9c219907152e0d866aefc05d3ca7a17687f065b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/km/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/km/firefox-110.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3f3d4ab4fe2cff4d92e2bdebfc3b01d8b4ceb80579d3d46a7a1644bb90c0f642"; + sha256 = "5324ef86098f6560f26c7623d15cd6fda4232bbabe5bce4c49121e502eb58cc5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/kn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/kn/firefox-110.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "752470af2f3069040921a7704873e2a41053f8fe874d80cc432822b386fb4666"; + sha256 = "f4912e59d13c357daa5ebf6b97069c2888cb20a4873e98939aac3a1f44c6ae16"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ko/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ko/firefox-110.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "8b765dd21952d49205198ab32d6989b67c8342c634d67c7913795991948a539e"; + sha256 = "1478a5a23115ee17de5f00ea86e3b5ddefbfbb6727460155cf0dda414d2171b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/lij/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/lij/firefox-110.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "1184c8a41414f8a92ffe8811259086e49b20e324302670680c1b6fa445ca8466"; + sha256 = "95878f7c9e74b22cf7ea68878ca2e289c31dc44d711e510564a2c1c0ea8e3784"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/lt/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/lt/firefox-110.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "078263d1a8c1ec76281be089f949d022991b44ff6ce3d03f79e6e10f1153d4d4"; + sha256 = "f65214a0493764ec597572ff4985d9df7a71000a33d048777c1ea7b990f84902"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/lv/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/lv/firefox-110.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "550d4c73f19efb8aa8d435e9bf651395e1bfba2e34a11190100a9ffe3e35894d"; + sha256 = "429a92b27a4c5d86c7466bdc383fba97ded97220ff30420497867ab1083d7d29"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/mk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/mk/firefox-110.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "b1ce6af31d2016ee7b91bae37f0592234c897d684b5b74a3c75e42a400d3bb16"; + sha256 = "6cbbcc0ad8f7df2e433c7c5723cf4470c3dde25bad61db319feea04985a28f00"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/mr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/mr/firefox-110.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "a5a5dbda6d557bfc66cb46573e39ed758f7393bf35eefc70859eb8f1a682706b"; + sha256 = "00e78268a3130629a49c79be6f35493418b8ba5e0a14e45f194c6be6282eda1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ms/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ms/firefox-110.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "69967991a118fab3ac407dbf8349c6e3cfd2aa6dd1f858bcbc647ad2aeef45ac"; + sha256 = "e1df53a27e4364c3f4c537a96e9e94a648bc9cf5fbce958a53a943d62f33967d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/my/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/my/firefox-110.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "528572edf884be725b14b65f9d7fd549d2efd3d78a4242c4605b73ac8dd922d2"; + sha256 = "f1231e62c3ed74684496d8db44810a5444ee632fdffb0d4c80253449194a35ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/nb-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/nb-NO/firefox-110.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6b1819f52a09603e9e8dacc25445cb635e96f08f3563e01c52b5df1397fe32b9"; + sha256 = "4e13da7c18494f325918c86aab947a97dcc9dba3fb4fc33c49c8e608a0c6de41"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ne-NP/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ne-NP/firefox-110.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "645c35f6fbb637de6ba1b9e0bb6d71cee1cb0ce1f9132544109f9beb4ffbc304"; + sha256 = "294aaa8041e0936ff098089c377f2df4506a4a28bfcdc494f78fc377f457c145"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/nl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/nl/firefox-110.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "64eddb4cb43d45a46b9df2354661367f75dc91047b3f02e520ea1c3f4ed9f6a0"; + sha256 = "02dbb54651a0cb71803984b210bd18575b959d27cb669a2cb50a3c0b3df6c259"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/nn-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/nn-NO/firefox-110.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "800cba266513ce66af2be977ea8747e3b90975c9b7e1decafb214f981188af13"; + sha256 = "68f072244742c48a8a4ee3e5b473b30a40e6bda1a9cb56351ca0f1d50b323120"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/oc/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/oc/firefox-110.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3f6833e565b05198efe714c25fa80383913e03f94a8e805c1797efe891c259f6"; + sha256 = "e3ce7d08716d48669bbe10edd2b8c7089888d9c830fd301bd0f4d8c51298db85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pa-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pa-IN/firefox-110.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "86fda421422504b638c88d67c8b19b060e741299db7dfc474a547dab8f21f28f"; + sha256 = "fbbe7aa90a13fe8ebfcaaa28d2860e32d8c9615c9ebda3edca516b0096993b06"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pl/firefox-110.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1acf4380cd83c082b83dfdda747dc4b5091bd32cf381d224bd29fe11b9c9accb"; + sha256 = "6a628f50313c1ece6121b3cc291fb82599f0cdd21505db8942dac9df9a3e03d9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pt-BR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pt-BR/firefox-110.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "15f21f70c4ed36bf02c1b29ee7d7d93a30b6775627ec842e02aec4e78b2aa0f8"; + sha256 = "598913c0a04f7fccf94a28a8bd93ff7de55878b8c17c4157be2e9fbe0b1e6605"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pt-PT/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pt-PT/firefox-110.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "974f7fb72b6ea6198afcd74f7cda3e2018cee088a001dc08e880e1c4366c7be7"; + sha256 = "8efa1fedf51bb6013e3865f6f2607f137c783c540b3e21a78a5a5706f2e60fb3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/rm/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/rm/firefox-110.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7489ea896e1f7612e94527302ef02b8e9e9e7c7d2fd98776e4c05eefa1671395"; + sha256 = "49b8163f40ee7be5feac33d06520ee3e3ec9a346099eee5d9f87a4d9f46335ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ro/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ro/firefox-110.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "cbe47e14f2305db969c326e95fddd088a38e2d8c198c8ad90ad8a28b06588265"; + sha256 = "196c42630e0da49d4f29c7c5b50bc8cd59d26690fa9bb492f0b187fa41998d18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ru/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ru/firefox-110.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "66bf47f2b2972fcb089569c3064e394b77ed737dc2d97b76d3a4718484539bda"; + sha256 = "fad3db3181124aa604547b2e4ec2322f6777b8076a83dc40c51a405ade162eb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sco/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sco/firefox-110.0b4.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5b122c5d227f617b6b4a0508d454a5fdf32a4338644ef905718c003a0e8913f7"; + sha256 = "c7f0825a39bc1745940f85d9f372a83f510dde41d0a1a751c6d8d21136c47e23"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/si/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/si/firefox-110.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d68852c3d719dee2f1d8655826667dfda650ba227950e7678834593c8acf3f83"; + sha256 = "fda14e47f8152999bf16d3089efea7bbcbc76de01f6f040a95e154ece3763940"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sk/firefox-110.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c8c3153072d63fe00494690fea7c55ef6c04911cdbf2473135d00c65edf2550b"; + sha256 = "7f4182ba5331880955d62103e5fc1aa39b31b59403de94851c5a9b19be940b8f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sl/firefox-110.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "fb7f97a2edd3100fb3124bf19a6ba31836343cbfe4db5c3a60a97617e700d5ee"; + sha256 = "92fc2a31da871010c757efa47e2b6d02516d6a7725e19f06a91379dc95575d69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/son/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/son/firefox-110.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "8e78110ed2cfaffd2ba7d4dfae9b2dcd59106d3d4c763dc6ec95b50938a2ce1e"; + sha256 = "d4e5627ce9ba22726722e7f3f0b74fd33e36cdfaef47d0d32ca8de29efd01a5e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sq/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sq/firefox-110.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b72e721424df588e738882088168c129d71e04148197cf2736a55f077215e2d7"; + sha256 = "bc2bd9e3a379778fa86cfa360ab2d61582dd1a05418ce38e65153969071e4a00"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sr/firefox-110.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2bc67362e7e4baabc9d12bd8f7683f6a8201b74dbbff83b5d3f0035c4dcbd011"; + sha256 = "5e9da54d468b2e28b7027be3106449d3c40908a438e90926f71db5f7c33eddf9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sv-SE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sv-SE/firefox-110.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "62137df0a8f5f28d5415a65141a9ef9fb3334f428ceff2d0cc2368e2ebe46d62"; + sha256 = "1775502f9436ba19919c2842e368c4dd3e153beed73c95dae630d954948a2808"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/szl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/szl/firefox-110.0b4.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "167ae2dd7d0449253fd59f208169d2895c7d204b47b3a712fed65c0a0396bb44"; + sha256 = "e7ca52cf7bbce1b8f44e9a75aa3f90e69549807675ab4a0ee14cc0e39e5c9fb8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ta/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ta/firefox-110.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "700133f0cbce4d2f8e576de2b87097374e24a21ab0ff73d79cc1fc07e10d9e13"; + sha256 = "c9aaed5d80d601a682d9333bc065705f03e9cd16857890284f3028c921a19d1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/te/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/te/firefox-110.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "019f6c7822d8a65d552f9276d481d44194da2b6b6c4d86489208cc540f8420e0"; + sha256 = "5d23b2ef116c84a498a5df6ab8c5367d950de698f16af592a4fe57894329481a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/th/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/th/firefox-110.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "a41701983d698ae7f02a99854e3c40a2c8943ee1ca3f28712367e13152baa7ba"; + sha256 = "58ba6486512c2d5504e9e1b0deb15a75922dd12ddef9207e5313ada949b14014"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/tl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/tl/firefox-110.0b4.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "6c28b7be19776c338d600d6ccc1f51821d3a28fd11719feb4cb2f591aff9b298"; + sha256 = "5bda9db0b83da8d38aa47411714445a3c4c1d39c82a71a10035dc83a7f8462cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/tr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/tr/firefox-110.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8290ab47a1dcfd32ef7824f05852b6004328faeca4f0ce8e2164ed69e2f2b9fe"; + sha256 = "fb17e91526bd4aee9f646352861a2d08a07c16db36f50e0a06bb236901990a17"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/trs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/trs/firefox-110.0b4.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "ed11eebd2d048bba7a1671e9b43dc09da712d7535d8ee010dbda5874292abf15"; + sha256 = "853f318e84a5c9b9fb8d67c30ca4c7f3ce9c3fb6250d13aefd69e1873926e8d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/uk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/uk/firefox-110.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "22e0597f170fc9ce9dafdaf0f1f200171f1794f4cc488b3481ac73f2de4e8fd3"; + sha256 = "801ea66692410438c30178b609f432ac59322668e890718f0be9a1c127f6b885"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ur/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ur/firefox-110.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "1204d370ff90ad47e376f4e49c090a72c00e75f3966163aa5d8522f92490cd32"; + sha256 = "4083fd7d3d30c5d7684fdffc5387d2d0aa202db418f8340e3bdb717b1fa99585"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/uz/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/uz/firefox-110.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "12043a8e7803af1e49a6546b104a79d652e2e703f3f704e2530bcbe315a26d9e"; + sha256 = "94d2658cb0f05f4e47d5aa99a98550617e7ba11c5c17de11d8038d8527faaed9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/vi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/vi/firefox-110.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ea306e85e24d3b34093a894c813b2524d7f2200ff09fc2c26c815e244720e7ff"; + sha256 = "cdd6fdec6c904148d9a7928fd5206fac05111acb5981298cdbeb49c83f774d89"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/xh/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/xh/firefox-110.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "34c4063edd0bcec3850e0fc15e9d948863ea3b34689738f90ee5a7796b296baa"; + sha256 = "a4d5f861d320453ccb77144d28d0e18c425b1570609ac986f1a8ef1884d1ec3b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/zh-CN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/zh-CN/firefox-110.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "5980c6f932f2336980f8fc613f065949336df40cbf1ce92bb2f8f9c04dec41e8"; + sha256 = "beff59117070337fa0a86b1871bb9a563a009ffbf02f805bae2af87f15c24119"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/zh-TW/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/zh-TW/firefox-110.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "8e726dae987f0ae4793757f763268b1d375e69f324ff5e9ac5dec2367e1cc3cf"; + sha256 = "b6775bdeb79f400781dde1773ec008cc7b2f1696006facf5498b2c0c440392a9"; } ]; } From 8a954b2151bac797b6826ace887a85f19d86cb1f Mon Sep 17 00:00:00 2001 From: Bauke Date: Tue, 24 Jan 2023 10:49:57 +0100 Subject: [PATCH 022/132] maintainers: add Bauke --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7d031b591356..843086e95542 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1621,6 +1621,16 @@ githubId = 45811; name = "Svein Ove Aas"; }; + Bauke = { + name = "Bauke"; + email = "me@bauke.xyz"; + matrix = "@baukexyz:matrix.org"; + github = "Bauke"; + githubId = 19501722; + keys = [{ + fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; + }]; + }; bb010g = { email = "me@bb010g.com"; matrix = "@bb010g:matrix.org"; From 3a1292ccf5afe805eb6af69f108919f0ed2af640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 24 Jan 2023 13:36:30 +0100 Subject: [PATCH 023/132] ibus-engines.typing-booster: 2.19.10 -> 2.20.0 https://github.com/mike-fabian/ibus-typing-booster/releases/tag/2.20.0 --- .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index d8181142c09f..e90b694997a9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.19.10"; + version = "2.20.0"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "Ie3cQ1YC+LB5I5LtKyJ0RO+dyjFbVsemW110t3gPmCM="; + hash = "sha256-evKCKPddQ4yRgI0NDOk6iEkS4910cYhLTvicLxJEbxE="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; From a68cd68b4585fd7cd1de7b31555ed39bdebbf812 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 24 Jan 2023 18:05:13 +0300 Subject: [PATCH 024/132] nixos/fwupd: adjust for config parameter migration --- nixos/modules/services/hardware/fwupd.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index a3bb61a6cb0c..2431cb2a57c4 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -18,12 +18,6 @@ let fwupd = cfg.daemonSettings; }; }; - "fwupd/uefi_capsule.conf" = { - source = pkgs.writeText "uefi_capsule.conf" '' - [uefi_capsule] - OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint} - ''; - }; }; originalEtc = @@ -147,7 +141,10 @@ in { ###### implementation config = mkIf cfg.enable { # Disable test related plug-ins implicitly so that users do not have to care about them. - services.fwupd.daemonSettings.DisabledPlugins = cfg.package.defaultDisabledPlugins; + services.fwupd.daemonSettings = { + DisabledPlugins = cfg.package.defaultDisabledPlugins; + EspLocation = config.boot.loader.efi.efiSysMountPoint; + }; environment.systemPackages = [ cfg.package ]; From 1b87e1bb7cd2c95febb38748078d6d20b0fca399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Tue, 24 Jan 2023 21:58:46 +0100 Subject: [PATCH 025/132] powershell: 7.2.4 -> 7.3.2 also fix powershell/getHashses.sh script --- pkgs/shells/powershell/default.nix | 10 +++++----- pkgs/shells/powershell/getHashes.sh | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 435f54cdf4af..5dbd8eb4f22e 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -7,10 +7,10 @@ let archString = if stdenv.isAarch64 then "arm64" platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-bcLyf/sIaFoS1xS4RLPPC9lVFa94IfQlWeXhyXUTsd0=" - else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-2UACjUtyQ611iXmwyiWrGwRVA0FT1cLLMKnY0y4SgoQ=" - else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-5AZGwxpEqn3X20rCxPcvuqcQib689ui+e0jvri92EdA=" - else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-90Sz32hm+EcK3nFJOGGCSqIEtW7w48G8mizXvcLb8WU=" + platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-JKB7Oy+3KWtVo1Aqmc7vZiO88FrF9+8N/tdGlvIQolM=" + else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-9UwB1tT2VaW+favw/KWPziFMSRWcw7AqeeZvbaGOBqc=" + else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-kAcT9av4PFZfYqpS0XwKC0IiquUcVtN30Mq649PUnSM=" + else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-3Lm9WYVcfkEVfji/h52VqFy1Jo1AiSQ22JhEGiCPzzM=" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -20,7 +20,7 @@ let archString = if stdenv.isAarch64 then "arm64" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.2.4"; + version = "7.3.2"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; diff --git a/pkgs/shells/powershell/getHashes.sh b/pkgs/shells/powershell/getHashes.sh index 4453d0703f12..727eabb3de89 100755 --- a/pkgs/shells/powershell/getHashes.sh +++ b/pkgs/shells/powershell/getHashes.sh @@ -30,6 +30,9 @@ variant: $plat $arch hash: $hash " + rm -r $exDest + mkdir $exDest + done done From bedb24510b642e4660efb0bdd8d78b0ceedb9217 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 Jan 2023 08:18:39 +0800 Subject: [PATCH 026/132] stratisd: 3.4.4 -> 3.5.0 Diff: https://github.com/stratis-storage/stratisd/compare/v3.4.4...v3.5.0 --- pkgs/tools/filesystems/stratisd/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index c1456d947753..7e0c30ebf19c 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -5,6 +5,7 @@ , pkg-config , asciidoc , ncurses +, glibc , dbus , cryptsetup , util-linux @@ -24,18 +25,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.4.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-6VrbouYNB2iOndnDBfww8gT4eFgfP+HWcfep+N1nErI="; + hash = "sha256-1x6zVWFr4WNpYGVz/UGlP+lycVF2cbWJoiAmiXWzGT8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-C3nkHQt+w0OYbExDfEpFE0Et6ILJqMNRPXCEWiURf3A="; + hash = "sha256-emsmdQY2od8XVjNY/rt0BbNsVy2XKtLpe8ydZGRil+Q="; }; postPatch = '' @@ -61,6 +62,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glibc + glibc.static dbus cryptsetup util-linux @@ -81,7 +84,7 @@ stdenv.mkDerivation rec { ]); makeFlags = [ "PREFIX=${placeholder "out"}" "INSTALL=install" ]; - buildFlags = [ "build" "build-min" "docs/stratisd.8" ]; + buildFlags = [ "build-all" ]; doCheck = true; checkTarget = "test"; From c86dd99259a90a702cc73f46a064a3a871ae998c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 Jan 2023 08:18:50 +0800 Subject: [PATCH 027/132] stratis-cli: 3.4.1 -> 3.5.0 Diff: https://github.com/stratis-storage/stratis-cli/compare/v3.4.1...v3.5.0 --- pkgs/tools/filesystems/stratis-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/tools/filesystems/stratis-cli/default.nix index b39e1e0125d5..cf60c13f0fe2 100644 --- a/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/pkgs/tools/filesystems/stratis-cli/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-S0daUi0rhelip2pwcAP3WGey8BbeMa/7AgSrFfuB+cM="; + hash = "sha256-IfvI8DVjm68SewHtQbhGGU1oku4eZnF7cRyeVPB/Ctk="; }; propagatedBuildInputs = with python3Packages; [ From e5c6f32b811774a1454f21b062a9a7783e672532 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 Jan 2023 08:58:41 +0800 Subject: [PATCH 028/132] nixosTests.stratis.simple: enlarge disk size to avoid test hanging due to out of space --- nixos/tests/stratis/simple.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/stratis/simple.nix b/nixos/tests/stratis/simple.nix index 7357d71fc52b..543789f59c05 100644 --- a/nixos/tests/stratis/simple.nix +++ b/nixos/tests/stratis/simple.nix @@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, ... }: nodes.machine = { pkgs, ... }: { services.stratis.enable = true; - virtualisation.emptyDiskImages = [ 1024 1024 1024 1024 ]; + virtualisation.emptyDiskImages = [ 2048 1024 1024 1024 ]; }; testScript = '' From ad662be9499b583647d55686eaff8efe57220b44 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 Jan 2023 09:03:32 +0800 Subject: [PATCH 029/132] aml: 0.2.2 -> 0.3.0 Diff: https://github.com/any1/aml/compare/v0.2.2...v0.3.0 --- pkgs/development/libraries/aml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 392dae609c0b..1a6900d298c6 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aml"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WhhjK9uzKyvnzpGtAWXXo0upfZTPINHVk0qmzNXwobE="; + sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q="; }; nativeBuildInputs = [ meson pkg-config ninja ]; From 6d1e1508e42fef2d438dbbcbb3d9bd3ee4a8a6b4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 Jan 2023 09:04:23 +0800 Subject: [PATCH 030/132] neatvnc: 0.5.4 -> 0.6.0, enable tests Diff: https://github.com/any1/neatvnc/compare/v0.5.4...v0.6.0 Changelog: https://github.com/any1/neatvnc/releases/tag/v0.6.0 --- .../development/libraries/neatvnc/default.nix | 44 ++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index aeade2f22c14..0b4426f1a2a7 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -1,20 +1,52 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja -, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml, mesa, ffmpeg +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, aml +, ffmpeg +, gnutls +, libjpeg_turbo +, mesa +, pixman +, zlib }: stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IZUCNHhlDhq0KlUjkp3Yh5ysJsThlGw1FLHSaFe4Z0Q="; + sha256 = "sha256-3hNdgfAJGJkMXdB86+u3bKwrvXoMei1YCFXDG4ObkU4="; }; - nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml mesa ffmpeg ]; + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + aml + ffmpeg + gnutls + libjpeg_turbo + mesa + pixman + zlib + ]; + + mesonFlags = [ + (lib.mesonBool "tests" true) + ]; + + doCheck = true; meta = with lib; { description = "A VNC server library"; From 66aece4f7ffa87779858d0807b1b865c895c0bb8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 Jan 2023 09:01:20 +0800 Subject: [PATCH 031/132] wayvnc: 0.5.0 -> 0.6.1, enable checks Diff: https://github.com/any1/wayvnc/compare/v0.5.0...v0.6.1 Changelog: https://github.com/any1/wayvnc/releases/tag/v0.6.1 --- .../networking/remote/wayvnc/default.nix | 55 ++++++++++++++++--- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 12087ed108bb..18c0c3e73de6 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -1,21 +1,62 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner -, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam, mesa +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, wayland-scanner +, aml +, jansson +, libxkbcommon +, mesa +, neatvnc +, pam +, pixman +, wayland }: stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4="; + sha256 = "sha256-WKtflN6DyzumOMEx+iX0AoIyGRN4nXUckmW/9Z2EW+Q="; }; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ]; - buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ]; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + aml + jansson + libxkbcommon + mesa + neatvnc + pam + pixman + wayland + ]; + + mesonFlags = [ + (lib.mesonBool "tests" true) + ]; + + doCheck = true; meta = with lib; { description = "A VNC server for wlroots based Wayland compositors"; From 8c622b4a415da0e7532ea9fb6771cd6e45dd342e Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Wed, 25 Jan 2023 02:50:41 +0100 Subject: [PATCH 032/132] streamlink: 5.1.2 -> 5.2.1 - https://github.com/streamlink/streamlink/releases/tag/5.2.0 - https://github.com/streamlink/streamlink/releases/tag/5.2.1 --- pkgs/applications/video/streamlink/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 6a8207e7bc16..d10fd2e21a79 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "5.1.2"; + version = "5.2.1"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno="; + hash = "sha256-/YcFH5t9x9EsmK7oPvSECmhL2ypHYgPvsMdL1IupEfw="; }; nativeCheckInputs = with python3Packages; [ @@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec { requests websocket-client urllib3 + certifi ]) ++ [ ffmpeg ]; From 730163b3ed11ec6e988ace1a803894ba27199b56 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Wed, 25 Jan 2023 00:08:55 -0600 Subject: [PATCH 033/132] tut: 1.0.34 -> 2.0.0 --- .../doc/manual/from_md/release-notes/rl-2305.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ pkgs/applications/misc/tut/default.nix | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index bd53792b508b..35e053bbb7ea 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -294,6 +294,14 @@ i18n.inputMethod.kime instead. + + + tut has been updated from 1.0.34 to 2.0.0, + and now uses the TOML format for the configuration file + instead of INI. Additional information can be found + here. + + llvmPackages_rocm.llvm will not contain diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 4a2ff1ff4e08..552302390de3 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -75,6 +75,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Kime has been updated from 2.5.6 to 3.0.2 and the `i18n.inputMethod.kime.config` option has been removed. Users should use `daemonModules`, `iconColor`, and `extraConfig` options under `i18n.inputMethod.kime` instead. +- `tut` has been updated from 1.0.34 to 2.0.0, and now uses the TOML format for the configuration file instead of INI. Additional information can be found [here](https://github.com/RasmusLindroth/tut/releases/tag/2.0.0). + - `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index b5e23f15b0ba..198ea6500107 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "1.0.34"; + version = "2.0.0"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-AnuPTv9W+2yDcM803DZaNIn4S7A78JEv6S8pA18whVA="; + sha256 = "sha256-Oypl80UsYRRSIMvHDPSS6rrvzjlxZ/UKDNDGc2Yan+w="; }; - vendorHash = "sha256-go7eZHhrQ1ZcLOn56a3Azn3eRyAesAkgLabPbwzKtds="; + vendorHash = "sha256-qeYgkF9sIJ0slRarXbCHZ+1JmtZwXDnrJIpRKGOoW5Q="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; From 22ce70e8ae4a10f34eaac7e6d6e170eca0544a9c Mon Sep 17 00:00:00 2001 From: Ivan Bastrakov Date: Fri, 20 Jan 2023 17:17:29 +0300 Subject: [PATCH 034/132] maintainers: add ggwpaiushtha --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e11e93f9735b..c37f3cf0a03d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5178,6 +5178,15 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + ggwpaiushtha = { + name = "Ivan"; + email = "ggwpaiushtha@gmail.com"; + github = "GGwpAiushtha"; + githubId = 6987136; + keys = [{ + fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; + }]; + }; ghostbuster91 = { name = "Kasper Kondzielski"; email = "kghost0@gmail.com"; From ec359f58a484654cb1b49fff3aab1708d4f0b969 Mon Sep 17 00:00:00 2001 From: Ivan Bastrakov Date: Wed, 25 Jan 2023 11:39:30 +0300 Subject: [PATCH 035/132] vscode-extensions.vscode-icons-team.vscode-icons: init at 12.2.0 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 61988c9741be..2db88fa26f9f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2921,6 +2921,22 @@ let }; }; + vscode-icons-team.vscode-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-icons"; + publisher = "vscode-icons-team"; + version = "12.2.0"; + sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz"; + }; + meta = with lib; { + description = "Bring real icons to your Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscode-icons-team.vscode-icons"; + homepage = "https://github.com/vscode-icons/vscode-icons"; + license = licenses.mit; + maintainers = with maintainers; [ ggwpaiushtha ]; + }; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; From 46ca0b4c43c14c058b73c3b06edef386b49228ca Mon Sep 17 00:00:00 2001 From: Bauke Date: Tue, 24 Jan 2023 10:50:18 +0100 Subject: [PATCH 036/132] obs-studio-plugins.obs-livesplit-one: init at 0.2.0 --- .../video/obs-studio/plugins/default.nix | 2 + .../plugins/obs-livesplit-one/default.nix | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 1a7be5aa9811..ad37c503c0ab 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -16,6 +16,8 @@ obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; + obs-livesplit-one = callPackage ./obs-livesplit-one { }; + obs-move-transition = callPackage ./obs-move-transition.nix { }; obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix new file mode 100644 index 000000000000..1f4665bf9ef0 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, cmake +, fontconfig +, obs-studio +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "obs-livesplit-one"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "CryZe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-C1u4z7iQUETM84kf6S6obw+C0ox8J9gMJoVP3/3ZoYw="; + }; + + cargoHash = "sha256-mQ0TR4DL4bA5u4IL3RY9aLxU5G6qQ5W5xuNadiXGeB0="; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fontconfig obs-studio ]; + + postInstall = '' + mkdir $out/lib/obs-plugins/ + mv $out/lib/libobs_livesplit_one.so $out/lib/obs-plugins/obs-livesplit-one.so + ''; + + meta = with lib; { + description = "OBS Studio plugin for adding LiveSplit One as a source"; + homepage = "https://github.com/CryZe/obs-livesplit-one"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.Bauke ]; + platforms = obs-studio.meta.platforms; + }; +} From 08390a0ed47a3476f506b8dab6376d5f0312faaa Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 25 Jan 2023 01:43:50 -0800 Subject: [PATCH 037/132] pahole: fix self-referential description --- pkgs/development/tools/misc/pahole/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index ab4db7a8cc8c..ec9fb436f764 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/"; - description = "Pahole and other DWARF utils"; + description = "Shows, manipulates, and pretty-prints debugging information in DWARF, CTF, and BTF formats"; license = licenses.gpl2Only; platforms = platforms.linux; From 27a8717936cd22207449e8d63c03659acf83a3da Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 25 Jan 2023 10:44:50 +0000 Subject: [PATCH 038/132] drive: 0.3.8.1 -> 0.4.0 --- .../applications/networking/drive/default.nix | 26 ++- pkgs/applications/networking/drive/deps.nix | 192 ------------------ 2 files changed, 18 insertions(+), 200 deletions(-) delete mode 100644 pkgs/applications/networking/drive/deps.nix diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index ad1a0c9a533c..576133e650c8 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -1,25 +1,35 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "drive"; - version = "0.3.8.1"; - - goPackagePath = "github.com/odeke-em/drive"; - subPackages = [ "cmd/drive" ]; + version = "0.4.0"; src = fetchFromGitHub { owner = "odeke-em"; repo = "drive"; rev = "v${version}"; - sha256 = "1b9cgc148rg5irg4jas10zv9i2km75x1zin25hld340dmpjcpi82"; + hash = "sha256-mNOeOB0Tn5eqULFJZuE18PvLoHtnspv4AElmgEQKXcU="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-F/ikdr7UCVlNv2yiEemyB7eIkYi3mX+rJvSfX488RFc="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/odeke-em/drive/commit/0fb4bb2cf83a7293d9a33b00f8fc07e1c8dd8b7c.patch"; + hash = "sha256-4PxsgfufhTfmy/7N5QahIhmRa0rb2eUDXJ66pYb6jFg="; + }) + ]; + + subPackages = [ "cmd/drive" ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/odeke-em/drive"; description = "Google Drive client for the commandline"; license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix deleted file mode 100644 index ca132288bd69..000000000000 --- a/pkgs/applications/networking/drive/deps.nix +++ /dev/null @@ -1,192 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "7450882a75c8d2600748666d1ed16e0a5afa532d"; - sha256 = "1hl2lsf9m1imdszf5mww4h6qrcjfdjghwh6l2kqsy85d32vbkjgd"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "074dffcc83e9f421e261526d297cd93f22a34080"; - sha256 = "1kkmsby74n9czqx4mvng9x1cvnm4qgjl3dp6b4mfmg2b00fwbqnv"; - }; - } - { - goPackagePath = "github.com/cheggaaa/pb"; - fetch = { - type = "git"; - url = "https://github.com/cheggaaa/pb"; - rev = "ad4efe000aa550bb54918c06ebbadc0ff17687b9"; - sha256 = "0w6dl2s0vzb64q85yfy1hd5z2fq2vzwygiwl65is6hwa4vkc7hi3"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; - sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; - }; - } - { - goPackagePath = "github.com/odeke-em/cache"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/cache"; - rev = "baf8e436bc97557118cb0bf118ab8ac6aeeda381"; - sha256 = "00nvrnp40w4m1ld89k3s3gwi9qcfjxwi8hnp62zggnvqqyc4fyz1"; - }; - } - { - goPackagePath = "github.com/odeke-em/cli-spinner"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/cli-spinner"; - rev = "610063bb4aeef25f7645b3e6080456655ec0fb33"; - sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"; - }; - } - { - goPackagePath = "github.com/odeke-em/command"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/command"; - rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"; - sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62"; - }; - } - { - goPackagePath = "github.com/odeke-em/exponential-backoff"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/exponential-backoff"; - rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09"; - sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6"; - }; - } - { - goPackagePath = "github.com/odeke-em/extractor"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/extractor"; - rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4"; - sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1"; - }; - } - { - goPackagePath = "github.com/odeke-em/go-utils"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/go-utils"; - rev = "d915395a7a46a9fe73d93f4daeff5953eeac5ef2"; - sha256 = "0c1z4vmz69vxak8ldw4qjcgwia5ph969gj80az7a3824gia7zhbh"; - }; - } - { - goPackagePath = "github.com/odeke-em/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/go-uuid"; - rev = "b211d769a9aaba5b2b8bdbab5de3c227116f3c39"; - sha256 = "086l4xmwkjl5qcylcb5iwy9ksk9k5g43xwfbkcgvmhpz5mq3wmz2"; - }; - } - { - goPackagePath = "github.com/odeke-em/log"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/log"; - rev = "cad53c4565a0b0304577bd13f3862350bdc5f907"; - sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"; - }; - } - { - goPackagePath = "github.com/odeke-em/meddler"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/meddler"; - rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570"; - sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x"; - }; - } - { - goPackagePath = "github.com/odeke-em/pretty-words"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/pretty-words"; - rev = "9d37a7fcb4ae6f94b288d371938482994458cecb"; - sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl"; - }; - } - { - goPackagePath = "github.com/odeke-em/semalim"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/semalim"; - rev = "9c88bf5f9156ed06ec5110a705d41b8580fd96f7"; - sha256 = "0nq93dcl84cmlvg31rdk281ndlc2452zlh5s7i40hasi0z0kmn1k"; - }; - } - { - goPackagePath = "github.com/odeke-em/statos"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/statos"; - rev = "6f7e4db337bc11fc46d9b0456a93836cbbfe5141"; - sha256 = "1lijz3cxqxd78sl0nzfgvs675dg7q99jqwvhgisnk9n84ic4ffzj"; - }; - } - { - goPackagePath = "github.com/skratchdot/open-golang"; - fetch = { - type = "git"; - url = "https://github.com/skratchdot/open-golang"; - rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"; - sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; - sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; - sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "1e695b1c8febf17aad3bfa7bf0a819ef94b98ad5"; - sha256 = "1sfgrc63jwslczkld7bsfipw1jm1rn06228dx0vc5gggd52155ys"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "eb84d1a029af1654777e7ba65c979085305c3e38"; - sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l"; - }; - } -] From d39f3cad58c63ad276bdba3e3dac93a3a5f7ed62 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Wed, 25 Jan 2023 12:42:16 +0100 Subject: [PATCH 039/132] got 0.81 -> 0.82 --- pkgs/applications/version-management/got/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 392551aace3e..7db96739b2b5 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.81"; + version = "0.82"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-ayPXOtqJIJAzDTY1T4rw9GF7KvfI2XJ/c9uo4Fs8db8="; + sha256 = "sha256-Lb0WZ4gTuG/GBAnEh9ff/K0ciwjDX3cmEhItMyJ/lmI="; }; nativeBuildInputs = [ pkg-config bison ]; From b547e203d68ca8aa7380d9d93c84a2146c4048cf Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 25 Jan 2023 12:43:37 +0100 Subject: [PATCH 040/132] boinc: 7.20.5 -> 7.22.0 https://github.com/BOINC/boinc/releases/tag/client_release%2F7.22%2F7.22.0 --- pkgs/applications/science/misc/boinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 8dc19a57be54..05ff1f09533f 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "7.20.5"; + version = "7.22.0"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-KqD986Q7npKTnh0DdNgMHro+1M/UQHiNsXaRl9WjONw="; + hash = "sha256-AVWgFsxeuHADEat83XQLLeQkzw3kaUdPL0rp8b6Rxyk="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; From dae7d8f1cabc688ecfe604e6f995416c9f5d3b7d Mon Sep 17 00:00:00 2001 From: msm Date: Tue, 24 Jan 2023 01:26:21 +0100 Subject: [PATCH 041/132] gsocket: init at 1.4.39 --- pkgs/tools/networking/gsocket/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/gsocket/default.nix diff --git a/pkgs/tools/networking/gsocket/default.nix b/pkgs/tools/networking/gsocket/default.nix new file mode 100644 index 000000000000..e25a31a0a1db --- /dev/null +++ b/pkgs/tools/networking/gsocket/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl }: + +stdenv.mkDerivation rec { + pname = "gsocket"; + version = "1.4.39"; + + src = fetchFromGitHub { + owner = "hackerschoice"; + repo = "gsocket"; + rev = "v${version}"; + sha256 = "sha256-iSII21X3F4Cb1UqF0aYw23N7CyeTQMmziRioEULx9Zk="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl ]; + dontDisableStatic = true; + + meta = with lib; { + description = "Connect like there is no firewall, securely"; + homepage = "https://www.gsocket.io"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.msm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d38e73927d10..0533deda24c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4779,6 +4779,8 @@ with pkgs; gsctl = callPackage ../applications/misc/gsctl { }; + gsocket = callPackage ../tools/networking/gsocket { }; + gthree = callPackage ../development/libraries/gthree { }; gtg = callPackage ../applications/office/gtg { }; From c7742aa032f590cd3e52f86f581a00b51e209a00 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 15:51:54 +0800 Subject: [PATCH 042/132] deepin: init at 20.8 --- pkgs/desktops/deepin/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/desktops/deepin/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix new file mode 100644 index 000000000000..98a1daadfe2d --- /dev/null +++ b/pkgs/desktops/deepin/default.nix @@ -0,0 +1,10 @@ +{ lib, pkgs, libsForQt5 }: +let + packages = self: + let + inherit (self) callPackage; + in { + + }; +in +lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b15a51fbcb9a..526ee30534a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35393,6 +35393,8 @@ with pkgs; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); inherit (cinnamon) mint-x-icons mint-y-icons; + deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); From 021437ea7bd4d20e9ad5b5766c71096f4531b54c Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 16:19:55 +0800 Subject: [PATCH 043/132] dtkcommon: init at 5.6.3 --- pkgs/desktops/deepin/default.nix | 3 +- .../deepin/library/dtkcommon/default.nix | 45 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/deepin/library/dtkcommon/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 98a1daadfe2d..1f111e11242e 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -4,7 +4,8 @@ let let inherit (self) callPackage; in { - + #### LIBRARIES + dtkcommon = callPackage ./library/dtkcommon { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix new file mode 100644 index 000000000000..24e22e99c502 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, qtbase +, qttools +, wrapQtAppsHook +, glib +}: + +stdenv.mkDerivation rec { + pname = "dtkcommon"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-9gFJ0Uun0q/XVaegxTUu4Kkc+/GE09eAV68VZgWurrM="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ qtbase ]; + + qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + ''; + + meta = with lib; { + description = "A public project for building DTK Library"; + homepage = "https://github.com/linuxdeepin/dtkcommon"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 919157fcbd75fb5552c4b8494a1768e890e4065a Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 16:27:24 +0800 Subject: [PATCH 044/132] dtkcore: init at 5.6.3 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/library/dtkcore/default.nix | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/desktops/deepin/library/dtkcore/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 1f111e11242e..f61c139497d1 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -6,6 +6,7 @@ let in { #### LIBRARIES dtkcommon = callPackage ./library/dtkcommon { }; + dtkcore = callPackage ./library/dtkcore { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix new file mode 100644 index 000000000000..282d079570d3 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, gsettings-qt +, wrapQtAppsHook +, lshw +, dtkcommon +}: + +stdenv.mkDerivation rec { + pname = "dtkcore"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-DEpo/eKMjtTVGEkq5JofkRNSHtTOZ1t2QNjrdulUtPQ="; + }; + + postPatch = '' + substituteInPlace src/dsysinfo.cpp \ + --replace "/usr/share/deepin/distribution.info" "/etc/distribution.info" \ + ''; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + gsettings-qt + lshw + ]; + + propagatedBuildInputs = [ dtkcommon ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DBUILD_DOCS=OFF" + "-DDSG_PREFIX_PATH='/run/current-system/sw'" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + ]; + + meta = with lib; { + description = "Deepin tool kit core library"; + homepage = "https://github.com/linuxdeepin/dtkcore"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 056add9b3f1dfad86540fdf35535c393c4098620 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 16:34:02 +0800 Subject: [PATCH 045/132] dtkgui: init at 5.6.3 --- pkgs/desktops/deepin/default.nix | 2 + .../deepin/library/dtkgui/default.nix | 57 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/desktops/deepin/library/dtkgui/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index f61c139497d1..fe0f073a3ad3 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -7,6 +7,8 @@ let #### LIBRARIES dtkcommon = callPackage ./library/dtkcommon { }; dtkcore = callPackage ./library/dtkcore { }; + dtkgui = callPackage ./library/dtkgui { }; + }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix new file mode 100644 index 000000000000..0cc40768285a --- /dev/null +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, qttools +, wrapQtAppsHook +, librsvg +, lxqt +, dtkcore +, qtimageformats +, freeimage +}: + +stdenv.mkDerivation rec { + pname = "dtkgui"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-r6ZwGPiK6CcKEg8RoHV07wJbQI3idJFV3WFtuKim8n4="; + }; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + lxqt.libqtxdg + ]; + + propagatedBuildInputs = [ + dtkcore + librsvg + qtimageformats + freeimage + ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DBUILD_DOCS=OFF" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + ]; + + meta = with lib; { + description = "Deepin Toolkit, gui module for DDE look and feel"; + homepage = "https://github.com/linuxdeepin/dtkgui"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 0bdd362cd14b402415a8ddbc26e1813a94c0510f Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 16:36:30 +0800 Subject: [PATCH 046/132] dtkwidget: init at 5.6.3 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/library/dtkwidget/default.nix | 67 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 pkgs/desktops/deepin/library/dtkwidget/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index fe0f073a3ad3..a356e98d6444 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -8,6 +8,7 @@ let dtkcommon = callPackage ./library/dtkcommon { }; dtkcore = callPackage ./library/dtkcore { }; dtkgui = callPackage ./library/dtkgui { }; + dtkwidget = callPackage ./library/dtkwidget { }; }; in diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix new file mode 100644 index 000000000000..170ae821eba2 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkgui +, pkg-config +, cmake +, qttools +, qtmultimedia +, qtsvg +, qtx11extras +, wrapQtAppsHook +, cups +, gsettings-qt +, libstartup_notification +, xorg +}: + +stdenv.mkDerivation rec { + pname = "dtkwidget"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-APk2p8pdLsaKvPp95HtEI1F1LM4ySUL+fhGsC5vHasU="; + }; + + postPatch = '' + substituteInPlace src/widgets/dapplication.cpp \ + --replace "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \ + "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtmultimedia + qtsvg + qtx11extras + cups + gsettings-qt + libstartup_notification + xorg.libXdmcp + ]; + + propagatedBuildInputs = [ dtkgui ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DBUILD_DOCS=OFF" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + ]; + + meta = with lib; { + description = "Deepin graphical user interface library"; + homepage = "https://github.com/linuxdeepin/dtkwidget"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 9ac7f410a96ca909ec2c12ad5a5840f949f08373 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 16:41:14 +0800 Subject: [PATCH 047/132] qt5platform-plugins: init at 5.6.3 --- pkgs/desktops/deepin/default.nix | 1 + .../library/qt5platform-plugins/default.nix | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/desktops/deepin/library/qt5platform-plugins/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index a356e98d6444..e1fb4592f9e7 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -9,6 +9,7 @@ let dtkcore = callPackage ./library/dtkcore { }; dtkgui = callPackage ./library/dtkgui { }; dtkwidget = callPackage ./library/dtkwidget { }; + qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; }; in diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix new file mode 100644 index 000000000000..6ebe542398b7 --- /dev/null +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, pkg-config +, qtbase +, qtx11extras +, wrapQtAppsHook +, mtdev +, cairo +, xorg +, waylandSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "qt5platform-plugins"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk="; + }; + + ## https://github.com/linuxdeepin/qt5platform-plugins/pull/119 + postPatch = '' + rm -r xcb/libqt5xcbqpa-dev/ + mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version} + cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/ + ''; + + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + + buildInputs = [ + mtdev + cairo + qtbase + qtx11extras + xorg.libSM + ]; + + qmakeFlags = [ + "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" + ] + ++ lib.optional (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; + + meta = with lib; { + description = "Qt platform plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 88d1f28740fd9f50318981f1d2064a33cbca7b83 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 16:46:20 +0800 Subject: [PATCH 048/132] qt5integration: init at 5.6.4 --- pkgs/desktops/deepin/default.nix | 3 +- .../deepin/library/qt5integration/default.nix | 55 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/deepin/library/qt5integration/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index e1fb4592f9e7..2ebdf84e4877 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -10,7 +10,8 @@ let dtkgui = callPackage ./library/dtkgui { }; dtkwidget = callPackage ./library/dtkwidget { }; qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; - + qt5integration = callPackage ./library/qt5integration { }; + }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix new file mode 100644 index 000000000000..af34c6cfb766 --- /dev/null +++ b/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qmake +, qtbase +, qtsvg +, pkg-config +, wrapQtAppsHook +, qtx11extras +, qt5platform-plugins +, lxqt +, mtdev +, xorg +, gtest +}: + +stdenv.mkDerivation rec { + pname = "qt5integration"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-GXxPoBM4tlWezTfv/f+/IJezzcAsuMbr/OOGaSOpn2g="; + }; + + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + + buildInputs = [ + dtkwidget + qtx11extras + qt5platform-plugins + mtdev + lxqt.libqtxdg + xorg.xcbutilrenderutil + gtest + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/${qtbase.qtPluginPrefix} + cp -r bin/plugins/* $out/${qtbase.qtPluginPrefix}/ + runHook postInstall + ''; + + meta = with lib; { + description = "Qt platform theme integration plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt5integration"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 7d5b5077b87c7d6d1abf2cba6f28d612880fd9e2 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 16:57:40 +0800 Subject: [PATCH 049/132] disomaster: init at 5.0.8 --- pkgs/desktops/deepin/default.nix | 2 +- .../deepin/library/disomaster/default.nix | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/deepin/library/disomaster/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 2ebdf84e4877..999b4d897b47 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -11,7 +11,7 @@ let dtkwidget = callPackage ./library/dtkwidget { }; qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; qt5integration = callPackage ./library/qt5integration { }; - + disomaster = callPackage ./library/disomaster { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix new file mode 100644 index 000000000000..3f65505e0af5 --- /dev/null +++ b/pkgs/desktops/deepin/library/disomaster/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, qmake +, qttools +, wrapQtAppsHook +, libisoburn +}: + +stdenv.mkDerivation rec { + pname = "disomaster"; + version = "5.0.8"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY="; + }; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ libisoburn ]; + + qmakeFlags = [ "VERSION=${version}" ]; + + meta = with lib; { + description = "A libisoburn wrapper class for Qt"; + homepage = "https://github.com/linuxdeepin/disomaster"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 211d1584cea09649a67ff9ab884d2b3c68746d68 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 16:59:32 +0800 Subject: [PATCH 050/132] docparser: init at 1.0.3 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/library/docparser/default.nix | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/desktops/deepin/library/docparser/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 999b4d897b47..4225cdd48e70 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -12,6 +12,7 @@ let qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; qt5integration = callPackage ./library/qt5integration { }; disomaster = callPackage ./library/disomaster { }; + docparser = callPackage ./library/docparser { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix new file mode 100644 index 000000000000..8605a0d214b7 --- /dev/null +++ b/pkgs/desktops/deepin/library/docparser/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, qmake +, qttools +, wrapQtAppsHook +, poppler +}: + +stdenv.mkDerivation rec { + pname = "docparser"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-iWRWSu8fALTTLLWdQGbpunN/1tpvKxuN/ZWJg34x0mU="; + }; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ poppler ]; + + qmakeFlags = [ "VERSION=${version}" ]; + + meta = with lib; { + description = "A document parser library ported from document2html"; + homepage = "https://github.com/linuxdeepin/docparser"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From f45d637b6ac85192d41997ff8438d3aaab1f4772 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 17:10:01 +0800 Subject: [PATCH 051/132] dde-qt-dbus-factory: init at 5.5.22 --- pkgs/desktops/deepin/default.nix | 1 + .../library/dde-qt-dbus-factory/default.nix | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4225cdd48e70..69ecdb4a8150 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -11,6 +11,7 @@ let dtkwidget = callPackage ./library/dtkwidget { }; qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; qt5integration = callPackage ./library/qt5integration { }; + dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; disomaster = callPackage ./library/disomaster { }; docparser = callPackage ./library/docparser { }; }; diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix new file mode 100644 index 000000000000..ef302c5b7222 --- /dev/null +++ b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, qtbase +, wrapQtAppsHook +, python3 +, dtkcore +}: + +stdenv.mkDerivation rec { + pname = "dde-qt-dbus-factory"; + version = "5.5.22"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-jqk04S+i3py3rVJcHmkPKHsU+eNEN1yoUBBlfXBbcwM="; + }; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + python3 + ]; + + buildInputs = [ + qtbase + dtkcore + ]; + + qmakeFlags = [ + "INSTALL_ROOT=${placeholder "out"}" + "LIB_INSTALL_DIR=${placeholder "out"}/lib" + ]; + + postPatch = '' + substituteInPlace libdframeworkdbus/libdframeworkdbus.pro \ + --replace "/usr" "" + + substituteInPlace libdframeworkdbus/DFrameworkdbusConfig.in \ + --replace "/usr/include" "$out/include" + ''; + + meta = with lib; { + description = "Repo of auto-generated D-Bus source code which DDE used"; + homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From e4352b39a9e2e98984afa54e87553aaf233b4958 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 17:13:35 +0800 Subject: [PATCH 052/132] gio-qt: init at 0.0.11 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/library/gio-qt/default.nix | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/desktops/deepin/library/gio-qt/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 69ecdb4a8150..9081f1c17306 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -14,6 +14,7 @@ let dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; disomaster = callPackage ./library/disomaster { }; docparser = callPackage ./library/docparser { }; + gio-qt = callPackage ./library/gio-qt { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix new file mode 100644 index 000000000000..a38e89bfc5bd --- /dev/null +++ b/pkgs/desktops/deepin/library/gio-qt/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, glibmm +, doxygen +, buildDocs ? false +}: + +stdenv.mkDerivation rec { + pname = "gio-qt"; + version = "0.0.11"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-dlY1CTlXywgGZUonBBe3cDwx8h2xXrPY6Ft/D59nlug="; + }; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DPROJECT_VERSION=${version}" + ] + ++ lib.optional (!buildDocs) [ "-DBUILD_DOCS=OFF" ]; + + buildInputs = lib.optional buildDocs doxygen; + + propagatedBuildInputs = [ glibmm ]; + + meta = with lib; { + description = "Gio wrapper for Qt applications"; + homepage = "https://github.com/linuxdeepin/gio-qt"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 70fc129915e13885caa26493da3869e86cfd94af Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 17:16:48 +0800 Subject: [PATCH 053/132] image-editor: init at 1.0.24 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/library/image-editor/default.nix | 69 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 pkgs/desktops/deepin/library/image-editor/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 9081f1c17306..d23909bba0a1 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -15,6 +15,7 @@ let disomaster = callPackage ./library/disomaster { }; docparser = callPackage ./library/docparser { }; gio-qt = callPackage ./library/gio-qt { }; + image-editor = callPackage ./library/image-editor { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix new file mode 100644 index 000000000000..ec5f3568fbd6 --- /dev/null +++ b/pkgs/desktops/deepin/library/image-editor/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, cmake +, qttools +, pkg-config +, wrapQtAppsHook +, opencv +, freeimage +, libmediainfo +, ffmpegthumbnailer +, pcre +}: + +stdenv.mkDerivation rec { + pname = "image-editor"; + version = "1.0.24"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-0p/aicuBfaEyvfZomnz49IJLospWIdl23ZreDe+Bzqc="; + }; + + patches = [ + (fetchpatch { + name = "feat_check_PREFIX_value_before_set"; + url = "https://github.com/linuxdeepin/image-editor/commit/dae86e848cf53ba0ece879d81e8d5335d61a7473.patch"; + sha256 = "sha256-lxmR+nIrMWVyhl1jpA17x2yqJ40h5vnpqKKcjd8j9RY="; + }) + (fetchpatch { + name = "feat_use_FULL_install_path"; + url = "https://github.com/linuxdeepin/image-editor/commit/855ae53a0444ac628aa0fe893932df6263b82e2e.patch"; + sha256 = "sha256-3Dynlwl/l/b6k6hOHjTdoDQ/VGBDfyRz9b8QY8FEsCc="; + }) + ]; + + postPatch = '' + substituteInPlace libimageviewer/service/ffmpegvideothumbnailer.cpp \ + --replace 'libPath("libffmpegthumbnailer.so")' 'QString("${ffmpegthumbnailer.out}/lib/libffmpegthumbnailer.so")' + + substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out' + substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out' + ''; + + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + + buildInputs = [ + dtkwidget + opencv + freeimage + libmediainfo + ffmpegthumbnailer + pcre + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + meta = with lib; { + description = "Image editor lib for dtk"; + homepage = "https://github.com/linuxdeepin/image-editor"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From b1bda0a354c82a804e229bf23b5fdb2f4cc24dfb Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 17:20:32 +0800 Subject: [PATCH 054/132] udisks2-qt5: init at 5.0.6 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/library/udisks2-qt5/default.nix | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/desktops/deepin/library/udisks2-qt5/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index d23909bba0a1..660004821345 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -16,6 +16,7 @@ let docparser = callPackage ./library/docparser { }; gio-qt = callPackage ./library/gio-qt { }; image-editor = callPackage ./library/image-editor { }; + udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix new file mode 100644 index 000000000000..84321809ebeb --- /dev/null +++ b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, pkg-config +, wrapQtAppsHook +, udisks +}: + +stdenv.mkDerivation rec { + pname = "udisks2-qt5"; + version = "5.0.6"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4="; + }; + + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + + buildInputs = [ udisks ]; + + qmakeFlags = [ "VERSION=${version}" ]; + + meta = with lib; { + description = "UDisks2 D-Bus interfaces binding for Qt5"; + homepage = "https://github.com/linuxdeepin/udisks2-qt5"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 1388b62e97d069c9362caf42cbdcb725fa940649 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 25 Jan 2023 18:33:32 +0800 Subject: [PATCH 055/132] wpsoffice: fix auto-patchelf dependencies --- pkgs/applications/office/wpsoffice/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index d19a4a88fe7d..6aa7c8f78d13 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -83,6 +83,11 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; dontWrapGApps = true; + preFixup = '' + # The following libraries need libtiff.so.5, but nixpkgs provides libtiff.so.6 + patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so} + ''; + postFixup = '' for f in "$out"/bin/*; do echo "Wrapping $f" From 0287788bb0ba734e95405333ddf0217af5a6efed Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 25 Jan 2023 09:17:17 -0500 Subject: [PATCH 056/132] lxd: add adamcstephens as maintainer --- pkgs/tools/admin/lxd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 45e12177ae61..d9acd15822be 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -104,7 +104,7 @@ buildGoModule rec { homepage = "https://linuxcontainers.org/lxd/"; changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ marsam adamcstephens ]; platforms = platforms.linux; }; } From b640c476c5bc8b5826c07512ae76cdf5009677d1 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 25 Jan 2023 09:17:41 -0500 Subject: [PATCH 057/132] lxd: 5.9 -> 5.10 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index d9acd15822be..a0db37fba54c 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -32,14 +32,14 @@ buildGoModule rec { pname = "lxd"; - version = "5.9"; + version = "5.10"; src = fetchurl { urls = [ "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - sha256 = "sha256-okz3++PlUno03tp+jpLxfAWlFJhyOCH2mxRtHo5YEX8="; + hash = "sha256-sYJkPr/tE22xJEjKX7fMjOLQ9zBDm52UjqbVLrm39zU="; }; vendorSha256 = null; From 398117d5b9bcdb70a9e4ee8720bb1ed992930471 Mon Sep 17 00:00:00 2001 From: iko Date: Wed, 18 Jan 2023 11:49:54 +0300 Subject: [PATCH 058/132] reshape: init at 0.6.1 --- pkgs/development/tools/reshape/Cargo.lock | 1080 ++++++++++++++++++++ pkgs/development/tools/reshape/default.nix | 50 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 1132 insertions(+) create mode 100644 pkgs/development/tools/reshape/Cargo.lock create mode 100644 pkgs/development/tools/reshape/default.nix diff --git a/pkgs/development/tools/reshape/Cargo.lock b/pkgs/development/tools/reshape/Cargo.lock new file mode 100644 index 000000000000..1fd0e6d02840 --- /dev/null +++ b/pkgs/development/tools/reshape/Cargo.lock @@ -0,0 +1,1080 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "any_ascii" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +dependencies = [ + "backtrace", +] + +[[package]] +name = "async-trait" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + +[[package]] +name = "erased-serde" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d" +dependencies = [ + "serde", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-core", + "futures-macro", + "futures-sink", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghost" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gimli" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "inventory" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84344c6e0b90a9e2b6f3f9abe5cc74402684e348df7b32adca28747e0cef091a" +dependencies = [ + "ctor", + "ghost", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-sort" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a" +dependencies = [ + "any_ascii", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys", +] + +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "postgres" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960c214283ef8f0027974c03e9014517ced5db12f021a9abb66185a5751fab0a" +dependencies = [ + "bytes", + "fallible-iterator", + "futures-util", + "log", + "tokio", + "tokio-postgres", +] + +[[package]] +name = "postgres-protocol" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "878c6cbf956e03af9aa8204b407b9cbf47c072164800aa918c516cd4b056c50c" +dependencies = [ + "base64", + "byteorder", + "bytes", + "fallible-iterator", + "hmac", + "md-5", + "memchr", + "rand", + "sha2", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73d946ec7d256b04dfadc4e6a3292324e6f417124750fc5c0950f981b703a0f1" +dependencies = [ + "bytes", + "fallible-iterator", + "postgres-protocol", + "serde", + "serde_json", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "reshape" +version = "0.6.1" +dependencies = [ + "anyhow", + "clap", + "colored", + "dotenv", + "lexical-sort", + "postgres", + "rand", + "serde", + "serde_json", + "toml", + "typetag", + "version", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "stringprep" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "pin-project-lite", + "socket2", + "windows-sys", +] + +[[package]] +name = "tokio-postgres" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29a12c1b3e0704ae7dfc25562629798b29c72e6b1d0a681b6f29ab4ae5e7f7bf" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator", + "futures-channel", + "futures-util", + "log", + "parking_lot", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "socket2", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "typetag" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4080564c5b2241b5bff53ab610082234e0c57b0417f4bd10596f183001505b8a" +dependencies = [ + "erased-serde", + "inventory", + "once_cell", + "serde", + "typetag-impl", +] + +[[package]] +name = "typetag-impl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e60147782cc30833c05fba3bab1d9b5771b2685a2557672ac96fa5d154099c0e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "version" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a449064fee414fcc201356a3e6c1510f6c8829ed28bb06b91c54ebe208ce065" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/pkgs/development/tools/reshape/default.nix b/pkgs/development/tools/reshape/default.nix new file mode 100644 index 000000000000..45e76ccaf6e5 --- /dev/null +++ b/pkgs/development/tools/reshape/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, fetchpatch +, git +, postgresqlTestHook +, postgresql +}: + +rustPlatform.buildRustPackage rec { + pname = "reshape"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "fabianlindfors"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iX8qhDk0PP0AB3bJ6ck8AZ9SCErFH416ggAkgK8O900="; + }; + + nativeCheckInputs = [ + postgresqlTestHook + postgresql + ]; + + dontUseCargoParallelTests = true; + + postgresqlTestSetupPost = '' + export POSTGRES_CONNECTION_STRING="user=$PGUSER dbname=$PGDATABASE host=$PGHOST" + ''; + + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + + # upstream doesn't ship a Cargo.lock, is generated by the update script + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoLock.lockFile = ./Cargo.lock; + + cargoHash = "sha256-UL/vP8055JRbbf5bqf0V3wGh+iF9ztVhyoMrtNs/c+4="; + + meta = with lib; { + description = "An easy-to-use, zero-downtime schema migration tool for Postgres"; + homepage = "https://github.com/fabianlindfors/reshape"; + license = licenses.mit; + maintainers = with maintainers; [ ilyakooo0 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc7c6e5ca6cb..7e8ccb683d79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18278,6 +18278,8 @@ with pkgs; inherit (callPackage ../development/tools/replay-io { }) replay-io replay-node-cli; + reshape = callPackage ../development/tools/reshape { } ; + retdec = callPackage ../development/tools/analysis/retdec { stdenv = gcc8Stdenv; }; From 941c8c15fcf6d19d38eadb0489ba83669d652c8c Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 25 Jan 2023 09:20:18 -0500 Subject: [PATCH 059/132] hurl: 1.8.0 -> 2.0.0 Diff: https://github.com/Orange-OpenSource/hurl/compare/1.8.0...2.0.0 Changelog: https://github.com/Orange-OpenSource/hurl/raw/2.0.0/CHANGELOG.md --- pkgs/tools/networking/hurl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index fa14d0ec5bf2..4a56b8b651eb 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/tools/networking/hurl/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "1.8.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "sha256-d2iWLswlKBow1B+cOaSmsHVWXk/ugwf3pn3OiLhCml0="; + sha256 = "sha256-CQDyIGUIijNphOVo+aYZ7SqkxE4md9+H3D/g7jdqV+M="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "sha256-A3vl7QRKuox8aE0FsEOiVH/5sRMnKNcdjT2wWPLhd+4="; + cargoSha256 = "sha256-wNiEULv+0WlZruxibcKqsw4Ym3retwjoGKXxzACcEeA="; postInstall = '' installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1 From 8e7698746a71b3e927a2f57df3854c6e8e6d24f6 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Tue, 24 Jan 2023 13:33:45 +0100 Subject: [PATCH 060/132] timescaledb: 2.9.1 -> 2.9.2, comment updated --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 52a3ff1b6824..7c9e8fa69595 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,14 +1,19 @@ { lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5 }: # # To enable on NixOS: -# config.services.postgresql = { -# extraPlugins = [ pkgs.timescaledb ]; -# extraConfig = "shared_preload_libraries = 'timescaledb'"; +# config.services.postgresql = let +# # The postgresql pkgs has to be taken from the +# # postgresql package used, so the extensions +# # are built for the correct postgresql version. +# postgresqlPackages = config.services.postgresql.package.pkgs; +# in { +# extraPlugins = with postgresqlPackages; [ timescaledb ]; +# settings.shared_preload_libraries = "timescaledb"; # } stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.9.1"; + version = "2.9.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,7 +22,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-fvVSxDiGZAewyuQ2vZDb0I6tmlDXl6trjZp8+qDBtb8="; + sha256 = "sha256-3n3nqAVow8nIocXPsgCZcNkV+jr/G5/CmnSUfj2WMWo="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] From 3b628e860c729a419c4ab12ea7193250024f8ea7 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 25 Jan 2023 16:19:09 +0100 Subject: [PATCH 061/132] organicmaps: 2022.11.24-3 -> 2023.01.25-3 --- pkgs/applications/misc/organicmaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 625f1cb26a9a..bbd8aaaa848b 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.11.24-3"; + version = "2023.01.25-3"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-4RW7/sCtOXxA8n0Jx4ksNGRg7r8ErujmyzbnA1pi6ng="; + sha256 = "sha256-4nlD/GFOoBOCXVWtC7i6SUquEbob5++GyagZOTznygU="; fetchSubmodules = true; }; From e72965f92724657e509b850da3ebe64a41b5a4aa Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 25 Jan 2023 16:23:25 +0100 Subject: [PATCH 062/132] ft2-clone: 1.62 -> 1.63 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index d4584e191d50..886662faf473 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.62"; + version = "1.63"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-PHDkCE30sVAFXHjG8d/4ETSDS2KO/j43iMMW0PhCFgI="; + sha256 = "sha256-uDAW97lTeL15PPpR5vlIS371EZ7BBNd86ETPEB8joSU="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) From d5a37dee6abd20d72d95ae06a69254ec125bee03 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 25 Jan 2023 16:31:18 +0100 Subject: [PATCH 063/132] pt2-clone: 1.56 -> 1.57 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index e3a2fa0333b1..b0aa2ae19ba1 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.56"; + version = "1.57"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-NetzlQdhbyClnVQTrHoX9QpVtoj8a8FoDue+uxhgrlA="; + sha256 = "sha256-YUGTcL/k+MbAnB/kcWPEmrGxGF/kSHdIgdBVUqCsDWM="; }; nativeBuildInputs = [ cmake ]; From 451cd731646a30f82282ef5e071d38be51d0786c Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 25 Jan 2023 10:35:19 -0500 Subject: [PATCH 064/132] rsass: 0.26.0 -> 0.27.0 Changelog: https://github.com/kaj/rsass/blob/v0.27.0/CHANGELOG.md --- pkgs/development/tools/misc/rsass/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/rsass/default.nix b/pkgs/development/tools/misc/rsass/default.nix index 8ce2e3c58137..dd681f4685e6 100644 --- a/pkgs/development/tools/misc/rsass/default.nix +++ b/pkgs/development/tools/misc/rsass/default.nix @@ -2,16 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "rsass"; - version = "0.26.0"; + version = "0.27.0"; src = fetchCrate { - inherit pname version; - sha256 = "sha256-Ksub+VYTbaWbFpHJFrMr6Dnx6LOnEOUlI2qHhCfbS40="; + pname = "rsass-cli"; + inherit version; + sha256 = "sha256-IaXfxccRRY868waEPI7qbWp1SSAhJlRqgeEiRNddC/c="; }; - cargoSha256 = "sha256-ugG4ivQ2NzLJeZss7h9TME2Aipurl1LZBgxt1cYaK2E="; - - buildFeatures = [ "commandline" ]; + cargoSha256 = "sha256-2owdX9ePHcAXpE43Svan252lAa5ICk0/DrDeADegZ6U="; meta = with lib; { description = "Sass reimplemented in rust with nom"; From 2af916b27739c2762da92af85b5731a803044ebd Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:58:50 +0800 Subject: [PATCH 065/132] brook: 20230101 -> 20230122 Diff: https://github.com/txthinking/brook/compare/v20230101...v20230122 --- pkgs/tools/networking/brook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index bc85f6bd5c9c..2a466996f8a9 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "brook"; - version = "20230101"; + version = "20230122"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WQSpflJ7b5zl+1lEoyXxFeuiz1HvlXSBl7FbBFrxZLc="; + sha256 = "sha256-M4AYbHbnRDvG55AvfRpcdpK4MU/cM1RBqn0JzhsKgsk="; }; vendorHash = "sha256-sJbWAytX3JhFbaTwZHgGNv9rPNTwn0v/bbeaIsfyBro="; From edb26159dba85e97731fa1941859cd997aacb2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 25 Jan 2023 18:18:41 +0100 Subject: [PATCH 066/132] doc/stdenv: clarify default check target --- doc/stdenv/stdenv.chapter.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index e66cc3476776..1972ca62f4f2 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -626,7 +626,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called ### The check phase {#ssec-check-phase} -The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled. +The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the `doCheck` variable is enabled (see below). #### Variables controlling the check phase {#variables-controlling-the-check-phase} @@ -646,7 +646,7 @@ See the [build phase](#var-stdenv-makeFlags) for details. ##### `checkTarget` {#var-stdenv-checkTarget} -The make target that runs the tests. Defaults to `check`. +The make target that runs the tests. Defaults to `check` if it exists, otherwise `test`; if neither is found, do nothing. ##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags} From a95f6361bfb715f2d2bd5dc5c2dafda23f7ecfa8 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Wed, 25 Jan 2023 17:55:01 +0000 Subject: [PATCH 067/132] cloudlog: 2.3 -> 2.3.3 --- pkgs/applications/radio/cloudlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index dd117fd9d451..ceb0f7661c8e 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { name = "cloudlog"; - version = "2.3"; + version = "2.3.3"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-IepCeV/mYy/GEzRTXf67LYQQaN5Rj5Z77KaF2l30r60="; + sha256 = "sha256-9m7BuUNdGeKqi8pzeW2J9zpxShulpynCwJJGkRFkBa4="; }; postPath = '' From 66d3118821cd4a453cd39ce1557591a800e4017e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 25 Jan 2023 21:29:30 +0300 Subject: [PATCH 068/132] mbusd: init at 0.5.1 --- pkgs/servers/mbusd/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/mbusd/default.nix diff --git a/pkgs/servers/mbusd/default.nix b/pkgs/servers/mbusd/default.nix new file mode 100644 index 000000000000..7db22dab8e34 --- /dev/null +++ b/pkgs/servers/mbusd/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: + +stdenv.mkDerivation rec { + pname = "mbusd"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "3cky"; + repo = "mbusd"; + rev = "v${version}"; + hash = "sha256-vYYaJKcnREng+2UsDIZ28hvANkQCHVixQIxo82m7MQs="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + meta = with lib; { + description = "Modbus TCP to Modbus RTU (RS-232/485) gateway"; + homepage = "https://github.com/3cky/mbusd"; + changelog = "https://github.com/3cky/mbusd/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97c76b591fe6..69d7df80de20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24386,6 +24386,8 @@ with pkgs; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; + mbusd = callPackage ../servers/mbusd { }; + memcached = callPackage ../servers/memcached {}; merecat = callPackage ../servers/http/merecat { }; From 63d620643962e4b14ee54bec8d7a3fc033a2ddc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 18:29:41 +0000 Subject: [PATCH 069/132] cubiomes-viewer: 3.0.0 -> 3.0.1 --- pkgs/applications/misc/cubiomes-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 4b1a2b2a69f0..3912e8d221e9 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-yT8PDmMntnd5meDPJm1rekfDVgmWFSZTNFEH03AKCy0="; + sha256 = "sha256-UPphXaxq/Hnt1U3J+lgwa0lp3vX1B/Ou8eqD9rHe3sw="; fetchSubmodules = true; }; From 114f311896b0455aa394135982956b6813f343ca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 25 Jan 2023 20:27:07 +0100 Subject: [PATCH 070/132] zammad: deprecate phases for update script --- pkgs/applications/networking/misc/zammad/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/misc/zammad/update.nix b/pkgs/applications/networking/misc/zammad/update.nix index 49e676d13f39..c3e1c7e1d594 100644 --- a/pkgs/applications/networking/misc/zammad/update.nix +++ b/pkgs/applications/networking/misc/zammad/update.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin/update.sh wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} ''; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ From 7deb1d93103d166586dd6a55e1e1f67baad8fc0d Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Wed, 25 Jan 2023 20:59:01 +0100 Subject: [PATCH 071/132] drawio: 20.7.4 -> 20.8.10 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 274c7b00d6d1..c26b2f46e7f6 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "20.7.4"; + version = "20.8.10"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "sha256-gmC8s+0eef09wcLE9fBiG82rRPXijRyR1WTlp4gYPq4="; + sha256 = "118e9c9a328c92aeeda3c5925c8d8ed50d0993c07715726447ee720699958626"; }; nativeBuildInputs = [ From 7e9f022808a42552871b3d3f0ed6726fe2ddf95f Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Wed, 25 Jan 2023 16:44:29 +0100 Subject: [PATCH 072/132] linuxPackages.ax99100: fix build on newer kernels --- pkgs/os-specific/linux/ax99100/default.nix | 31 ++++++++++++++++--- ...free_consistent-pci_alloc_consistent.patch | 14 +++++++++ ...ernel-6.1-set_termios-const-ktermios.patch | 18 +++++++++++ 3 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch create mode 100644 pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch diff --git a/pkgs/os-specific/linux/ax99100/default.nix b/pkgs/os-specific/linux/ax99100/default.nix index 9167b4e5f89d..600e02de7074 100644 --- a/pkgs/os-specific/linux/ax99100/default.nix +++ b/pkgs/os-specific/linux/ax99100/default.nix @@ -1,15 +1,35 @@ -{ kernel, stdenv, kmod, lib, fetchzip }: +{ kernel, stdenv, kmod, lib, fetchzip, fetchpatch, dos2unix }: stdenv.mkDerivation { pname = "ax99100"; version = "1.8.0"; - nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + nativeBuildInputs = [ dos2unix kmod ] ++ kernel.moduleBuildDependencies; + src = fetchzip { url = "https://www.asix.com.tw/en/support/download/file/1229"; sha256 = "1rbp1m01qr6b3nbr72vpbw89pjh8mddc60im78z2yjd951xkbcjh"; extension = "tar.bz2"; }; + prePatch = '' + # The sources come with Windows file endings and that makes + # applying patches hard without first fixing the line endings. + dos2unix *.c *.h + ''; + + # The patches are adapted from: https://aur.archlinux.org/packages/asix-ax99100 + # + # We included them here instead of fetching them, because of line + # ending issues that are easier to fix manually. Also the + # set_termios patch needs to be applied for 6.1 not for 6.0. + patches = [ + ./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch + ./kernel-6.1-set_termios-const-ktermios.patch + ]; + + patchFlags = [ "-p0" ]; + makeFlags = [ "KDIR='${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'" ]; installPhase = '' @@ -18,12 +38,13 @@ stdenv.mkDerivation ''; meta = { - description = "ASIX AX99100 Serial and Parralel Port driver"; + description = "ASIX AX99100 Serial and Parallel Port driver"; homepage = "https://www.asix.com.tw/en/product/Interface/PCIe_Bridge/AX99100"; # According to the source code in the tarball, the license is gpl2. license = lib.licenses.gpl2; platforms = lib.platforms.linux; - # currently, the build fails with kernels newer than 5.17 - broken = lib.versionAtLeast kernel.version "5.18.0"; + + # Older Linux versions need more patches to work. + broken = lib.versionOlder kernel.version "5.4.0"; }; } diff --git a/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch b/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch new file mode 100644 index 000000000000..05ec0cfad222 --- /dev/null +++ b/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch @@ -0,0 +1,14 @@ +diff -pNaru5 a/ax99100_sp.h b/ax99100_sp.h +--- ax99100_sp.h 2022-06-07 16:55:26.621034945 -0400 ++++ ax99100_sp.h 2022-06-07 16:58:32.488989767 -0400 +@@ -255,5 +255,10 @@ struct custom_eeprom { + #define _INLINE_ + #endif + + #define DEFAULT99100_BAUD 115200 + #endif ++ ++/* #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) */ ++#define pci_alloc_consistent(hwdev,size,dma_handle) dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC) ++#define pci_free_consistent(hwdev,size,vaddr,dma_handle) dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle) ++/* #endif */ diff --git a/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch b/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch new file mode 100644 index 000000000000..8d75ad454cfe --- /dev/null +++ b/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch @@ -0,0 +1,18 @@ +diff -pNaru5 a/ax99100_sp.c b/ax99100_sp.c +--- ax99100_sp.c 2023-01-02 23:44:46.707423858 -0500 ++++ ax99100_sp.c 2023-01-02 23:44:27.171293092 -0500 +@@ -1915,11 +1915,13 @@ static unsigned int serial99100_get_divi + DEBUG("In %s quot=%u----baud=%u-----------------------------END\n",__FUNCTION__,quot,baud); + return quot; + } + + //This is a port ops function to set the terminal settings. +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) ++static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, const struct ktermios *old) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) + static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old) + #else + static void serial99100_set_termios(struct uart_port *port, struct termios *termios, struct termios *old) + #endif + { From 1a57bf6b20029ce4771a3dea20ba631e6243127b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 01:48:42 +0000 Subject: [PATCH 073/132] python310Packages.flask-security-too: 5.0.2 -> 5.1.0 --- .../development/python-modules/flask-security-too/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 2ea27bc982d9..4ec9d6218759 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -45,12 +45,12 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.0.2"; + version = "5.1.0"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "sha256-Nv7g2l0bPSEcrydFU7d1NHjCCJl8Ykq7hOu6QmHeZcI="; + sha256 = "sha256-nSo7fdY9tiE7PnhosXh1eBfVa5l6a43XNvp6vKvrq5Y="; }; propagatedBuildInputs = [ From 79d156109d5f8a0077ce7a7fcf81c41baa08a32d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 09:32:50 +0100 Subject: [PATCH 074/132] python310Packages.flask-security-too: add changelog to meta - disable on unsupported Python releases --- .../python-modules/flask-security-too/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 4ec9d6218759..1af60bcc6caf 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder # extras: babel , babel @@ -46,11 +47,14 @@ buildPythonPackage rec { pname = "flask-security-too"; version = "5.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "sha256-nSo7fdY9tiE7PnhosXh1eBfVa5l6a43XNvp6vKvrq5Y="; + hash = "sha256-nSo7fdY9tiE7PnhosXh1eBfVa5l6a43XNvp6vKvrq5Y="; }; propagatedBuildInputs = [ @@ -103,10 +107,13 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.mfa; - pythonImportsCheck = [ "flask_security" ]; + pythonImportsCheck = [ + "flask_security" + ]; meta = with lib; { - homepage = "https://pypi.org/project/Flask-Security-Too/"; + changelog = "https://github.com/Flask-Middleware/flask-security/blob/${version}/CHANGES.rst"; + homepage = "https://github.com/Flask-Middleware/flask-security"; description = "Simple security for Flask apps (fork)"; license = licenses.mit; maintainers = with maintainers; [ gador ]; From 2464181f1a50c484bc2ccfa97818369f71d7f410 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 21:07:42 +0000 Subject: [PATCH 075/132] iosevka-bin: 17.0.4 -> 17.1.0 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 262bdcfbcf06..590163fc05fd 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "17.0.4"; + version = "17.1.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 91b1af2de8ea..6699023498cb 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1765nh5502m1blmnxmfpbc6qwscp3h78c361sz2libypiwsh20fl"; - iosevka-aile = "0jnkaln0yyvj2cvh7ckwi181hzpw67lvyk9zclwjhzbmqy1w289c"; - iosevka-curly = "0m9qq02wfvd42zg4b33jvz6aiy4hlpvd25a812hd231763i3nixa"; - iosevka-curly-slab = "16xnrzmarrk90gphbmn4cp7hvqba5j8w8lhxb5p9vjp9avg81bvy"; - iosevka-etoile = "0dwnysyaf1ig8pdfbd16gv3lssivnwyx0mqvx24r42yvg6f4k043"; - iosevka-slab = "0724dz6q4hlxgakbqhzr5cxrlap16kqrr4m04rdvmnml606g3msh"; - iosevka-ss01 = "09i8f2mzbsz211nypr3c6k4mkpng53p5xspxd0srnix48hn0yl16"; - iosevka-ss02 = "1ar36zm8x4s5wspis4mmk0bl0lgyj75dkhpx9h3hg8gk0y7rd2kl"; - iosevka-ss03 = "1m66m6hangpzxbdmcpzqnrx79sc7w9id8c7w3l6lik3xkhwlqj9q"; - iosevka-ss04 = "096h5zgv69j96a4ylyzjiy94qiyyk411n27by7dsxmj0kfzcrlyx"; - iosevka-ss05 = "0r9xln2zmzns4abrxaznv9qi6y2sdaq957sh0v5w866bkgcbdrd6"; - iosevka-ss06 = "0dhj8hqf5ja1zyqlsw7blw4al713014khdbh5mm44qilgxzp5s2p"; - iosevka-ss07 = "0d8sycqnfvw1v4b5smj1nbwf1n7bkjqky4m6f0a0xmbgbd50aaz3"; - iosevka-ss08 = "1psrg7dmkgyg47a96p1k5izsnhnw6jqp9zkv91r92yxx6dlag6fd"; - iosevka-ss09 = "0mws0jakjybkj6bh9fsksi1mam642ravlcyz7j8q9h301ibkbm07"; - iosevka-ss10 = "1rz8qxjydcvr124rrvdd2hn0ykcwhpvyv40rs5kqc8saz9v60wcv"; - iosevka-ss11 = "1bz2lbp0d31222b1mxj7s5vr9irfb1iy4pfq8fhh24gfdgnznr73"; - iosevka-ss12 = "00xnqbpdgklxlkr7vnznrqh65zwn7szs4pb4bhd3z9mx6rb6ai7a"; - iosevka-ss13 = "162xr2kgq5sv7c3lnb8wvxzb5ddw20njy52q8p6mvyak47h1wh0k"; - iosevka-ss14 = "17vlj4z8y0i9q7cb6b4h35wj82cv3cq7x0wyjnm0amzsn3xvv09j"; - iosevka-ss15 = "1czw0r76b9414vk098rzaf204z3a37xsvwy919ibiszd2pc9fsyl"; - iosevka-ss16 = "08bc0qj1dcgnmhj1x07xncy82bi6mzhx1wl9x0s9bfkjx69cf9rk"; - iosevka-ss17 = "1q239m4xz7whdf61ic8n56ymvqmk7f1ab898zs6x1ylv65ai9ixz"; - iosevka-ss18 = "0ccicy1862rpmgihdaj0624437cbjci24ivlqlj9k61p5zrg0gn9"; - sgr-iosevka = "0jc6j2lzh3qj72wi5wp7b7adk865nmfb4jxlj7mgn14ni0chd3sx"; - sgr-iosevka-aile = "0vx2rx09749f28xbi0i2ml9hfk1rhr2wx4afsg151gx37slvrc4w"; - sgr-iosevka-curly = "18lpx5rxl2c5mg69wym63nggaq2vgi84b071ikjz3z77zv7ykdy8"; - sgr-iosevka-curly-slab = "0g2x2v9ld536c8qrxwmdw9gv8lbg3g5xmmd9zpmqlc302v43arpz"; - sgr-iosevka-etoile = "172003jxpf5867x7yr1741561k7lbmn152djjf54313273s62imc"; - sgr-iosevka-fixed = "08cwln0q0w2sf9kjngq21150azp4550np9lmxg07bvj7r1h1x8yg"; - sgr-iosevka-fixed-curly = "1fnxxxrnqdgm3c5f0n8sbv53x4drmmjcwy03fwax2zsmhx8v545i"; - sgr-iosevka-fixed-curly-slab = "1n6fcmnwbxcrylh9dkidd0sdn4sw8b3xymh9dr521acnnp4zcbmc"; - sgr-iosevka-fixed-slab = "08pyarvnwnkf4yvmnls60ydbnkrkkvm91fkvc7hj237hi11ka3mh"; - sgr-iosevka-fixed-ss01 = "0gfffkjpqwhcazcr4p287fhi81rlb3pdxxljpx8m08anq5g8lzb9"; - sgr-iosevka-fixed-ss02 = "1k0433d552j7j7bdaq9vink6v2kkbfhj66f3riw6a6bfcda15j7b"; - sgr-iosevka-fixed-ss03 = "1i11pgx8ifp654y08m5wjvzlghvcaf47946s6rv0x0n4v3ybjnan"; - sgr-iosevka-fixed-ss04 = "1jlghxl8ca4yx3w9m1v6y8abyh7pi1chnrmfn4xjxnrmchn6zjvc"; - sgr-iosevka-fixed-ss05 = "1xkz9vw6qk1al3brxy9ay3dny5s0bi3vjhg9j10igs4n5m2gba1a"; - sgr-iosevka-fixed-ss06 = "1bch2vm22s9hv8njvwkjz5bsf4529q911k0p76pwmx389hqm2dcm"; - sgr-iosevka-fixed-ss07 = "0is0pg745kyvy78la73zaic9bp44xd2d3gcqy1bj0hncj573m0zc"; - sgr-iosevka-fixed-ss08 = "1a3jpfcix555pkm6ifvb6zqwhq9vbg7rv3q6w826wzkmvcbc94wx"; - sgr-iosevka-fixed-ss09 = "0wfpwljxrqrrjm3c9salbwz628qqz7j0hvwwqkjr0cva4gqwrzjy"; - sgr-iosevka-fixed-ss10 = "0pcpi1cycdj41b4m2h2aa39aak673d4hp8gbs9j665c2749mfllq"; - sgr-iosevka-fixed-ss11 = "0jiv860lr20v67b2w1dss5qm10ydpkl82857rx9bq6jc3a5wld06"; - sgr-iosevka-fixed-ss12 = "1wsidq0v01ww8ylkv2fxy518k96gqmfgfd8f7j0nb63a0qh1iqlf"; - sgr-iosevka-fixed-ss13 = "19wvawm8ygkr7h5nsgln4vmkxdq5g35j035l8rbfsvbn6hb0znnn"; - sgr-iosevka-fixed-ss14 = "1jvj70n5qj7mriczy6l7fn94d4mk3kkljg0f62n3bhp749n4h28j"; - sgr-iosevka-fixed-ss15 = "07lnaask7qrl6fjvf4ddxl8ijisga34h3prydhm4h2v4l1hwhiyg"; - sgr-iosevka-fixed-ss16 = "06hg2mfb9kvn7s34vd7jkvr4mhsrs3z0xaw8ny2g4bx4nwb3cwsz"; - sgr-iosevka-fixed-ss17 = "0ggx0g673d1kb8pxn9iyixqidi2kniggvaadkqryn22xxppvyn72"; - sgr-iosevka-fixed-ss18 = "0yiii5jf76dqrs5ivnnf5dk8lyf8snrl2iycpfyrfp2mi786qw8l"; - sgr-iosevka-slab = "10m4p6vgkbvk5m0y10bpxm8v913k1xrm50f6c6gghsgvsd5954wc"; - sgr-iosevka-ss01 = "0rmjdx4cigazb47cismx51qni7kvb5zylhl504gq0l7rw4f941mw"; - sgr-iosevka-ss02 = "18i85pbcz2ikaa0k52gslmh4pnirdmwg50rxqcw5dpf3sfd64k1s"; - sgr-iosevka-ss03 = "0466l4kdfyy6qga0gw0iihlx4jh3zsw3nscgr0mp5rff8kxrllyv"; - sgr-iosevka-ss04 = "0h8zji83q4c12bs0dnllb78s66c852ffqwr377ma4clk0d70qgdx"; - sgr-iosevka-ss05 = "0gnlpf4j0d01a7ihv94ac5rlskzpcdyrxzy38d7fg7x8z13bi507"; - sgr-iosevka-ss06 = "0q8q8q83p95yrgszcm8yk0vqrmi5g8psymvx8lrl9caskjyf5gk1"; - sgr-iosevka-ss07 = "1n9k9nk1izx9rw3c17bvr1fhj7nqq1sl1j3r9v9s7wh99wliwzvb"; - sgr-iosevka-ss08 = "0b6gm4aq21lf60dmw0bbi0wm37qf5yd5x53fvd1zd3iqk9jcr4jb"; - sgr-iosevka-ss09 = "17iwjzh5dg4gsnzihakbriwwyqnb8rk0z33ay4zn2hml0b7g03kv"; - sgr-iosevka-ss10 = "1jj8fy5l96dfd5fn3v1dqzpiyqimhqh6cplzgg7mzp94pabwrrrx"; - sgr-iosevka-ss11 = "02hw77qwi5gazpf153cfhkf24ngsfjfkxn4mjxxr89b1z6jsbkv6"; - sgr-iosevka-ss12 = "1365v9chsg93lyjsv1p239kr9p11x9cz87s9l0pzdx1liaby6zdl"; - sgr-iosevka-ss13 = "1bzl0zr4g0rxkwbkgpdqxw6l01g0wlqi868c0b9lzkf14dpl4g7f"; - sgr-iosevka-ss14 = "0iksdqrylgbyykixa4h5ajwrsjd818l626f176kih4cwl1l31hlh"; - sgr-iosevka-ss15 = "018wl1pv1phq0msw16wc8h77vhpmx30z7z85i09lwi5lsa8k6sqh"; - sgr-iosevka-ss16 = "1843xvzppkssaz7w43gqk606c3qv5gkj83s91gv1zcj5dkw7r6s4"; - sgr-iosevka-ss17 = "1x8i1ixs99wwvxs0hpvjw87dzwix0kllnvkbyj9mikdprlaj5fv0"; - sgr-iosevka-ss18 = "0jday3yxajg79xkf346rak7qk34fil7bm4821j84nlpx2pv9hnl8"; - sgr-iosevka-term = "1a5j06ch0sbbbg5gka4anlx7jdgdma0imbd69jkcp6wimdr5scjh"; - sgr-iosevka-term-curly = "1ba099crsfljg8isvc7bvwxg6w4nv98q9451b92vwr6szmz18a6v"; - sgr-iosevka-term-curly-slab = "0linlp56r1zxjk5517npy92flnw2iy2pdjpzklhm6f42yzpkz6a0"; - sgr-iosevka-term-slab = "1m19gxb5cyvswmdccyskfy9b0ymgibcnxsmcrn56k5df15hlb12f"; - sgr-iosevka-term-ss01 = "1b1ixxjv0ryyahm17w4cr9cydwq41vg4nzyii4pj6agzpi28yczg"; - sgr-iosevka-term-ss02 = "1155c7gcfcrb6i5w2qbwicnvbhda9vg753wghkwc6fbzyg95236c"; - sgr-iosevka-term-ss03 = "14nm4nn3szvj3is3c0b88li6ks7yizr4fjgw2jj0sl76ypj4if8z"; - sgr-iosevka-term-ss04 = "0j58sbffmmwa7i4b0slz789j5lrlqaizxbmfg8qzgccwp75q1s4a"; - sgr-iosevka-term-ss05 = "0jmiiacpjp3x5x70sybbhnnjqsmjhs4l1pgj4baqxc0lgj2j5xxl"; - sgr-iosevka-term-ss06 = "1w8b708njfhjcv36vpagnxvsij81gylmlwhn69ahnw17wvhw63c5"; - sgr-iosevka-term-ss07 = "1v7545d84jraa7mxm9k2yx7ik5wp1hy6r4lfpwsxd3n8x5kgvbcr"; - sgr-iosevka-term-ss08 = "10v9c4rmb2932zsh7qz9ij1q04r0d7y08rxlnjr8w6g57kn7mmd9"; - sgr-iosevka-term-ss09 = "0j12j6qwnrvkyh46qvzgzip4jpkxcbg80bfkplrskrwglcdxig68"; - sgr-iosevka-term-ss10 = "1racjzqllhlz6xpad5cnms0m8psmrv3b4flqivdh4w8r6alpavpw"; - sgr-iosevka-term-ss11 = "1vn3s084z46sszil1g5mf2z31hndxpb7a835b306rklnrsv87h3k"; - sgr-iosevka-term-ss12 = "0pm9c06vfx9c322zqyq54ibfmrhnfmn8yqa682z3y4sss20gw2nb"; - sgr-iosevka-term-ss13 = "1ixd92l81hanzkdmkgvz302ghjdx9x96rcl4j5qf4amxa77hn341"; - sgr-iosevka-term-ss14 = "108l7wb90fyimfzzxc08rw0z67iabvd9mliybsqp4cv73d408lni"; - sgr-iosevka-term-ss15 = "0knhyvjy9wsrd209sy5h3q4mrkj49kgr76fdzgn4j4mmssnjkvp2"; - sgr-iosevka-term-ss16 = "1hydhyhd25gpj0r3xlv2n3m34vbx0nfqgy07vibywhq0pm29ywkr"; - sgr-iosevka-term-ss17 = "1j84529d54kxvxf7xlilh6xpn1nrv8ablkyg829y5v2ad06db14m"; - sgr-iosevka-term-ss18 = "03vvcmvrhkb4rsj1vvvnvprawzwk71s4756wvr0dfngc838nrmg5"; + iosevka = "0lxcyg93max17fqm6yvxwvr79jz9bggxcmv6qx8sknvjmq89l0pf"; + iosevka-aile = "0pljy65m5zaxbajfmhc3gayz73rbp8vzaqzqcrlm2ir9yxaz21qc"; + iosevka-curly = "0svf6hm0cspydgzjg39f5rp7mrcabb0vc2088r1msipaw8naajqf"; + iosevka-curly-slab = "1afk0ijfciwh9pjy2qsawxw7gq7jxr52li2nwggcq04c9ybh62pg"; + iosevka-etoile = "07zihk9q1ff93ms9gj92hbf2fzw7h4fl28szhrfll3p96y9f81q7"; + iosevka-slab = "18hrv0kc82hfb6ivbdg5k9179k37anjigm8ddh5waiq2is6gmh8l"; + iosevka-ss01 = "127zki1wcd2wjpqr1n2zf57iq44pwcrg2vlrspi3b9lhmxw0rlz9"; + iosevka-ss02 = "0ig7y86c2d9y4bg5cqibbn0wqwwzm5d5qxd8vwhvd323mg3gh6bg"; + iosevka-ss03 = "0zp2nkrl39pvidn846706dp8l12ac66kd9wsyh4cnn08mmm6gl4i"; + iosevka-ss04 = "0r0ylsxj2j9akpxchnldwyddm7vrlpn82sxkgmjhr81hn3q08bgc"; + iosevka-ss05 = "0r9mdhdjndxgm68fg59dbd810ggrpmpkvgcypyqf92l8sf1h55hj"; + iosevka-ss06 = "1c6ga4jaglfp5mx980qy1alkifr1d1lq4qj69xfq6sx4146xn20f"; + iosevka-ss07 = "0h1x2p9finl4482vx6lvs45x5258bpw5avkpgmg66wn16kd95zfq"; + iosevka-ss08 = "1n5m11dlv49jj63s771ny77qpiz178iyvn7pfnhv2mzqwimz5sl2"; + iosevka-ss09 = "1rbs15xsk7fajrm81nacixf18jjx08bpg26fw7pmxjv727zafv05"; + iosevka-ss10 = "1rdpiq5pyzrnxhnsvf08zg0vjhln25vqkyknnv4xf34wr8r9xcc0"; + iosevka-ss11 = "0l9454vx90pj0yva864qfj06ggplia0qdkv3nr14s3wmv5khh9gw"; + iosevka-ss12 = "0cafszj0c7nkcxpbqsrqy5l2v0nzfph6i22w1iayg8bqvpip3x5m"; + iosevka-ss13 = "1mlxh6qikrl0g82difr85lpkxdr83z5iymf0brmgdxkmyig3psr7"; + iosevka-ss14 = "1330p52h94fgr76gll396hb0qalamm8z79hw73ci4ph22dpsd4ni"; + iosevka-ss15 = "0cc5a1187i9idgvz7zhs0byya8c69f0g4pkqlivh37ffj07yv47v"; + iosevka-ss16 = "052nypjppbrbkhjq85nwmx8469prfsbc9f05kw0vi30c8mpcjqwf"; + iosevka-ss17 = "0k5p1qvx8vi8ic7yayky7zdi1hrkwli698ydlfhnk4yx10l0xq8j"; + iosevka-ss18 = "16diyrfpz1kp9vcyq61pbdrrv4pl96kzn8ckv7wb5cnwxwa336c7"; + sgr-iosevka = "0b92jmai9cgxdah74jmks7fwbyb1m722ablf3qaiizc597y031wv"; + sgr-iosevka-aile = "1z5jg74aspkvhw41ihwzbfs4f075gs8ny76m30adp0n3v877nhjz"; + sgr-iosevka-curly = "06bm6jg16sgvxnqbayqa92lvr0bc5vdjybbi467yx57hi83w860q"; + sgr-iosevka-curly-slab = "08kg8imp29sww57mdpfmi86046vqwd4a2ayijcvs511v8nhl478r"; + sgr-iosevka-etoile = "0gybfn95n2b8kn3bvi8pjkps5bmndnbbq9jbfbm81fims0s0496b"; + sgr-iosevka-fixed = "15q4y8cm8cwxcbmjzknc19gyqmd4nb928b26nswm8m17p85zlcq0"; + sgr-iosevka-fixed-curly = "1faci2m7w8cf65mjkigqlyh838r5mqvg7ai4nfdidms6ilhhsf37"; + sgr-iosevka-fixed-curly-slab = "019m3nvsy6vwgf6f0z2l0wxxkqbl30y55jfgi2bsmxhizwzl3csc"; + sgr-iosevka-fixed-slab = "1ps1xi334h7by3nihn3n6d76sbzcvv03dwy4iy5wixlz0lr8id5i"; + sgr-iosevka-fixed-ss01 = "18qdd6qbk8dy6z36lsy89a7g6l1asdzqvlc82j9vk437yjm59vwi"; + sgr-iosevka-fixed-ss02 = "0xm1k1f5hbhjbksshlv7bcdigdrxxhfpc8pgv7dvz7zpy7cx2y4y"; + sgr-iosevka-fixed-ss03 = "1741k3p2mncq9kp1wshpl6dkwqvvg2bpakl91k6ssvj1z63r2zhq"; + sgr-iosevka-fixed-ss04 = "0sw65088yihk2sk2mcdr4cd8rl9l954l2sc3y7dil3jkgw6kf0wq"; + sgr-iosevka-fixed-ss05 = "1cc71vidcljh6k6pw6z5yygi0kir7n235l19as8y1qazmc8kh0ip"; + sgr-iosevka-fixed-ss06 = "0s2f0j0z4dyd23z5mldih03cg8vqwvpqrmagbpx02v2krzn2vb27"; + sgr-iosevka-fixed-ss07 = "07nfdx7bdbsxrmylsja8bvr1n2a116qyfg8pk1wpcax3vf56jamh"; + sgr-iosevka-fixed-ss08 = "0ys6gw2p7vpdv8csxzxjx09m8k0h4s28w7i98iq27ak47xcm8xd7"; + sgr-iosevka-fixed-ss09 = "0vn6vc0byakggyrd6d9mv1l9d4h5g7wcbkkmxzqfjr6xp3k96r88"; + sgr-iosevka-fixed-ss10 = "0llqjvv7m1imvqw41xvmcw9y9c9wsnv2i8swnszr9r5khx3kbp6h"; + sgr-iosevka-fixed-ss11 = "1wwjp1fgl2gxhjkmsz6k0a59kjcapby9y8j5m763ap4ig5djbv8r"; + sgr-iosevka-fixed-ss12 = "1k9ak5dc3s024iz6rp4yz9b73752v93n0kldcnwi0lvbh4hp358k"; + sgr-iosevka-fixed-ss13 = "0rgj38jkj6d7g44wn02k6ycixkwq6lwy756vp9w01aqqn5flw6s1"; + sgr-iosevka-fixed-ss14 = "0lbpwnc40lswlmfwqziz7n3kn95kc5rn4fbq5nxa1z8cxz9dkhvh"; + sgr-iosevka-fixed-ss15 = "034h7af7876q0ni8idj5dhkq1cpl91gvxhwxyw17pgnz8i51a261"; + sgr-iosevka-fixed-ss16 = "0i00nxj0j7yr57b4ccd2yc4x7k8zw1xxpdwfwlm0n38c05iqbvj9"; + sgr-iosevka-fixed-ss17 = "1z21han7l7nwz0qfi6fzvwdiadd9brpna51p24drdi8y3915b8n9"; + sgr-iosevka-fixed-ss18 = "0fjdsx66al0h3spgdivryiw5d871s93s2lbmh7nxwf19lylrkv19"; + sgr-iosevka-slab = "0j42hxgcwy5abf5jv5aqjri6h21k2nkgjj7527f68rgcnl9d980b"; + sgr-iosevka-ss01 = "1m7c8zb3rhxnf9h4v55jv7ns6x74bwfsl6f4sl2b1gkfl50ibwqg"; + sgr-iosevka-ss02 = "05cc3p8lkxl1s27wmgspk93fz8f51daqcfid8vpsvnqw75abivc9"; + sgr-iosevka-ss03 = "0bmh1ijdalss96lkji0dcyl00wc2yw7a3lx0nqbbjl4m0l2mz4yp"; + sgr-iosevka-ss04 = "1jc1y9rgw8hnd7zqrn98b35r01kmr2nykqip63h6qal7l456m4s2"; + sgr-iosevka-ss05 = "06acxqhzfxlhqd083s57b15sx2vgq0r6pl9myp8syh1d9azbk899"; + sgr-iosevka-ss06 = "0g3zaxy9363p28kcv6a52dqb1swnrn3rwl6pfvanz92vrrjspr7n"; + sgr-iosevka-ss07 = "1bmdparw1hg3i8lnx8vwd467pwf4q94q80a62fcy87hppy3afryg"; + sgr-iosevka-ss08 = "16kgj158nhmlql0gkkfya04dy1gp9an4gk691f28n0mqhi7hygcr"; + sgr-iosevka-ss09 = "144x84qmh9pycn9v36q4z074vmnngn0chlyb8a8hyhgsyfqf7q7h"; + sgr-iosevka-ss10 = "0i9hsmw78yg75a3m80jlmdn2rn72snz69m0abvz7z94b7c99ffsb"; + sgr-iosevka-ss11 = "05a9azf7f64jdr5wwiy7djlmarl01mg6rfmzvrdd8a1a0nfcz1iz"; + sgr-iosevka-ss12 = "1nqa88csh170gs3bggs6v5ssaqljvpw1zxaclhmzdvyhcphrwd19"; + sgr-iosevka-ss13 = "1klhp2w99znj9qyz95z8jq3g23fs8jznya9dfzfy2i4hivw2gxv0"; + sgr-iosevka-ss14 = "1w84mqg0x46fbr8v72ccxc9a7sp52g4qb0x6l84wr8cm1fn7n21f"; + sgr-iosevka-ss15 = "05kdxmghhdyvlnc3wxzc5yyp00ybrq63fzh2kz3s4rwh11hhf0lq"; + sgr-iosevka-ss16 = "0a9i7plsfy8fawip70p5w3dkmjh4sy61iwi9pnl0ara7z23783dq"; + sgr-iosevka-ss17 = "1xmaqs54jhag7s18gfll94g0ixjqp2z5s69kwk48nznzpbfbpdsb"; + sgr-iosevka-ss18 = "09nq0a7b4hkiyi1prxpf6vwms9cnmby2dzn9k4y0xcax7m464531"; + sgr-iosevka-term = "1zr8cyq6578n8f3y9yyc0phs26hda1bf0bsd417wqcwsn88wfmx8"; + sgr-iosevka-term-curly = "0xlwljc2gmwh119x83p2pic5zwjqdymg7pbl2ginzilsrgjl2k0q"; + sgr-iosevka-term-curly-slab = "1vmpdws71sf1pf8nz3w7y0a64a5c3mp8f9w57bqmcn9vr22ymcl7"; + sgr-iosevka-term-slab = "1wkqdgy9nd4mvy4rsssvpis1r17ikpbl8mfx6bp80fh0lai97mxw"; + sgr-iosevka-term-ss01 = "1ly5ic5ihj00apb87am3kl38mywns8jizc7f4hniyrd9xhy1186z"; + sgr-iosevka-term-ss02 = "09lisy461dvppfv6sdk4i6vfrqhxyx558zdaflv9vskmfq8iq66d"; + sgr-iosevka-term-ss03 = "0nm84l4xk53l1q96hx8q63nbflgmivj3cq7z5mysv1z8jdp7isx3"; + sgr-iosevka-term-ss04 = "1y9kkasxmpm4n1vs5plsa25cgwvdi4jahn3ggdlxpl35yi4kxnr3"; + sgr-iosevka-term-ss05 = "1drngqgcibv6kfwjn3s2bik286ypj613q4p3fz0b7incniaz372j"; + sgr-iosevka-term-ss06 = "1rkqnj59hv1lzsplss3jk0jgz6q68qkg4a3200hv10rs9i2w2qxk"; + sgr-iosevka-term-ss07 = "1z6jh8qmc2063zgwbd00xi258grdillkc1nja69awdxiamv6hgf9"; + sgr-iosevka-term-ss08 = "022qw6frmmmpwbq6af8rysm8pbq713fiw92hkqi5k3j4v8dwl9v2"; + sgr-iosevka-term-ss09 = "1c32p4d46q3izif68ka6gr1hmq10snrlga5d7ypphmm8yxvavd9c"; + sgr-iosevka-term-ss10 = "1p497kqa386q5rvsfigzxdr0009agiw4bv4xxmb83pg3sl8bf7z9"; + sgr-iosevka-term-ss11 = "19kfvmwijd1kyw4bln0m5z7wpch9h44ny13ccxx0qmiv5y7wwm94"; + sgr-iosevka-term-ss12 = "1pnr7yd431xnym12vnlww6rxm1vfd9x24kqpx0323q3n61yjqzd6"; + sgr-iosevka-term-ss13 = "04nhps95s360vv4qr1pbzs1aj8zdalzv4ajdkawdssxaz1xs57c7"; + sgr-iosevka-term-ss14 = "1xvdpx8sa4ifgy9a3y65qcxj8cavisw4h7hjfivq4y0il79sl7nw"; + sgr-iosevka-term-ss15 = "03rs8b8yb7n1f7cp6zffgr7x20vx6hiag7a22ysx0zr2i4zp37i6"; + sgr-iosevka-term-ss16 = "1s86hmr7a6qwyf5m9q0npzzd25nvh9k1nlja1b8fnnlgchycwfbw"; + sgr-iosevka-term-ss17 = "0y5i99iy7r3z4cv87s3v3mxbadp3np16a3c65w41pjv86llkc30g"; + sgr-iosevka-term-ss18 = "0s5hdh61y5v17jrdpajgkzzrg0cqgcad6gvs9m8v55xi2zlqfxip"; } From c82cfa8bc0005888a8ead32d5c376b8a9212d9c1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 25 Jan 2023 21:42:30 +0000 Subject: [PATCH 076/132] guile_3_0: 3.0.8 -> 3.0.9 Changes: https://www.gnu.org/software/guile/news/gnu-guile-309-released.html --- pkgs/development/interpreters/guile/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index afad1c7a29ff..de0b8479f1ca 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -25,11 +25,11 @@ let in builder rec { pname = "guile"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2qcGClbygE6bdMjX5/6L7tErQ6qyeJo4WFGD/MF7ihM="; + sha256 = "sha256-GiYlrHKyNm6VeS8/51j9Lfd1tARKkKSpeHMm5mwNdQ0="; }; outputs = [ "out" "dev" "info" ]; From 741d8aced7de1d097cd218cff97df614facd7e26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 22:08:16 +0000 Subject: [PATCH 077/132] unpoller: 2.7.10 -> 2.7.11 --- pkgs/servers/monitoring/unpoller/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index 79aa5a50409c..9cd912865ede 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.7.10"; + version = "2.7.11"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-zwrVMQI/zn+UtaXZyZr1wGkBP/KKDKvE/YjLR5rbK0o="; + hash = "sha256-/tGmMeHrurKTaRQLHusOkjISuxrrT/JjUCimEL7zoIk="; }; - vendorHash = "sha256-SjZQnVG7j2zbPCr4AeF9vZkmd7eEocmnCQKFH09qSng="; + vendorHash = "sha256-ZwJCqL8vU38k8pfNmKGIhJSgMwxQuzBBfl6IduQrQEw="; ldflags = [ "-w" "-s" From e80e2cde7d888a4650bc2d0b2b32ef8d11c223bb Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 25 Jan 2023 14:44:44 -0800 Subject: [PATCH 078/132] zfs: 2.1.8 -> 2.1.9 --- pkgs/os-specific/linux/zfs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 481827474eea..f3fa6a119874 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -226,9 +226,9 @@ in { latestCompatibleLinuxPackages = linuxPackages_6_1; # this package should point to the latest release. - version = "2.1.8"; + version = "2.1.9"; - sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk="; + sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc="; }; zfsUnstable = common { @@ -240,10 +240,10 @@ in { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.9-staging-2023-01-19"; - rev = "04b02785b67f9b976c43643dd52ce6cdbc22e11e"; + version = "2.1.10-staging-2023-01-24"; + rev = "92e0d9d183ce6752cd52f7277c8321d81df9ffee"; - sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk="; + sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc="; isUnstable = true; }; From 440ff71c7501409d082bffb2fe65fad2dd9b2bf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 23:44:04 +0000 Subject: [PATCH 079/132] micronaut: 3.8.1 -> 3.8.2 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index c814517520f6..8d3d492649e5 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.8.1"; + version = "3.8.2"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-DBWPKy17pYU5VWEOxnaP2AKoiskNCBbt9QqO6xxf7eI="; + sha256 = "sha256-a07vFya7c8ai0YjNvXCAWSoQLH81U4cIr0QsgX3WcJY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 2da549efdde2b4cdc8a5cdaca678de8144b9f62d Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 25 Jan 2023 18:46:12 -0500 Subject: [PATCH 080/132] ruff: 0.0.233 -> 0.0.235 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.233...v0.0.235 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.235 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index fe61330c13a8..551ec1cb1464 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.233"; + version = "0.0.235"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d+JF5CUswlqx0S3W9W2B2Pgt/hj3hHky1p4OF3eqr84="; + sha256 = "sha256-pa1q2OY9jwWktcQVmk8EQjb3WUtPb7SFecQ16A+3C6c="; }; - cargoSha256 = "sha256-ZuBbgf4CYQpN8TgfEnAl54/SnkkbssoCSdB+2ZZPenk="; + cargoSha256 = "sha256-gYyVa615ujV5xuiC3bhscje9sP43iQV8WolClcF372Q="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 7a73ad278fe1db625c1459d27ef3ccc34a93dbcb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Jan 2023 06:06:41 +0100 Subject: [PATCH 081/132] home-assistant.intents: init at 2023.1.25 --- pkgs/servers/home-assistant/default.nix | 4 +- pkgs/servers/home-assistant/intents.nix | 67 +++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/home-assistant/intents.nix diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b1af7ca2e4ae..024c023d3505 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -297,8 +297,9 @@ let }; }); - # home-assistant-frontend does not exist in python3.pkgs + # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; + home-assistant-intents = self.callPackage ./intents.nix { }; }) ]; @@ -496,6 +497,7 @@ in python.pkgs.buildPythonApplication rec { getPackages python supportedComponentsWithTests; + intents = python.pkgs.home-assistant-intents; tests = { nixos = nixosTests.home-assistant; components = callPackage ./tests.nix { }; diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix new file mode 100644 index 000000000000..d7ed384e8d53 --- /dev/null +++ b/pkgs/servers/home-assistant/intents.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools + +# build +, hassil +, jinja2 +, pyyaml +, regex +, voluptuous +, python + +# tests +, pytest-xdist +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "home-assistant-intents"; + version = "2023.1.25"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant"; + repo = "intents"; + rev = "refs/tags/${version}"; + hash = "sha256-nMEcN2b0XHF4yRRsHKMplxqcMLl+gJcPAdvwnySN+ug="; + }; + + sourceRoot = "source/package"; + + nativeBuildInputs = [ + hassil + jinja2 + pyyaml + regex + setuptools + voluptuous + ]; + + postInstall = '' + pushd .. + # https://github.com/home-assistant/intents/blob/main/script/package#L18 + ${python.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home-assistant-intents/home_assistant_intents/data + popd + ''; + + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + pytestFlagsArray = [ + "../tests" + ]; + + meta = with lib; { + description = "Intents to be used with Home Assistant"; + homepage = "https://github.com/home-assistant/intents"; + license = licenses.cc-by-40; + maintainers = teams.home-assistant.members; + }; +} From cf6e4125d18c7efeef753540c03f449a963bd2ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 00:55:34 +0000 Subject: [PATCH 082/132] python310Packages.google-cloud-firestore: 2.9.0 -> 2.9.1 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 6dc685ca14cc..360c4c9a4d17 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.9.0"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gEgTYUsaac9dJIxCZJU/axjwiNqttUQiL6UskhzjsJg="; + hash = "sha256-WxUiufi+rXBPuSBcC/Ktp0tEkcaA457o0WexweS9MMI="; }; propagatedBuildInputs = [ From 8cc844c094ed0c8c561322beb11f0435bf7bd6ab Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 26 Jan 2023 02:05:28 +0100 Subject: [PATCH 083/132] vtk_9_withQt5: fix build on aarch64-darwin --- pkgs/development/libraries/vtk/generic.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 235202284bcb..35f3a1725d4f 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -4,7 +4,7 @@ , enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv , enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." # Darwin support -, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL +, AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: @@ -34,6 +34,7 @@ in stdenv.mkDerivation rec { libXt ] ++ optionals stdenv.isDarwin [ xpc + AGL Cocoa CoreServices DiskArbitration diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87fc70d7834a..6277846010f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23461,7 +23461,7 @@ with pkgs; stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT; }; @@ -23471,7 +23471,7 @@ with pkgs; vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT; }; From a37e8e1a3e584c5c06f24f14815b39ec9b5a7331 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 26 Jan 2023 02:12:49 +0100 Subject: [PATCH 084/132] qt5.qtwebengine: unbreak on aarch64-darwin --- .../development/libraries/qt-5/5.15/default.nix | 5 +++-- .../libraries/qt-5/modules/qtwebengine.nix | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index dd33d9614207..0e1e2bbe66a7 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -174,10 +174,11 @@ let cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult ''; inherit (darwin) cctools xnu; - inherit (darwin.apple_sdk_11_0) libunwind; + inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit - ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; + ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication + MediaPlayer MediaAccessibility SecurityInterface Vision CoreML; libobjc = darwin.apple_sdk_11_0.objc4; }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 3cf2fedbadde..6e4fb476d491 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -14,9 +14,10 @@ , systemd , enableProprietaryCodecs ? true , gn -, cctools, libobjc, libunwind, sandbox, xnu +, cctools, libobjc, libpm, libunwind, sandbox, xnu , ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication +, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML , cups, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_4 ? null , lib, stdenv, fetchpatch @@ -94,6 +95,11 @@ qtModule { --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" + + # ld: warning: directory not found for option '-L/nix/store/...-xcodebuild-0.1.2-pre/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/lib' + # ld: fatal warning(s) induced error (-fatal_warnings) + substituteInPlace src/3rdparty/chromium/build/config/compiler/BUILD.gn \ + --replace "-Wl,-fatal_warnings" "" '') + postPatch; NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ @@ -105,8 +111,6 @@ qtModule { "-march=westmere" ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-elaborated-enum-base" - ] ++ lib.optionals stdenv.isDarwin [ - "-Wno-elaborated-enum-base" ]; preConfigure = '' @@ -177,6 +181,11 @@ qtModule { Quartz Cocoa LocalAuthentication + MediaPlayer + MediaAccessibility + SecurityInterface + Vision + CoreML openbsm libunwind @@ -184,6 +193,7 @@ qtModule { buildInputs = lib.optionals stdenv.isDarwin [ cups + libpm sandbox # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` @@ -235,6 +245,7 @@ qtModule { (isMips && isLittleEndian)))) (map (plat: plat.system)) ]; + broken = stdenv.isDarwin && stdenv.isx86_64; # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; From aa1415c6a5b455e20b92f7b6067d8b4cf9bb1e26 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Jan 2023 07:51:40 +0100 Subject: [PATCH 085/132] ocamlPackages.gluten: 0.2.1 -> 0.3.0 --- pkgs/development/ocaml-modules/gluten/default.nix | 11 ++++++----- pkgs/development/ocaml-modules/gluten/lwt-unix.nix | 4 +++- pkgs/development/ocaml-modules/gluten/lwt.nix | 4 +++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix index fb6f85b10487..d0f41d202689 100644 --- a/pkgs/development/ocaml-modules/gluten/default.nix +++ b/pkgs/development/ocaml-modules/gluten/default.nix @@ -3,24 +3,25 @@ , faraday , fetchurl , lib +, ke }: buildDunePackage rec { pname = "gluten"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - sha256 = "1pl0mpcprz8hmaiv28p7w51qfcx7s76zdkak0vm5cazbjl38nc46"; + hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU="; }; - minimalOCamlVersion = "4.06"; - - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ bigstringaf faraday + ke ]; doCheck = false; # No tests diff --git a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix index f3986b051355..cec427c3ad61 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix @@ -7,7 +7,9 @@ buildDunePackage rec { pname = "gluten-lwt-unix"; - inherit (gluten) doCheck meta src useDune2 version; + inherit (gluten) doCheck meta src version; + + duneVersion = "3"; propagatedBuildInputs = [ faraday-lwt-unix diff --git a/pkgs/development/ocaml-modules/gluten/lwt.nix b/pkgs/development/ocaml-modules/gluten/lwt.nix index e2643d618954..cfa736c4bc99 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt.nix @@ -5,7 +5,9 @@ buildDunePackage rec { pname = "gluten-lwt"; - inherit (gluten) doCheck meta src useDune2 version; + inherit (gluten) doCheck meta src version; + + duneVersion = "3"; propagatedBuildInputs = [ gluten From 92ef3744f097398e47614c8c9f7cba85b40aace6 Mon Sep 17 00:00:00 2001 From: Nebulka Date: Thu, 26 Jan 2023 02:00:30 +0000 Subject: [PATCH 086/132] SDL_compat: sign on Darwin --- pkgs/development/libraries/SDL_compat/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix index d0cb80fb6b4b..ff5d2649aa0a 100644 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ b/pkgs/development/libraries/SDL_compat/default.nix @@ -6,6 +6,7 @@ , SDL2 , libiconv , Cocoa +, autoSignDarwinBinariesHook , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported , libGL @@ -27,7 +28,8 @@ stdenv.mkDerivation rec { hash = "sha256-8b9rFI4iRpBJqeJ2KRJ9vRyv9gYwa9jRWCuXRfA3x50="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ] + ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; propagatedBuildInputs = [ SDL2 ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5150acc8eee0..8c725a6153d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22867,6 +22867,7 @@ with pkgs; SDL_compat = callPackage ../development/libraries/SDL_compat { inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin) autoSignDarwinBinariesHook; }; SDL = SDL_classic; From 32a2c86e97162fedcd1478df38febbc0f095d220 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 02:10:36 +0000 Subject: [PATCH 087/132] python310Packages.google-cloud-translate: 3.10.0 -> 3.10.1 --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 4eaad26172b4..6ae9ff0ea946 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.10.0"; + version = "3.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SdhAsksalGug0eW9rVlAGpEGIUjreKkFIj3v9x54G6I="; + hash = "sha256-++1k8lhJfJ7e/oK//IyYx9W/RacQa/1RwdrhyvCYWEM="; }; propagatedBuildInputs = [ From 24bff40b3c7848cf73774d67d0b28197abbfb3b7 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Thu, 26 Jan 2023 10:37:24 +0800 Subject: [PATCH 088/132] librime: 1.7.3 -> 1.8.3 --- pkgs/development/libraries/librime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 6877f9ab7b3f..4fc6489130dc 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.7.3"; + version = "1.8.3"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-GzNMwyJR9PgJN0eGYbnBW6LS3vo4SUVLdyNG9kcEE18="; + sha256 = "sha256-tPuDDVV4ZeBva/oHcw0rNjkzYmCtT2vLCdwCukBM28w="; }; nativeBuildInputs = [ cmake pkg-config ]; From dd9778930c3ce90ca8065f7b1d14438f48c45090 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 25 Jan 2023 18:48:36 -0800 Subject: [PATCH 089/132] probe-run: 0.3.5 -> 0.3.6 --- pkgs/development/tools/rust/probe-run/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 59d9f7c6d595..0033a1c5f03a 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,6 +3,7 @@ , rustPlatform , fetchCrate , pkg-config +, DarwinTools , libusb1 , libiconv , AppKit @@ -11,17 +12,19 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.5"; + version = "0.3.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-C9JxQVsS1Bv9euQ7l+p5aehiGLKdrUMcno9z8UoZKR4="; + sha256 = "sha256-HYFVdj1kASu+VKnDJA35zblPsgUeYC9YVlS84Hkx1Sk="; }; - cargoSha256 = "sha256-kmdRwAq6EOniGHC7JhB6Iov1E4hbQbxHlOcc6gUDOhY="; + cargoSha256 = "sha256-nhs9qNFd1GK70sL5sPPeMazuPUP67epHayXnw3aXTfk="; nativeBuildInputs = [ pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + DarwinTools ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2939e30b01e..423362851223 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -526,6 +526,7 @@ with pkgs; probe-run = callPackage ../development/tools/rust/probe-run { inherit (darwin.apple_sdk.frameworks) AppKit IOKit; + inherit (darwin) DarwinTools; }; mix2nix = callPackage ../development/tools/mix2nix { }; From 7a63ba87b551df39f238e8494fcea404e5f1f44b Mon Sep 17 00:00:00 2001 From: Vonfry Date: Thu, 26 Jan 2023 11:03:23 +0800 Subject: [PATCH 090/132] fcitx-engines.rime: mark as broken this package is deprecated, please use fcitx5 instead. and it cannot be built with the new version of librime --- pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 42c02fe003d7..65363b262706 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -30,5 +30,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ sifmelcara ]; + # this package is deprecated, please use fcitx5 instead. + # and it cannot be built with the new version of librime + broken = true; }; } From 4fd648c373c5f815e18b0706a69032699503187c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 03:40:48 +0000 Subject: [PATCH 091/132] python310Packages.google-cloud-redis: 2.11.0 -> 2.11.1 --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 6c613b65eba3..248fcb7140b7 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.11.0"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dWpsiitG58iCw8z8Hd10eAXXfRRBlq90m0cs1YjeMqE="; + hash = "sha256-dRavwtaU+dpRZkO49Q0Btmh2Mi/zUWbvZbImrfUkrAM="; }; propagatedBuildInputs = [ From f488d5f63c27005fc92629408aaafc4082b9160b Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 25 Jan 2023 23:35:08 -0500 Subject: [PATCH 092/132] brave: 1.47.171 -> 1.47.186 https://community.brave.com/t/release-channel-1-47-186/465341 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 45e064a31b70..7a05c9f9b18d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.47.171"; + version = "1.47.186"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-0hKosta1fxth9ScDRmrrt8BH4CTIRm0ghetY4Jkuco8="; + sha256 = "sha256-47LkjcC+fEE+cn2m434+9fQ+N2yZSc1eF0gDO7jGfPI="; }; dontConfigure = true; From fac520b7f549b62ae03d6d1681811e04281808ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 05:53:33 +0000 Subject: [PATCH 093/132] python310Packages.google-cloud-dlp: 3.11.0 -> 3.11.1 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index fd9084d98675..86888e3fb621 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.11.0"; + version = "3.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5zysTKqmzRAiePBwLkbUhiAG91sKwao2BCTOBnVHlYg="; + hash = "sha256-TwVY6/4TSY8cPj3y/A7+cxpyVJ9+lPg+vAKNhfBNfqI="; }; propagatedBuildInputs = [ From 2ee1b440573e5f95ed8f809dd345e5a0dee15cf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 06:08:17 +0000 Subject: [PATCH 094/132] python310Packages.google-cloud-speech: 2.17.0 -> 2.17.1 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 49ced94601f6..7c57cc560eb7 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.17.0"; + version = "2.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Lb2oV2r7CE1qc5iaxzGpIm3xZKpsORx1Nofkjno6xNs="; + hash = "sha256-gWcYMY9Ztm5d9CkQXPtAZaDgrKwU90EZBdznuWWDp9o="; }; propagatedBuildInputs = [ From c9f103f198c0426db2b7ed1f616f7fbce03529f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 06:20:20 +0000 Subject: [PATCH 095/132] flexget: 3.5.18 -> 3.5.21 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 5aadf802e430..f14433b6c179 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.18"; + version = "3.5.21"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-gMOpKXLUihiNcpHF6045D1ZcYwTgyjaVIFpDRCln5rI="; + hash = "sha256-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8="; }; postPatch = '' From e9ea160bcaa6a76afc380860459eb0c9e615a3af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 07:09:10 +0000 Subject: [PATCH 096/132] python310Packages.google-cloud-vision: 3.3.0 -> 3.3.1 --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index b592d44f00e9..af99aa9bd742 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rj6yR/8V65wOILVSlLEi6+IRgNk3t/t7grVaHc8sRJY="; + hash = "sha256-G7v09CA1pJ2OSL7gBzYvfRGrjPjQElxnyeUvP2vpFJQ="; }; propagatedBuildInputs = [ From d1cb62567664530877f3b2ec94c4467e1e9d352a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Jan 2023 08:09:51 +0100 Subject: [PATCH 097/132] Revert "libdatrie: depend on libiconv unconditionally" --- pkgs/development/libraries/libdatrie/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 57d30124a6fd..257673b1a96d 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installShellFiles ]; - buildInputs = [ libiconv ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; preAutoreconf = let reports = "https://github.com/tlwg/libdatrie/issues"; From 587149dd10eb7512a2fc54d5a35b04bdfce664f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 03:06:54 +0000 Subject: [PATCH 098/132] =?UTF-8?q?terraform-providers.bitbucket:=202.29.2?= =?UTF-8?q?=20=E2=86=92=202.30.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 69bb9b2e3851..1cb9478481a5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -167,11 +167,11 @@ "vendorHash": null }, "bitbucket": { - "hash": "sha256-EsupdOP2aWLGeQrtuTyPg4ppM/j0WT0q/UV60oK732Y=", + "hash": "sha256-4uwMg2DXd7T4WqdfwcZHtsPMTTCqrwSngh01DYW5yko=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.29.2", + "rev": "v2.30.0", "spdx": "MPL-2.0", "vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0=" }, From b0b701d7ecd4d3f842c6643bec58af5751f6d51e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 03:11:32 +0000 Subject: [PATCH 099/132] =?UTF-8?q?terraform-providers.opentelekomcloud:?= =?UTF-8?q?=201.32.2=20=E2=86=92=201.32.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1cb9478481a5..dba340711e36 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -861,13 +861,13 @@ "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-brODSqSwZXy3B/F5jqPz1h5UJ2hNncG7tIpICJjoBW4=", + "hash": "sha256-D2RPpG1RE+bM7rVvmItczpRExMXK0RaKfJsnifvXRTs=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.32.2", + "rev": "v1.32.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-p01ZIAt8cUv/UklRnMu+TTmfEw8jdde9C4nUJrhA7wE=" + "vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ=" }, "opsgenie": { "hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=", From 47ed5057808c080311376088b6f4509ed0cd9c64 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 03:13:01 +0000 Subject: [PATCH 100/132] =?UTF-8?q?terraform-providers.opsgenie:=200.6.18?= =?UTF-8?q?=20=E2=86=92=200.6.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dba340711e36..485cac14b1d6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -870,11 +870,11 @@ "vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ=" }, "opsgenie": { - "hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=", + "hash": "sha256-NMaTTZQyEJ0vb+eDNTGRozTrme78Vo+/GuIR43AeDbU=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.18", + "rev": "v0.6.19", "spdx": "MPL-2.0", "vendorHash": null }, From b3a0ce416bc9b70ca824582b927f65da9c03290d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 03:16:30 +0000 Subject: [PATCH 101/132] =?UTF-8?q?terraform-providers.oci:=204.104.2=20?= =?UTF-8?q?=E2=86=92=204.105.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 485cac14b1d6..f03732f4c72c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -816,11 +816,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-EewM1/7zzmJ5KL+/KqstFg6rQT8YpvMULScYeD2ClUQ=", + "hash": "sha256-L8y00f+57hndpVevliJ2kNqpGeNR2Jv/FHbqkAUIRMI=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.104.2", + "rev": "v4.105.0", "spdx": "MPL-2.0", "vendorHash": null }, From ed0693aca734c5f81d73adc02a35baf86f2e2560 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 08:53:32 +0000 Subject: [PATCH 102/132] python310Packages.azure-eventhub: 5.10.1 -> 5.11.1 --- pkgs/development/python-modules/azure-eventhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index e6d36a87c982..6e8dbf6aad34 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.10.1"; + version = "5.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-LV+o7dMVCFIQfq9d2wYY34LghIP5FN06zDpUPtkELFQ="; + sha256 = "sha256-Z1tekAHjO2kVe5g/MpB1U9m38pBQ8J03+pDZdJgzcgE="; }; propagatedBuildInputs = [ From be26029c20a0f1ac292f8f8ec4e16015784bc428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 26 Jan 2023 10:05:52 +0100 Subject: [PATCH 103/132] signal-desktop: 6.2.0 -> 6.3.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- .../networking/instant-messengers/signal-desktop/generic.nix | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 78ac00d6080c..75395c8bbf7e 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,8 +1,8 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.2.0"; - hash = "sha256-auOcMlwKPj5rsnlhK34sYe4JxlHCjb3e2ye8Cs12Qtc="; + version = "6.3.0"; + hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY="; }; signal-desktop-beta = { dir = "Signal Beta"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index c3779fc9f479..e6116c9b4286 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -1,6 +1,5 @@ { pname , dir -, ringrtcPrefix ? "" , version , hash , stdenv @@ -161,7 +160,7 @@ stdenv.mkDerivation rec { --replace "/opt/${dir}/${pname}" $out/bin/${pname} autoPatchelf --no-recurse -- "$out/lib/${dir}/" - patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/${ringrtcPrefix}ringrtc/build/linux/libringrtc-x64.node" + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node" ''; # Tests if the application launches and waits for "Link your phone to Signal Desktop": From ed7ffb0e7801d725285528caac23b9ccb1ef78bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 26 Jan 2023 10:10:40 +0100 Subject: [PATCH 104/132] signal-desktop-beta: 6.3.0-beta.1 -> 6.4.0-beta.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 75395c8bbf7e..1fba61b8b0c6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -6,8 +6,7 @@ }; signal-desktop-beta = { dir = "Signal Beta"; - ringrtcPrefix = "@signalapp/"; - version = "6.3.0-beta.1"; - hash = "sha256-cYJWhnyiWULnIZvI2/k1koLCd2zrL4CVMohcnSZa/TY="; + version = "6.4.0-beta.1"; + hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU="; }; } From d9a4a546b02cd5fc40b0cd34119541552bcd2e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 26 Jan 2023 06:29:23 -0300 Subject: [PATCH 105/132] linuxKernel.kernels.linux_zen: 6.1.6-zen1 -> 6.1.8-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index a5376d56418d..b054034d0099 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.1.6"; #zen + version = "6.1.8"; #zen suffix = "zen1"; #zen - sha256 = "14f24w8cww1096lawrk0absx6sqy4mm0f2wpsijgjx4br2ln7p4r"; #zen + sha256 = "1n7b21mw326j35fw1wb53ws5wghy005mgllvspav8vc3mxm729ps"; #zen isLqx = false; }; # ./update-zen.py lqx From 479cf72e9f69d976893263344fdf7d076779a251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 26 Jan 2023 06:32:09 -0300 Subject: [PATCH 106/132] linuxKernel.kernels.linux_lqx: 6.1.6-lqx1 -> 6.1.8-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index b054034d0099..0a77671f5536 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.6"; #lqx + version = "6.1.8"; #lqx suffix = "lqx1"; #lqx - sha256 = "0w1ckias1j1baidyw1a6kq1za7i3ig0w1phkb4s7sw9p7bnhbrx1"; #lqx + sha256 = "06q5a2p6m5r891pkgisbj8irgv09qb77lnjc26gh4nyc9qzg2d3f"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From d734dc1c30e3f13fb93e17f8901126dc7ef22bcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 09:42:08 +0000 Subject: [PATCH 107/132] python310Packages.panflute: 2.2.3 -> 2.3.0 --- pkgs/development/python-modules/panflute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index a0c4930ab010..402ef134e2ab 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec{ pname = "panflute"; - version = "2.2.3"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AJMz+gt8Wa45aFZSLm15RjiiJlJnkWC4Lobk8o8Pu8Y="; + hash = "sha256-zv2d/EjM2XMqU9tXYQcB0igG2jl6ipflzI3AcLVYZco="; }; propagatedBuildInputs = [ From 0a0306ac75508fdb26dd36d42a1dee41b58f8bc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 10:59:52 +0100 Subject: [PATCH 108/132] python310Packages.panflute: add changelog to meta --- pkgs/development/python-modules/panflute/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index 402ef134e2ab..981e52a07c09 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec{ meta = with lib; { description = "Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions"; homepage = "http://scorreia.com/software/panflute"; + changelog = "https://github.com/sergiocorreia/panflute/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ synthetica ]; }; From 7d2325a774e6228a9ce15749e9a971ee51dd5d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 26 Jan 2023 07:02:15 -0300 Subject: [PATCH 109/132] vulkan-caps-viewer: 3.27 -> 3.28 --- pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index ba96d721632c..d53eeaa000c5 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.27"; + version = "3.28"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-B/FBX63JnBdshNLVMPA0qGnm0c/RGilIahX3VjJnpkI="; + hash = "sha256-gy0gFbPZAwQJHqJvk7WrbZ5y2I+9BGv9VaCoOW1QPek="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. From 41e1a672c6fbf4a19943ae8bbacd5a2a5464a48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 26 Jan 2023 07:07:06 -0300 Subject: [PATCH 110/132] vulkan-caps-viewer: add changelog and fmt --- pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index d53eeaa000c5..39492eefb830 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "DEFINES+=wayland" "CONFIG+=release" - ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; + ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; @@ -51,10 +51,11 @@ stdenv.mkDerivation rec { Client application to display hardware implementation details for GPUs supporting the Vulkan API by Khronos. The hardware reports can be submitted to a public online database that allows comparing different devices, browsing available features, extensions, formats, etc. ''; - homepage = "https://vulkan.gpuinfo.org/"; - platforms = platforms.unix; - license = licenses.gpl2Only; + homepage = "https://vulkan.gpuinfo.org/"; + platforms = platforms.unix; + license = licenses.gpl2Only; maintainers = with maintainers; [ pedrohlc ]; + changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${version}"; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; }; From 8e280065591274ab2efa60dc0dbe8cc476898c60 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 11:08:40 +0100 Subject: [PATCH 111/132] python310Packages.setupmeta: 3.3.2 -> 3.4.0 Diff: https://github.com/codrsquad/setupmeta/compare/v3.3.2...v3.4.0 --- pkgs/development/python-modules/setupmeta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 18758eb2c998..41d9811f03ea 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "setupmeta"; - version = "3.3.2"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "codrsquad"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kX7S5NSqO1LDRkfBHaNfTjzW+l0Pd+5KvQHiNF3eH/M="; + sha256 = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc="; }; preBuild = '' From 262987f52df6265fde26ecee79c502489371110c Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 26 Jan 2023 11:10:37 +0100 Subject: [PATCH 112/132] glances: 3.3.0 -> 3.3.1 https://github.com/nicolargo/glances/releases/tag/v3.3.1 --- pkgs/applications/system/glances/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index f4ec3126976e..cf9e8ec05fd4 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib -, defusedxml, future, packaging, psutil, setuptools +, defusedxml, future, ujson, packaging, psutil, setuptools # Optional dependencies: , bottle, pysnmp , hddtemp @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.3.0"; + version = "3.3.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - sha256 = "sha256-4EZjr8oW5759U20YS6eWVZ0pelTCDj75FBc7IkAzd3M="; + sha256 = "sha256-93fghrNktcz+YyPkRl6ZiSZC+3a5TDql6eFZMy6veJc="; }; # On Darwin this package segfaults due to mismatch of pure and impure @@ -36,6 +36,7 @@ buildPythonApplication rec { bottle defusedxml future + ujson netifaces packaging psutil From 760f23adeb3cdc9525380a7f56872026814b5577 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 11:25:52 +0100 Subject: [PATCH 113/132] python310Packages.python-lsp-server: 1.7.0 -> 1.7.1 Diff: https://github.com/python-lsp/python-lsp-server/compare/refs/tags/v1.7.0...v1.7.1 Changelog: https://github.com/python-lsp/python-lsp-server/blob/v1.7.1/CHANGELOG.md --- .../python-modules/python-lsp-server/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 5f2574eb9c06..f58b55669bfb 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.7.0"; + version = "1.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; + hash = "sha256-Rx8mHBmJw4gh0FtQBVMmOlQklODplrhnWwzsEhQm4NE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -50,7 +50,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ --replace "--cov pylsp --cov test" "" \ - --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ + --replace "autopep8>=1.6.0,<1.7.1" "autopep8" \ --replace "flake8>=5.0.0,<7" "flake8" \ --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \ @@ -130,6 +130,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # Don't run lint tests + "test_pydocstyle" # https://github.com/python-lsp/python-lsp-server/issues/243 "test_numpy_completions" "test_workspace_loads_pycodestyle_config" From a149d5bf0f55962c60a6d8a664b178fbd160f43b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 11:31:47 +0100 Subject: [PATCH 114/132] python310Packages.setupmeta: add changelog to meta --- pkgs/development/python-modules/setupmeta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 41d9811f03ea..d92d81f632a7 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "codrsquad"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc="; + rev = "refs/tags/v${version}"; + hash = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc="; }; preBuild = '' From 6919ac80f21878505c070ba7e34d90bea6e56f13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 11:43:50 +0100 Subject: [PATCH 115/132] python310Packages.python-lsp-server: switch to pythonRelaxDepsHook --- .../python-lsp-server/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index f58b55669bfb..a026eb15fa27 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -18,6 +18,7 @@ , pylint , pyqt5 , pytestCheckHook +, pythonRelaxDepsHook , python-lsp-jsonrpc , pythonOlder , rope @@ -49,15 +50,20 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ - --replace "--cov pylsp --cov test" "" \ - --replace "autopep8>=1.6.0,<1.7.1" "autopep8" \ - --replace "flake8>=5.0.0,<7" "flake8" \ - --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ - --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \ - --replace "pyflakes>=2.5.0,<3.1.0" "pyflakes" + --replace "--cov pylsp --cov test" "" ''; + pythonRelaxDeps = [ + "autopep8" + "flake8" + "mccabe" + "pycodestyle" + "pydocstyle" + "pyflakes" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools-scm ]; From 556a5f80714a58addd6e3f9cbf5f23be0820b8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Wed, 25 Jan 2023 20:46:49 +0100 Subject: [PATCH 116/132] exprtk: init at unstable-2021-12-31 --- pkgs/development/libraries/exprtk/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/exprtk/default.nix diff --git a/pkgs/development/libraries/exprtk/default.nix b/pkgs/development/libraries/exprtk/default.nix new file mode 100644 index 000000000000..3e109956c674 --- /dev/null +++ b/pkgs/development/libraries/exprtk/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "exprtk"; + version = "unstable-2021-12-31"; + + src = fetchFromGitHub { + owner = "ArashPartow"; + repo = "exprtk"; + rev = "806c519c91fd08ba4fa19380dbf3f6e42de9e2d1"; + hash = "sha256-5/k+y3gNJeggfwXmtAVqmaiV+BXX+WKtWwZWcQSrQDM="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm644 exprtk.hpp "$out/include/exprtk.hpp" + runHook postInstall + ''; + + meta = with lib; { + description = "The C++ Mathematical Expression Toolkit Library"; + homepage = "https://www.partow.net/programming/exprtk/index.html"; + license = licenses.mit; + maintainers = with maintainers; [ anselmschueler ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87fc70d7834a..2586244f22d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19363,6 +19363,8 @@ with pkgs; expat = callPackage ../development/libraries/expat { }; + exprtk = callPackage ../development/libraries/exprtk { }; + eventlog = callPackage ../development/libraries/eventlog { }; faac = callPackage ../development/libraries/faac { }; From b42738b02822f4ee7cebdc3641753b56cdecb78e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 12:00:16 +0100 Subject: [PATCH 117/132] python311Packages.autopep8: add patch to ignore deprecation warnings --- .../python-modules/autopep8/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 9eff8e2d29d4..f22d92d7bfb1 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,17 +1,20 @@ { lib +, buildPythonPackage , fetchFromGitHub , fetchpatch -, buildPythonPackage -, pythonOlder -, pycodestyle , glibcLocales -, tomli +, pycodestyle , pytestCheckHook +, pythonOlder +, tomli }: buildPythonPackage rec { pname = "autopep8"; version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hhatto"; @@ -20,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo="; }; + patches = [ + # Ignore DeprecationWarnings to fix tests on Python 3.11, https://github.com/hhatto/autopep8/pull/665 + (fetchpatch { + name = "ignore-deprecation-warnings.patch"; + url = "https://github.com/hhatto/autopep8/commit/75b444d7cf510307ef67dc2b757d384b8a241348.patch"; + hash = "sha256-5hcJ2yAuscvGyI7zyo4Cl3NEFG/fZItQ8URstxhzwzE="; + }) + ]; + propagatedBuildInputs = [ pycodestyle ] ++ lib.optionals (pythonOlder "3.11") [ From d06275c980c802b65494a4a88b9c47d17a095a01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 11:42:16 +0000 Subject: [PATCH 118/132] python310Packages.googlemaps: 4.7.3 -> 4.9.0 --- pkgs/development/python-modules/googlemaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 0bcfe7f80850..162cda76f4e3 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "googlemaps"; - version = "4.7.3"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "refs/tags/v${version}"; - hash = "sha256-SwNUoC4x1Z+cqBvuBtDZNZMDcs4XwLj7LWntZ4gZ+vo="; + hash = "sha256-Ji9GDVQdDmneOcjrmfaG84HJNCz4igHJQmnwk9xiUlM="; }; propagatedBuildInputs = [ From cdbe7c69c2ac408df85f8ded225305ef12c0276b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Jan 2023 20:05:08 +1000 Subject: [PATCH 119/132] buildah: wrap netavark via CONTAINERS_HELPER_BINARY_DIR consistent with podman wrapper --- pkgs/development/tools/buildah/wrapper.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index aa14a01b8644..575ee45d7d81 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -1,6 +1,7 @@ { buildah-unwrapped , runCommand , makeWrapper +, symlinkJoin , lib , stdenv , extraPackages ? [] @@ -11,6 +12,8 @@ , fuse-overlayfs # CoW for images, much faster than default vfs , util-linux # nsenter , iptables +, aardvark-dns +, netavark }: let @@ -25,6 +28,17 @@ let iptables ] ++ extraPackages); + helpersBin = symlinkJoin { + name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}"; + + # this only works for some binaries, others may need to be be added to `binPath` or in the modules + paths = [ + ] ++ lib.optionals stdenv.isLinux [ + aardvark-dns + netavark + ]; + }; + in runCommand buildah-unwrapped.name { name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}"; inherit (buildah-unwrapped) pname version; @@ -48,5 +62,6 @@ in runCommand buildah-unwrapped.name { mkdir -p $out/bin ln -s ${buildah-unwrapped}/share $out/share makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \ + --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ --prefix PATH : ${binPath} '' From c0cf231b22bfe48432c2976508924f5cc840cf16 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Jan 2023 22:21:44 +1000 Subject: [PATCH 120/132] nixVersions.nix_2_13: 2.13.1 -> 2.13.2 https://github.com/NixOS/nix/releases/tag/2.13.2 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 73e715bddb38..e0c880528793 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -107,8 +107,8 @@ in lib.makeExtensible (self: { }; nix_2_13 = common { - version = "2.13.1"; - sha256 = "sha256-uXh4+xjJUHQSCg+LHh6+SSYtMdjKQiTXMZ4uZFwzdq4="; + version = "2.13.2"; + sha256 = "sha256-MtVatZVsV+dtjdD4AC4bztrnDFas+WZYHzQMt41FwzU="; }; stable = self.nix_2_12; From c71e0d662d01ae1feb26569cb10d9e5cfbe50593 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Jan 2023 22:22:48 +1000 Subject: [PATCH 121/132] Revert "Revert "nixVersions.stable: 2.12 -> 2.13"" This reverts commit 89181b4e093b4b7af76cb3d21f4f8f40773b2255. --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e0c880528793..8f43b9b172ab 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -111,7 +111,7 @@ in lib.makeExtensible (self: { sha256 = "sha256-MtVatZVsV+dtjdD4AC4bztrnDFas+WZYHzQMt41FwzU="; }; - stable = self.nix_2_12; + stable = self.nix_2_13; unstable = self.nix_2_13; }) From 2d39d4475f2d25a5da4a0601f504a294fb7da2ad Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Jan 2023 22:22:58 +1000 Subject: [PATCH 122/132] Revert "nixUnstable: bump to latest nix version" This reverts commit 523e62005a859bf1afe72f6b9ad2aec7b8ddb2ff. --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8f43b9b172ab..1534de533cbe 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -113,5 +113,5 @@ in lib.makeExtensible (self: { stable = self.nix_2_13; - unstable = self.nix_2_13; + unstable = self.stable; }) From b93752ceb034c694322c112c4d9fa050286d0308 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Jan 2023 22:54:18 +1000 Subject: [PATCH 123/132] nixos/nix-fallback-paths: 2.12.0 -> 2.13.2 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 3eca901bdbf7..c9cb65dbbe5a 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/h88w1442c7hzkbw8sgpcsbqp4lhz6l5p-nix-2.12.0"; - i686-linux = "/nix/store/j23527l1c3hfx17nssc0v53sq6c741zs-nix-2.12.0"; - aarch64-linux = "/nix/store/zgzmdymyh934y3r4vqh8z337ba4cwsjb-nix-2.12.0"; - x86_64-darwin = "/nix/store/wnlrzllazdyg1nrw9na497p4w0m7i7mm-nix-2.12.0"; - aarch64-darwin = "/nix/store/7n5yamgzg5dpp5vb6ipdqgfh6cf30wmn-nix-2.12.0"; + x86_64-linux = "/nix/store/lsr79q5xqd9dv97wn87x12kzax8s8i1s-nix-2.13.2"; + i686-linux = "/nix/store/wky9xjwiwzpifgk0s3f2nrg8nr67bi7x-nix-2.13.2"; + aarch64-linux = "/nix/store/v8drr3x1ia6bdr8y4vl79mlz61xynrpm-nix-2.13.2"; + x86_64-darwin = "/nix/store/1l14si31p4aw7c1gwgjy0nq55k38j9nj-nix-2.13.2"; + aarch64-darwin = "/nix/store/6x7nr1r780fgn254zhkwhih3f3i8cr45-nix-2.13.2"; } From 35d2617fb5636729888be258b01b2498072fac20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 13:02:12 +0000 Subject: [PATCH 124/132] v2ray-geoip: 202301190046 -> 202301260045 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 439845d79ab6..5f33ff70c150 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202301190046"; + version = "202301260045"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "83ea735314fbc2c3404cb4b9aa044b476e67bc8b"; - sha256 = "sha256-8u2xhpoA6BH9e+kgDwxPsjD4RSuUw05h39aUo7ivM3U="; + rev = "dda29e7611d13ff6f580cf389a7b84194363f75c"; + sha256 = "sha256-9X9Oh4WFFpuRG1jQyQHTqNOCcW5f+uNOjH1iv1i6Je0="; }; installPhase = '' From 941661c9946a6218b9ff8a39dc4c70f62c00b4fd Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 26 Jan 2023 14:49:02 +0100 Subject: [PATCH 125/132] pgadmin: Fix build - change `sha256` to `hash` in override Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index d5c6932c44f8..0d0b63711d2c 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -97,7 +97,7 @@ let version = "4.1.5"; src = oldAttrs.src.override { inherit version; - sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM="; + hash = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM="; }; propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ final.pythonPackages.flask_mail From b904688e476f250561250c2c32ac4594b9f408cb Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 17:23:46 +0800 Subject: [PATCH 126/132] deepin-wayland-protocols: init 1.6.0-deepin.1.2 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin-wayland-protocols/default.nix | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 660004821345..bb46234092ac 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -11,6 +11,7 @@ let dtkwidget = callPackage ./library/dtkwidget { }; qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; qt5integration = callPackage ./library/qt5integration { }; + deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; disomaster = callPackage ./library/disomaster { }; docparser = callPackage ./library/docparser { }; diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix new file mode 100644 index 000000000000..ad3dce815c91 --- /dev/null +++ b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +}: + +stdenv.mkDerivation rec { + pname = "deepin-wayland-protocols"; + version = "1.6.0-deepin.1.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "XML files of the non-standard wayland protocols use in deepin"; + homepage = "https://github.com/linuxdeepin/deepin-wayland-protocols"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 69f53fac1f417c25444405ffe6f7de0a3e1ad9f4 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Jan 2023 17:26:03 +0800 Subject: [PATCH 127/132] dwayland: init at 5.24.3-deepin.1.4 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/library/dwayland/default.nix | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/desktops/deepin/library/dwayland/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index bb46234092ac..9711fe514806 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -12,6 +12,7 @@ let qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; qt5integration = callPackage ./library/qt5integration { }; deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; + dwayland = callPackage ./library/dwayland { }; dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; disomaster = callPackage ./library/disomaster { }; docparser = callPackage ./library/docparser { }; diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix new file mode 100644 index 000000000000..a1797344a0b0 --- /dev/null +++ b/pkgs/desktops/deepin/library/dwayland/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qtbase +, qtwayland +, wayland +, wayland-protocols +, extra-cmake-modules +, deepin-wayland-protocols +, qttools +}: + +stdenv.mkDerivation rec { + pname = "dwayland"; + version = "5.24.3-deepin.1.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-/aWS4uvhxi9azxJWjRE+Bw+veURFO+mC8l9yypseclU="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + qttools + ]; + + buildInputs = [ + qtbase + qtwayland + wayland + wayland-protocols + deepin-wayland-protocols + ]; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Qt-style API to interact with the wayland-client and wayland-server"; + homepage = "https://github.com/linuxdeepin/dwayland"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 52a28708b8ac248f51691a77b670fbe42fdef4e6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 26 Jan 2023 15:11:41 +0100 Subject: [PATCH 128/132] treewide: mark #201254 --- pkgs/applications/networking/browsers/firefox/common.nix | 1 + pkgs/applications/science/misc/root/default.nix | 1 + pkgs/development/interpreters/spidermonkey/common.nix | 1 + pkgs/development/libraries/bobcat/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e8deb9fcd9cc..13645e542640 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -471,6 +471,7 @@ buildStdenv.mkDerivation ({ separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; # tests were disabled in configureFlags diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index af6aed851e09..cfda819a42ca 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -207,6 +207,7 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}. diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index a6695082684d..32a0ae2e7467 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -149,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: rec { # while we have a double-float toolchain NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; postPatch = lib.optionalString (lib.versionOlder version "102") '' diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index f1e537943f58..47fc87af143b 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { ''; # have to link to static gcc lib on aarch64-linux explicitly + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc"; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afb54039a90a..5481f80b7c9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8617,6 +8617,7 @@ with pkgs; kakoune-unwrapped = callPackage ../applications/editors/kakoune { # See comments on https://github.com/NixOS/nixpkgs/pull/198836 # Remove below when stdenv for linux-aarch64 become recent enough. + # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; kakoune = wrapKakoune kakoune-unwrapped { @@ -30610,6 +30611,7 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { + # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; }; From 5b310f272b7f043ec25b19f738c07ae59a0b1203 Mon Sep 17 00:00:00 2001 From: ralismark <13449732+ralismark@users.noreply.github.com> Date: Thu, 26 Jan 2023 16:35:46 +1100 Subject: [PATCH 129/132] lab: fix zsh completion --- pkgs/applications/version-management/lab/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/applications/version-management/lab/default.nix index 754fa778fed9..f79b59b56396 100644 --- a/pkgs/applications/version-management/lab/default.nix +++ b/pkgs/applications/version-management/lab/default.nix @@ -22,14 +22,16 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' - # make xdg-open overrideable at runtime - wrapProgram $out/bin/lab \ - --prefix PATH ":" "${lib.makeBinPath [ git ]}" \ - --suffix PATH ":" "${lib.makeBinPath [ xdg-utils ]}" + # create shell completions before wrapProgram so that lab detects the right + # path for itself installShellCompletion --cmd lab \ --bash <($out/bin/lab completion bash) \ --fish <($out/bin/lab completion fish) \ --zsh <($out/bin/lab completion zsh) + # make xdg-open overrideable at runtime + wrapProgram $out/bin/lab \ + --prefix PATH ":" "${lib.makeBinPath [ git ]}" \ + --suffix PATH ":" "${lib.makeBinPath [ xdg-utils ]}" ''; meta = with lib; { From 9b914fc67933aaa7caa227dbb8360feb11fc9b5c Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 26 Jan 2023 13:26:36 +0100 Subject: [PATCH 130/132] Apply suggestions from code review --- pkgs/applications/version-management/lab/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/applications/version-management/lab/default.nix index f79b59b56396..38531775b99e 100644 --- a/pkgs/applications/version-management/lab/default.nix +++ b/pkgs/applications/version-management/lab/default.nix @@ -22,16 +22,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' - # create shell completions before wrapProgram so that lab detects the right - # path for itself + # create shell completions before wrapProgram so that lab detects the right path for itself installShellCompletion --cmd lab \ --bash <($out/bin/lab completion bash) \ --fish <($out/bin/lab completion fish) \ --zsh <($out/bin/lab completion zsh) # make xdg-open overrideable at runtime wrapProgram $out/bin/lab \ - --prefix PATH ":" "${lib.makeBinPath [ git ]}" \ - --suffix PATH ":" "${lib.makeBinPath [ xdg-utils ]}" + --suffix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}" ''; meta = with lib; { From 16302ba83ca61c7cb50411420013674f011270a4 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 16 Jan 2023 16:15:50 -0300 Subject: [PATCH 131/132] elixir: set version to latest / elixir_1_14 --- pkgs/development/beam-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 86f7d94eed1b..23982fb2a789 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -43,7 +43,7 @@ let elvis-erlang = callPackage ./elvis-erlang { }; # BEAM-based languages. - elixir = elixir_1_13; + elixir = elixir_1_14; elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix { inherit erlang; From 6dd632b2e54ef8eabc23533b573cb6622ab9392e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 26 Jan 2023 15:01:39 +0100 Subject: [PATCH 132/132] ocamlPackages.lustre-v6: update hash --- pkgs/development/ocaml-modules/lustre-v6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix index 4eb1e55a5a8a..17d21879342d 100644 --- a/pkgs/development/ocaml-modules/lustre-v6/default.nix +++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -8,7 +8,7 @@ buildDunePackage rec { src = fetchurl { url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz"; - hash = "sha256-+OqDwUIiPrtJy1C3DmDNTrtsT8clKKcNWCev4TEMRBc="; + hash = "sha256-EQ+KjDn+UsyHFRh0RWe9toqdjiNcacQUMNRQCLuaw5I="; }; propagatedBuildInputs = [