From 66c2a1333217cd039f756f890a70f15af2dabb7b Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com> Date: Mon, 19 Dec 2022 08:24:54 +0100 Subject: [PATCH 01/21] slack: add wayland dependency Fixes startup error: [6173:1219/081615.058096:ERROR:wayland_connection.cc(157)] Failed to load libwayland-cursor.so.0. [6173:1219/081615.058130:ERROR:ozone_platform_wayland.cc(220)] Failed to initialize Wayland platform [6173:1219/081615.058146:ERROR:env.cc(255)] The platform failed to initialize. Exiting. (cherry picked from commit 3eda3c20117af54ab65f2ea6f1408aa672769591) --- .../networking/instant-messengers/slack/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 325d5330d62e..1f0d00e63785 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -34,6 +34,7 @@ , pango , pipewire , systemd +, wayland , xdg-utils , xorg }: @@ -121,6 +122,7 @@ let pipewire stdenv.cc.cc systemd + wayland xorg.libX11 xorg.libXScrnSaver xorg.libXcomposite From 1caafbc63845fecc307bd46e1421af05c3f5c827 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 31 Dec 2022 23:59:19 +0100 Subject: [PATCH 02/21] palemoon: 31.4.1.1 -> 31.4.2 (cherry picked from commit ee82cb3532c27808a40c16dd3bcc7f282dc1a339) --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 3e08b228159c..9efa3e79dc05 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,7 +45,7 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.4.1.1"; + version = "31.4.2"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-lr8xT9tRxVjg1DxUZuCyWuCFBPPdmkvsnmAsoX8o/6Y="; + sha256 = "sha256-vJhjQfsa05fFNL24tUBHfKoKZG2aLXp5xBdUqqGDtAE="; }; nativeBuildInputs = [ From 9d5b488069c6061d341f0f8e4f9ae1a29601f9f6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 25 Dec 2022 00:32:46 +0100 Subject: [PATCH 03/21] =?UTF-8?q?ocamlPackages.imagelib:=2020210511=20?= =?UTF-8?q?=E2=86=92=2020221222?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit df1eed4bd92ead9c3a34639019f179b2457f2aa2) --- pkgs/development/ocaml-modules/imagelib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 101a0e28b94e..2733ef4cee0c 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -3,20 +3,20 @@ }: buildDunePackage rec { - minimumOCamlVersion = "4.07"; - version = "20210511"; + minimalOCamlVersion = "4.08"; + version = "20221222"; pname = "imagelib"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz"; - sha256 = "1cb94ea3731dc994c205940c9434543ce3f2470cdcb2e93a3e02ed793e80d480"; + hash = "sha256-BQ2TVxGlpc6temteK84TKXpx0MtHZSykL/TjKN9xGP0="; }; propagatedBuildInputs = [ decompress stdlib-shims ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; checkInputs = [ alcotest ]; meta = { From 32a52aa85344472f97d2ae3712079eba90305a5d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:08 +0100 Subject: [PATCH 04/21] comby: use dune 3 (cherry picked from commit 61bc8100f5ed7e716f0765b8725a4bedf1f811f7) --- pkgs/development/tools/comby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index d97287ab579b..f77acfffa9b3 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -15,8 +15,8 @@ let ocamlPackages.buildDunePackage rec { inherit pname preBuild; version = "1.8.1"; - useDune2 = true; - minimumOcamlVersion = "4.08.1"; + duneVersion = "3"; + minimalOcamlVersion = "4.08.1"; doCheck = true; src = fetchFromGitHub { From 86ec11ffd5e9a89f72f7a5a3832b7bc861321015 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:12 +0100 Subject: [PATCH 05/21] ocamlPackages.oseq: init at 0.4 (cherry picked from commit 44058cb0e3557ff71d96f83e974ba2dceeaf9738) --- .../ocaml-modules/oseq/default.nix | 33 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/ocaml-modules/oseq/default.nix diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix new file mode 100644 index 000000000000..cbe02de2ef11 --- /dev/null +++ b/pkgs/development/ocaml-modules/oseq/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildDunePackage +, seq +, containers, qcheck +}: + +buildDunePackage rec { + version = "0.4"; + pname = "oseq"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = pname; + rev = "v${version}"; + hash = "sha256-FoCBvvPwa/dUCrgDEd0clEKAO7EcpedjaO4v+yUO874="; + }; + + propagatedBuildInputs = [ seq ]; + + duneVersion = "3"; + + doCheck = true; + checkInputs = [ + containers + qcheck + ]; + + meta = { + homepage = "https://c-cube.github.io/oseq/"; + description = "Purely functional iterators compatible with standard `seq`"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 27d42a85c5a8..238055d8f8a5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1114,6 +1114,8 @@ let ordering = callPackage ../development/ocaml-modules/ordering { }; + oseq = callPackage ../development/ocaml-modules/oseq { }; + otfm = callPackage ../development/ocaml-modules/otfm { }; otoml = callPackage ../development/ocaml-modules/otoml { }; From 9c3777124e59c85608d1979a64c09e7a3d785e14 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:15 +0100 Subject: [PATCH 06/21] ocamlPackages.dscheck: init at 0.1.0 (cherry picked from commit 406fa9b6e65ea54a3aee508b4ac5c223c1a7939d) --- .../ocaml-modules/dscheck/default.nix | 28 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dscheck/default.nix diff --git a/pkgs/development/ocaml-modules/dscheck/default.nix b/pkgs/development/ocaml-modules/dscheck/default.nix new file mode 100644 index 000000000000..0f74fb5e2414 --- /dev/null +++ b/pkgs/development/ocaml-modules/dscheck/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, containers +, oseq +}: + +buildDunePackage rec { + pname = "dscheck"; + version = "0.1.0"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/dscheck/releases/download/${version}/dscheck-${version}.tbz"; + hash = "sha256-zoouFZJcUp71yeluVb1xLUIMcFv99OpkcQQCHkPTKcI="; + }; + + propagatedBuildInputs = [ containers oseq ]; + + doCheck = true; + + meta = { + description = "Traced atomics"; + homepage = "https://github.com/ocaml-multicore/dscheck"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 238055d8f8a5..5fd110185afa 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -330,6 +330,8 @@ let dose3 = callPackage ../development/ocaml-modules/dose3 { }; + dscheck = callPackage ../development/ocaml-modules/dscheck { }; + dssi = callPackage ../development/ocaml-modules/dssi { }; dtoa = callPackage ../development/ocaml-modules/dtoa { }; From c5a6b3dc39204d6372272254d8128eecfacea4dc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:19 +0100 Subject: [PATCH 07/21] ocamlPackages.lockfree: init at 0.3.0 (cherry picked from commit 37f0b1e89fc548d519f94aba406d85987b03ba79) --- .../ocaml-modules/lockfree/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/lockfree/default.nix diff --git a/pkgs/development/ocaml-modules/lockfree/default.nix b/pkgs/development/ocaml-modules/lockfree/default.nix new file mode 100644 index 000000000000..c3400d4583e0 --- /dev/null +++ b/pkgs/development/ocaml-modules/lockfree/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchurl, buildDunePackage +, dscheck +, qcheck, qcheck-alcotest +}: + +buildDunePackage rec { + pname = "lockfree"; + version = "0.3.0"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/lockfree/releases/download/${version}/lockfree-${version}.tbz"; + hash = "sha256-XdJR5ojFsA7bJ4aZ5rh10NjopE0NjfqQ9KitOLMh3Jo="; + }; + + propagatedBuildInputs = [ dscheck ]; + + doCheck = true; + checkInputs = [ qcheck qcheck-alcotest ]; + + meta = { + description = "Lock-free data structures for multicore OCaml"; + homepage = "https://github.com/ocaml-multicore/lockfree"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5fd110185afa..c23dd70d7e63 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -737,6 +737,8 @@ let lo = callPackage ../development/ocaml-modules/lo { }; + lockfree = callPackage ../development/ocaml-modules/lockfree { }; + logs = callPackage ../development/ocaml-modules/logs { }; lru = callPackage ../development/ocaml-modules/lru { }; From f6c9395ab02b274505c4c82c312aa8d2145263b1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:22 +0100 Subject: [PATCH 08/21] ocamlPackages.domainslib: init at 0.5.0 (cherry picked from commit 629689ed8623340abfa18e69e31780d2a613b13d) --- .../ocaml-modules/domainslib/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/domainslib/default.nix diff --git a/pkgs/development/ocaml-modules/domainslib/default.nix b/pkgs/development/ocaml-modules/domainslib/default.nix new file mode 100644 index 000000000000..6db57f81c48f --- /dev/null +++ b/pkgs/development/ocaml-modules/domainslib/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchurl, buildDunePackage +, lockfree +, mirage-clock-unix +}: + +buildDunePackage rec { + pname = "domainslib"; + version = "0.5.0"; + + duneVersion = "3"; + minimalOCamlVersion = "5.0"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/domainslib/releases/download/v${version}/domainslib-${version}.tbz"; + hash = "sha256-rty+9DUhTUEcN7BPl8G6Q/G/MJ6z/UAn0RPkG8hACwA="; + }; + + propagatedBuildInputs = [ lockfree ]; + + doCheck = true; + checkInputs = [ mirage-clock-unix ]; + + meta = { + homepage = "https://github.com/ocaml-multicore/domainslib"; + description = "Nested-parallel programming"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c23dd70d7e63..a0168291a08c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -328,6 +328,8 @@ let domain-name = callPackage ../development/ocaml-modules/domain-name { }; + domainslib = callPackage ../development/ocaml-modules/domainslib { }; + dose3 = callPackage ../development/ocaml-modules/dose3 { }; dscheck = callPackage ../development/ocaml-modules/dscheck { }; From 6c432c54d8c50edbd3af385aef5353d5bcab9b41 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:29 +0100 Subject: [PATCH 09/21] =?UTF-8?q?ocamlPackages.parany:=2012.1.2=20?= =?UTF-8?q?=E2=86=92=20{12.2.2,=2013.0.1}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6e2fcbcadd0e359baf5c3fdfc800dd362d2eb5ab) --- .../ocaml-modules/parany/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index 4f072391deb0..f5af16167955 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -1,20 +1,32 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: +{ lib, buildDunePackage, fetchFromGitHub, ocaml, cpu, domainslib }: + +let params = + if lib.versionAtLeast ocaml.version "5.00" then { + version = "13.0.1"; + hash = "sha256-OYa0uLsDyzjmXZgWcYUxLhqco4Kp/icfDamNe3En5JQ="; + propagatedBuildInputs = [ domainslib ]; + } else { + version = "12.2.2"; + hash = "sha256-woZ4XJqqoRr/7mDurXYvTbSUUcLBEylzVYBQp1BAOqc="; + propagatedBuildInputs = [ cpu ]; + } +; in buildDunePackage rec { pname = "parany"; - version = "12.1.2"; + inherit (params) version; - useDune2 = true; - minimumOCamlVersion = "4.03.0"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "UnixJunkie"; repo = pname; rev = "v${version}"; - sha256 = "yOeJzb2Wr6jA4efI9/fuqDCl/Tza3zxT3YjAiJmhHHg="; + inherit (params) hash; }; - propagatedBuildInputs = [ ocamlnet cpu ]; + inherit (params) propagatedBuildInputs; meta = with lib; { inherit (src.meta) homepage; From 386834b3665c2c305a567adad2a3c6f5d1e5e662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 29 Dec 2022 13:33:25 +0100 Subject: [PATCH 10/21] nixos/test-driver: add optional address arg to wait_for_{open,closed}_port This is useful for testing servers configured to listen on specific addresses. (cherry picked from commit dba49a43a08eb3b384c37a0ccb94530d6d974158) --- .../development/writing-nixos-tests.section.md | 7 ++++--- .../development/writing-nixos-tests.section.xml | 7 ++++--- nixos/lib/test-driver/test_driver/machine.py | 14 ++++++++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 2efe52b9883c..a2e25f84b650 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -273,12 +273,13 @@ The following methods are available on machine objects: `wait_for_open_port` -: Wait until a process is listening on the given TCP port (on - `localhost`, at least). +: Wait until a process is listening on the given TCP port and IP address + (default `localhost`). `wait_for_closed_port` -: Wait until nobody is listening on the given TCP port. +: Wait until nobody is listening on the given TCP port and IP address + (default `localhost`). `wait_for_x` diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml index 4db196273dad..1d277dd20df3 100644 --- a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -483,8 +483,8 @@ start_all() - Wait until a process is listening on the given TCP port (on - localhost, at least). + Wait until a process is listening on the given TCP port and + IP address (default localhost). @@ -494,7 +494,8 @@ start_all() - Wait until nobody is listening on the given TCP port. + Wait until nobody is listening on the given TCP port and IP + address (default localhost). diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index ffbc7c18e42b..c59ef3b17262 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -699,20 +699,22 @@ class Machine: with self.nested("waiting for file ‘{}‘".format(filename)): retry(check_file) - def wait_for_open_port(self, port: int) -> None: + def wait_for_open_port(self, port: int, addr: str = "localhost") -> None: def port_is_open(_: Any) -> bool: - status, _ = self.execute("nc -z localhost {}".format(port)) + status, _ = self.execute("nc -z {} {}".format(addr, port)) return status == 0 - with self.nested("waiting for TCP port {}".format(port)): + with self.nested("waiting for TCP port {} on {}".format(port, addr)): retry(port_is_open) - def wait_for_closed_port(self, port: int) -> None: + def wait_for_closed_port(self, port: int, addr: str = "localhost") -> None: def port_is_closed(_: Any) -> bool: - status, _ = self.execute("nc -z localhost {}".format(port)) + status, _ = self.execute("nc -z {} {}".format(addr, port)) return status != 0 - with self.nested("waiting for TCP port {} to be closed".format(port)): + with self.nested( + "waiting for TCP port {} on {} to be closed".format(port, addr) + ): retry(port_is_closed) def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: From 746555f17a73e1a3969e8bbe31c20d81ab4cbc71 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 24 Dec 2022 13:58:22 +0100 Subject: [PATCH 11/21] nixosTests.keymap: Reorder test cases to make setup more reliable I've run this test on repeat for hours, so there's reason to be hopeful. (cherry picked from commit 2b5677caa342629ee42743ac92556ac8bf5e8ef9) --- nixos/tests/keymap.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index 4306a9ae2cf9..40f4762bed83 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -78,9 +78,18 @@ let with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file: tests = json.load(json_file) + # These environments used to run in the opposite order, causing the + # following error at openvt startup. + # + # openvt: Couldn't deallocate console 1 + # + # This error did not appear in successful runs. + # I don't know the exact cause, but I it seems that openvt and X are + # fighting over the virtual terminal. This does not appear to be a problem + # when the X test runs first. keymap_environments = { - "VT Keymap": "openvt -sw --", "Xorg Keymap": "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e", + "VT Keymap": "openvt -sw --", } machine.wait_for_x() From 068d27234811117c865599ea473e92d0771df3cd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 24 Dec 2022 13:59:57 +0100 Subject: [PATCH 12/21] nixosTests.keymap: Remove unnecessary sleep When test-input-reader runs, it's standard input exists and will be buffered, so by the time the file exists, the standard input can already be written to. I have no reason to believe that a terminal emulator would start accepting input _after_ launching the command. I've tested this for hours in a loop without a single failure or timeout. (cherry picked from commit 562431130592150c9910b1abd5019c16c6d6fcb0) --- nixos/tests/keymap.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index 40f4762bed83..0bde21093b0a 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -64,7 +64,6 @@ let # wait for reader to be ready machine.wait_for_file("${readyFile}") - machine.sleep(1) # send all keys for key in inputs: From 7a8525fa332df011c24ab0903884fe0d75537e61 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 1 Jan 2023 13:58:15 +0100 Subject: [PATCH 13/21] rubyPackages.loofah: 2.19.0 -> 2.19.1 Fixes CVE-2022-23514, CVE-2022-23515 and CVE-2022-23516. https://github.com/flavorjones/loofah/releases/tag/v2.19.1 (cherry picked from commit 2fd154b9f69e647ff23aa0c510f060f6e4f7c3ca) --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 2b5d1349d177..dbc46162f473 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -1847,10 +1847,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "sha256-bGRp797+NJYBAACjRvnTv3EOEaxGYeNTz1aFIyb7ECM="; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; mab = { groups = ["default"]; From 6700923182411cc36375822c78a1ea3384b5b275 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 1 Jan 2023 11:40:38 +0100 Subject: [PATCH 14/21] rubyPackages.nokogiri: 1.13.9 -> 1.13.10 Fixes CVE-2022-23476. https://github.com/sparklemotion/nokogiri/releases/tag/v1.13.10 (cherry picked from commit f5bacb577bd0404c9ca999eab9c0fbfa10336d86) --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 2b5d1349d177..9d80f3935691 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2124,10 +2124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "sha256-0+4A8mwVF2PaFpHH/Ghx3dA+Uy90+FEB9aztwtCZ6Vg="; type = "gem"; }; - version = "1.13.9"; + version = "1.13.10"; }; octokit = { dependencies = ["faraday" "sawyer"]; From fbfb41605b1707d7beec7b01b9eb6dd97a2054d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 18 Dec 2022 13:24:43 +0100 Subject: [PATCH 15/21] vscode: add missing wayland runtimeDependency On wayland it tries to dlopen libwayland-cursor.so.1 and fails to start if this library is not provided. (cherry picked from commit ad83b5e7c3366a21d4764a346b705e4f50bf77ed) --- pkgs/applications/editors/vscode/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 59910c89428b..a87097547d32 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeDesktopItem , unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper , atomEnv, at-spi2-atk, autoPatchelfHook -, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap +, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland # Populate passthru.tests , tests @@ -66,7 +66,7 @@ let buildInputs = [ libsecret libXScrnSaver libxshmfence ] ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages); - runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; + runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland ]; nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ From a50cdb52bfb443b2d63fff4cc8016f99ab4bf4bc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:22:27 +0100 Subject: [PATCH 16/21] linux: 5.15.85 -> 5.15.86 (cherry picked from commit ea9482360d36d1c2f36529af2c124804393a4641) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 65abe73b120f..dbd16aee6e29 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.85"; + version = "5.15.86"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "024qhjh9mgfnanr1qd8002n6a4wpn98lajli12a0m3n9z8lsw2rc"; + sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40"; }; } // (args.argsOverride or { })) From a45c9f99aba109859f711ab7e8297895dec6d86d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:22:39 +0100 Subject: [PATCH 17/21] linux: 6.0.15 -> 6.0.16 (cherry picked from commit 5851c3d993ee956ff827069f9c93de00b5a5d0e9) --- pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 6865bd9f6ed0..0ce07283fbe1 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.15"; + version = "6.0.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "08389890gq4b9vkvrb22lzkr4blkn3a5ma074ns19gl89wyyp16l"; + sha256 = "1r2wf3hf7yxl7lxma7plyi8pk3dmlsrpm763rf0g1h8ilsy72844"; }; } // (args.argsOverride or { })) From f62315262d917c0b2b629830dd5312f83ab6bd38 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:22:51 +0100 Subject: [PATCH 18/21] linux: 6.1.1 -> 6.1.2 (cherry picked from commit 4b249451ec6df8ecf4431537321f173a6b91df89) --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 1e5917db8de5..358bab304f70 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.1"; + version = "6.1.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1yqxjz0f722s2bcssqg5b6m6lvq5l4vrlh3bjviajda4rxvi7rm3"; + sha256 = "1bni72q0jjg39vqckcif57kh7d1x4k4jir5a11pz9clryp2g6hgf"; }; } // (args.argsOverride or { })) From a5f880958fa24b7a80e3b947a27e90b16ed3d948 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:23:15 +0100 Subject: [PATCH 19/21] linux_latest-libre: 19007 -> 19027 (cherry picked from commit 7cecdb94d1f8dd45c299331a4a4cc29356af48b8) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 5bcf2f357328..698ca10016ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19001"; - sha256 = "0y2j37dgpagm0qvi66xw138mr7vpdg4ifnh24pl8aacp83xxglq9"; + rev = "19027"; + sha256 = "0g7sf48rwicwzwhjpzs82j6v3j4s17xhrgfgysdd523r07437ryv"; } , ... }: From 3d56ccb4fef1340aa177e5a9a4ac802507f20c99 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 2 Jan 2023 16:22:51 +0100 Subject: [PATCH 20/21] python3Packages.afdko: disable test broken by the new year (cherry picked from commit 57b21b39ea0b893d17aa0411c64a85228b3b4b29) --- pkgs/development/python-modules/afdko/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 29593503252a..739198fa4aeb 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -91,6 +91,10 @@ buildPythonPackage rec { "test_spec" ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ "test_type1mm_inputs" + ] ++ [ + # No longer succeeds in 2023 + # https://github.com/adobe-type-tools/afdko/issues/1589 + "test_ufo_fontinfo_parsing" ]; passthru.tests = { From 7c2968ad419a0b156c26e7ea6f2a20cf14b60178 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Dec 2022 06:43:18 +0000 Subject: [PATCH 21/21] librewolf-unwrapped: 108.0-1 -> 108.0.1-1 (cherry picked from commit b1acd65415bd5210c83a9e093c124a149fadc52b) --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 4070556cdce6..9955fd0a936c 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "108.0-1", + "packageVersion": "108.0.1-1", "source": { - "rev": "108.0-1", - "sha256": "1gfqxlcgf7qxgisbj565ndrfhkk68py2jpwrx7k2j7zpszkb2f4m" + "rev": "108.0.1-1", + "sha256": "0ix8ri2s8rnpd9nqvwlk50x9hp51y70gb3r6f7lh4ldg2bay08n0" }, "firefox": { - "version": "108.0", - "sha512": "fa800f62cca395a51b9a04373a27be48fc3860208e34ecf74d908127638d1eb8c41cf9898be6896777d408127d5c4b7104d9ee89c97da923b2dc6ea32186187e" + "version": "108.0.1", + "sha512": "e6219ed6324422ec293ed96868738e056582bb9f7fb82e59362541f3465c6ebca806d26ecd801156b074c3675bd5a22507b1f1fa53eebf82b7dd35f2b1ff0625" } }