From 410543a974cbdefe8f6f5d572f1999f7430bd112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 28 Nov 2023 00:07:07 +0100 Subject: [PATCH 01/73] betterbird: 115.4.2-bb17 -> 115.6.0-bb21 --- .../networking/mailreaders/betterbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index 7febb62a0f39..3e9ebbceed75 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - version = "115.4.2"; + version = "115.6.0"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb17"; + rev = "${version}-bb21-correct-series-take2"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-hfM1VzYD0TsjZik0MLXBAkD5ecyvbg7jn2pKdrzMEfo="; + hash = "sha256-YERSRyLfFTexvAYmP9qG6joQkK5fSIvU4pNLhCyIbOY="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -49,7 +49,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-PAjj7FvIA7uB0yngkL4KYKZoYU1CF2qQTF5+sG2VLtI="; + hash = "sha256-Oxz5drDQ9IJVpgP4/+jiQ5Ds1b0oX8TRD+SOG6JRN0Q="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' From 9c7014841661dff7b882b78516bf97e099dfa8f2 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 10 Jan 2024 00:51:41 +0100 Subject: [PATCH 02/73] linuxPackages.apfs: 0.3.5 -> 0.3.6 https://github.com/linux-apfs/linux-apfs-rw/releases/tag/v0.3.6 --- pkgs/os-specific/linux/apfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 98487799aa8a..0c8d7cb989d4 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,7 +6,7 @@ }: let - tag = "0.3.5"; + tag = "0.3.6"; in stdenv.mkDerivation { pname = "apfs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - hash = "sha256-rKz9a4Z+tx63rhknQIl/zu/WIMjxxM0+NGyaxnzxLk4="; + hash = "sha256-k62PgUffBx6ZrWWLeX460adh/vv6XWxSmtEiwaWxiaU="; }; hardeningDisable = [ "pic" ]; From f7a175776eeb7dda707d88d7ae7b0621727a4543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 9 Jan 2024 21:04:15 +0100 Subject: [PATCH 03/73] ci: Check if all nix files are parseable --- .github/workflows/nix-parse.yml | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/nix-parse.yml diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse.yml new file mode 100644 index 000000000000..8b2ef0b8da49 --- /dev/null +++ b/.github/workflows/nix-parse.yml @@ -0,0 +1,35 @@ +name: "Check whether nix files are parseable" + +permissions: read-all + +on: + # avoids approving first time contributors + pull_request_target: + branches-ignore: + - 'release-**' + +jobs: + tests: + runs-on: ubuntu-latest + if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" + steps: + - name: Get list of changed files from PR + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh api \ + repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \ + | jq '.[] | select(.status != "removed" and (.filename | endswith(".nix"))) | .filename' \ + > "$HOME/changed_files" + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + # pull_request_target checks out the base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge + - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24 + - name: Parse all changed or added nix files + run: | + ret=0 + while IFS= read -r file; do + out="$(nix-instantiate --parse "$file")" || { echo "$out" && ret=1; } + done < "$HOME/changed_files" + exit "$ret" From 08c00a0fb0dc1f508dee3edda8e6edbede078961 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 11 Jan 2024 22:20:44 +0100 Subject: [PATCH 04/73] =?UTF-8?q?elastic:=200.1.3=20=E2=86=92=200.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/elastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/elastic/default.nix b/pkgs/applications/misc/elastic/default.nix index 316df2e02d4a..ae614d35a4e0 100644 --- a/pkgs/applications/misc/elastic/default.nix +++ b/pkgs/applications/misc/elastic/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "elastic"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "elastic"; rev = version; - hash = "sha256-CZ+EeGbCzkeNx4GD+2+n3jYwz/cQStjMV2+wm/JNsYU="; + hash = "sha256-EExVhf71SEWVcAOAt+IuQH3umNOY4hzzkFVIqnESppo="; }; nativeBuildInputs = [ From 09623aa182864bcf8cb17bf0b60f2be0f9647ad3 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 11 Jan 2024 22:33:57 +0100 Subject: [PATCH 05/73] =?UTF-8?q?wike:=202.0.1=20=E2=86=92=202.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/wike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index e2dafd1ed921..03fe5587e505 100644 --- a/pkgs/applications/misc/wike/default.nix +++ b/pkgs/applications/misc/wike/default.nix @@ -18,14 +18,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wike"; - version = "2.0.1"; + version = "2.1.0"; format = "other"; src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; rev = version; - hash = "sha256-R8Zg/2tr9MrmtTdbvqD+Ra8+MEBJdgMqC3ptx1VgkeA="; + hash = "sha256-BXmLZhotQK6L4c2D8F8qF3zmOlSuzXycEN2FaC1K6/g="; }; nativeBuildInputs = [ From d8cdaedc42ac25aa442833ea9eb36be6af2a8789 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 11 Jan 2024 22:42:33 +0100 Subject: [PATCH 06/73] =?UTF-8?q?fragments:=202.1.0=20=E2=86=92=202.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/p2p/fragments/default.nix | 9 +++--- .../networking/p2p/fragments/gtk4-rs.patch | 28 ------------------- 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/fragments/gtk4-rs.patch diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/applications/networking/p2p/fragments/default.nix index da74fd5e60ac..5034f401a98d 100644 --- a/pkgs/applications/networking/p2p/fragments/default.nix +++ b/pkgs/applications/networking/p2p/fragments/default.nix @@ -32,22 +32,21 @@ let }); in stdenv.mkDerivation rec { pname = "fragments"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Fragments"; rev = version; - sha256 = "sha256-/KtUcj41s9WeHzIgGWhYQv6oD/Df7WOnJAPuS6yGLHk="; + sha256 = "sha256-tZcVw4rxmNPcKKgyRB+alEktktZfKK+7FYUVAAGA9bw="; }; - # https://github.com/gtk-rs/gtk4-rs/issues/1201 - patches = [ ./gtk4-rs.patch ]; + patches = []; cargoDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}"; - hash = "sha256-bhQHXx7kZFL+qb+k0gN1NZZ6LYjBUHuNqU528f0QAg0="; + hash = "sha256-nqVaYnL3jKGBsAsakIkgwksjH4yuMhwCQe0zq3jgjnA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch b/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch deleted file mode 100644 index 4e2a73554309..000000000000 --- a/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index c0dfa2a..2decf88 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1158,9 +1158,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" - - [[package]] - name = "gtk4" --version = "0.4.8" -+version = "0.4.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396" -+checksum = "4e8ae5aef2793bc3551b5e5e3fa062a5de54bb1eccf10dfa4effe9e4384fbbbc" - dependencies = [ - "bitflags", - "cairo-rs", -@@ -1181,9 +1181,9 @@ dependencies = [ - - [[package]] - name = "gtk4-macros" --version = "0.4.8" -+version = "0.4.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7" -+checksum = "d9a4a8077b3a392dd7d637924529e1213d2e0c8e4d531177bc3355e86c257a54" - dependencies = [ - "anyhow", - "proc-macro-crate 1.2.1", From da48627167790070b51146ef73788b1a6c54c32a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 12 Jan 2024 04:20:00 +0000 Subject: [PATCH 07/73] postgresqlPackages.pg_partman: 5.0.0 -> 5.0.1 Diff: https://github.com/pgpartman/pg_partman/compare/refs/tags/v5.0.0...v5.0.1 Changelog: https://github.com/pgpartman/pg_partman/blob/v5.0.1/CHANGELOG.md --- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index e008993fcfa5..10e899f810d0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "5.0.0"; + version = "5.0.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-T7+cPi8LIftWVwI9mi0LAwWCTxp/r6iyKT1wKO/Ztbk="; + sha256 = "sha256-sJODpyRgqpeg/Lb584wNgCCFRaH22ELcbof1bA612aw="; }; installPhase = '' From 9716216a1fb623e31d3666d91dedaca038f570ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 04:39:34 +0000 Subject: [PATCH 08/73] freeipa: 4.11.0 -> 4.11.1 --- pkgs/os-specific/linux/freeipa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix index 99d8527fc1d8..e94f6370da98 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/os-specific/linux/freeipa/default.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation rec { pname = "freeipa"; - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz"; - sha256 = "sha256-l/e2Dq/ako41QWEZyJCD+PA44PzTnzC8B7jYAm/Tt6Q="; + sha256 = "sha256-Ubq2xAqBvjUwrzD2R6tB0i1WsdA0Y0jnJLgi4p4r8D4="; }; nativeBuildInputs = [ From 2c3349ccfa078c6653d9b899da5584b85e66a361 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Thu, 11 Jan 2024 14:32:03 +0000 Subject: [PATCH 09/73] mountpoint-s3: init at 1.3.2 --- pkgs/by-name/mo/mountpoint-s3/package.nix | 59 +++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/mo/mountpoint-s3/package.nix diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix new file mode 100644 index 000000000000..7f00cfd16a8b --- /dev/null +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -0,0 +1,59 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, cmake +, fuse3 +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "mountpoint-s3"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "mountpoint-s3"; + rev = "v${version}"; + hash = "sha256-RMLlHopd+PZLvDtI5uqWlvtS2rahp0HnC/PZ3HVdzIo="; + fetchSubmodules = true; + }; + + cargoHash = "sha256-kvl89btgxa3tFbiiPlCyvXodruHRr7KC0lR2GG5UIKw="; + + # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: + # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 + auditable = false; + + nativeBuildInputs = [ cmake pkg-config rustPlatform.bindgenHook ]; + buildInputs = [ fuse3 ]; + + checkFlags = [ + #thread 's3_crt_client::tests::test_expected_bucket_owner' panicked at mountpoint-s3-client/src/s3_crt_client.rs:1123:47: + #Create test client: ProviderFailure(Error(1173, "aws-c-io: AWS_IO_TLS_ERROR_DEFAULT_TRUST_STORE_NOT_FOUND, Default TLS trust store not found on this system. Trusted CA certificates must be installed, or \"override default trust store\" must be used while creating the TLS context.")) + # + "--skip=s3_crt_client::tests::test_expected_bucket_owner" + "--skip=s3_crt_client::tests::test_user_agent_with_prefix" + "--skip=s3_crt_client::tests::test_user_agent_without_prefix" + "--skip=tests::smoke" + # fuse module not available on build machine ? + # + # fuse: device not found, try 'modprobe fuse' first + # thread 'unmount_no_send' panicked at vendor/fuser/tests/integration_tests.rs:16:79: + # called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" } + "--skip=unmount_no_send" + # sandbox issue ? + # + # thread 'mnt::test::mount_unmount' panicked at vendor/fuser/src/mnt/mod.rs:165:57: + # called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" } + "--skip=mnt::test::mount_unmount" + "--skip=test_get_identity_document" + ]; + + meta = with lib; { + homepage = "https://github.com/awslabs/mountpoint-s3"; + description = "A simple, high-throughput file client for mounting an Amazon S3 bucket as a local file system."; + license = licenses.amazonsl; + maintainers = with maintainers; [ lblasc ]; + platforms = platforms.linux; + }; +} From 999e5c920d8c8ff4b286e600a228ff7e5dfc78df Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 12 Jan 2024 18:15:38 +0100 Subject: [PATCH 10/73] rmfakecloud: remove unused input --- pkgs/servers/rmfakecloud/webui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/servers/rmfakecloud/webui.nix index 2555bf50801c..9c2534c4c8a0 100644 --- a/pkgs/servers/rmfakecloud/webui.nix +++ b/pkgs/servers/rmfakecloud/webui.nix @@ -1,4 +1,4 @@ -{ version, src, stdenv, lib, fetchFromGitHub, fetchYarnDeps, prefetch-yarn-deps, yarn, nodejs }: +{ version, src, stdenv, lib, fetchYarnDeps, prefetch-yarn-deps, yarn, nodejs }: stdenv.mkDerivation rec { inherit version src; From 131945d1954c034e8e0457a62a068a15e9423738 Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 12 Jan 2024 18:16:02 +0100 Subject: [PATCH 11/73] rmfakecloud: 0.0.13.2 -> 0.0.17 --- pkgs/servers/rmfakecloud/default.nix | 6 +++--- pkgs/servers/rmfakecloud/webui.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/servers/rmfakecloud/default.nix index 46a6e4723a59..d2872e7e3732 100644 --- a/pkgs/servers/rmfakecloud/default.nix +++ b/pkgs/servers/rmfakecloud/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.13.2"; + version = "0.0.17"; src = fetchFromGitHub { owner = "ddvk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7lVNbqQv6MNIhHMFbH8VFVIjKiuTCbeVkAKeGprzrkw="; + sha256 = "sha256-Rb81CbtC1V8AugTNIGx07CvK20sZ5d4hfc4OxF259IQ="; }; - vendorHash = "sha256-Pz/TtGjwGHaDSueBEHMtHjyAxYO5V+8jzXCowHcUW/4="; + vendorHash = "sha256-Rr2EVrQOdlOqSlTpXFMfnKNmdw6UiT7LZH0xBUwqkJc="; ui = callPackage ./webui.nix { inherit version src; }; diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/servers/rmfakecloud/webui.nix index 9c2534c4c8a0..407afdb85ddd 100644 --- a/pkgs/servers/rmfakecloud/webui.nix +++ b/pkgs/servers/rmfakecloud/webui.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - sha256 = "sha256-37P+acjaeG7TCyLoIHIHsB+DCUOsQOJ1H9T5SgajtLc="; + sha256 = "sha256-4boZCEly4HovK9BXlSoFd3wZoPaGnzbJg5AygSC/Lrg="; }; nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ]; From c0c2562b2e2d6a545d00956c7fb440c5b3b0e642 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 03:41:43 +0000 Subject: [PATCH 12/73] python311Packages.django-ninja: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/django-ninja/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index 2aa349e71bc7..a39fc1742903 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vitalik"; repo = "django-ninja"; - rev = "v${version}"; - hash = "sha256-hF6Z8i8M4mQtVPIupTSEIkJh0i/oMFFuE9PpODxq4fw="; + rev = "refs/tags/v${version}"; + hash = "sha256-pvpYDuUZi0Gr5RbBWc91LzgmRLhihrhsKaD/AWN5+Bo="; }; propagatedBuildInputs = [ django pydantic ]; From 3c8c55fb83298d317ab782b2f972d3bbd5c32cba Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sun, 14 Jan 2024 16:29:58 +0530 Subject: [PATCH 13/73] diffsitter: 0.8.1 -> 0.8.2 Diff: https://github.com/afnanenayet/diffsitter/compare/v0.8.1...v0.8.2 Signed-off-by: Muhammad Falak R Wani --- pkgs/tools/text/diffsitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/diffsitter/default.nix b/pkgs/tools/text/diffsitter/default.nix index e46286bc0e81..e3c14df85407 100644 --- a/pkgs/tools/text/diffsitter/default.nix +++ b/pkgs/tools/text/diffsitter/default.nix @@ -32,17 +32,17 @@ let in rustPlatform.buildRustPackage rec { pname = "diffsitter"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "afnanenayet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8nKZ8zcZSSF7Qd36kA9IQjio+TIhlQWRgMqKrsdInj4="; + hash = "sha256-rB580TlM0/HXYgPvWtm7KMtXrw6i996HyvCrNr3QmNA="; fetchSubmodules = false; }; - cargoHash = "sha256-LEBAMb9tROpjrWEfucw+2ZaytnoyJE477IH3MyeUGEA="; + cargoHash = "sha256-8ajCXoB+mVhHrstVG+QkWYfXJqDk4+XPcO6yjR4TqpQ="; buildNoDefaultFeatures = true; buildFeatures = [ From a4c451fd3757a0920bc8d4f41b8979609c2ff2a8 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 4 Dec 2023 17:11:51 +0100 Subject: [PATCH 14/73] nixos/kubo: cleanup - Add note explaining why enabling the Kubo daemon won't fully work immediately and requires logging in again - Use `builtins.isList addrIn` instead of `builtins.typeOf addrIn == "list"` - Fix indentation --- .../modules/services/network-filesystems/kubo.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 126e0902d5b4..10162c1633e7 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -52,7 +52,7 @@ let multiaddrsToListenStreams = addrIn: let - addrs = if builtins.typeOf addrIn == "list" + addrs = if builtins.isList addrIn then addrIn else [ addrIn ]; unfilteredResult = map multiaddrToListenStream addrs; in @@ -60,7 +60,7 @@ let multiaddrsToListenDatagrams = addrIn: let - addrs = if builtins.typeOf addrIn == "list" + addrs = if builtins.isList addrIn then addrIn else [ addrIn ]; unfilteredResult = map multiaddrToListenDatagram addrs; in @@ -99,7 +99,12 @@ in services.kubo = { - enable = mkEnableOption (lib.mdDoc "Interplanetary File System (WARNING: may cause severe network degradation)"); + enable = mkEnableOption (lib.mdDoc '' + the Interplanetary File System (WARNING: may cause severe network degradation). + NOTE: after enabling this option and rebuilding your system, you need to log out + and back in for the `IPFS_PATH` environment variable to be present in your shell. + Until you do that, the CLI tools won't be able to talk to the daemon by default + ''); package = mkPackageOption pkgs "kubo" { }; @@ -274,8 +279,8 @@ in { assertion = !((lib.versionAtLeast cfg.package.version "0.21") && (builtins.hasAttr "Experimental" cfg.settings) && (builtins.hasAttr "AcceleratedDHTClient" cfg.settings.Experimental)); message = '' - The `services.kubo.settings.Experimental.AcceleratedDHTClient` option was renamed to `services.kubo.settings.Routing.AcceleratedDHTClient` in Kubo 0.21. - ''; + The `services.kubo.settings.Experimental.AcceleratedDHTClient` option was renamed to `services.kubo.settings.Routing.AcceleratedDHTClient` in Kubo 0.21. + ''; } ]; From 64c9e8551c7c8764772d0d9015ea03a2573d2953 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 11:25:38 +0000 Subject: [PATCH 15/73] python311Packages.gocardless-pro: 1.49.0 -> 1.50.0 --- pkgs/development/python-modules/gocardless-pro/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gocardless-pro/default.nix b/pkgs/development/python-modules/gocardless-pro/default.nix index 04f97a879f8a..7d2ec762f813 100644 --- a/pkgs/development/python-modules/gocardless-pro/default.nix +++ b/pkgs/development/python-modules/gocardless-pro/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gocardless-pro"; - version = "1.49.0"; + version = "1.50.0"; format = "setuptools"; src = fetchFromGitHub { owner = "gocardless"; repo = "gocardless-pro-python"; - rev = "refs/tags/${version}"; - hash = "sha256-jhZfbJLf/gMXfErVbO2erBxgULmKyp1C0+t0k1d0o54="; + rev = "refs/tags/v${version}"; + hash = "sha256-eYuXHqJyThXKKGubCn8aoBZZ7lyXtpzlomaLNus+oJQ="; }; propagatedBuildInputs = [ From 163bdda8fcca1bd69e47375ae05e5a9a04684bb0 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 14 Jan 2024 10:58:49 +0800 Subject: [PATCH 16/73] pixi: init at 0.11.1 --- pkgs/by-name/pi/pixi/package.nix | 69 ++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 pkgs/by-name/pi/pixi/package.nix diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix new file mode 100644 index 000000000000..c7480786b17c --- /dev/null +++ b/pkgs/by-name/pi/pixi/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, installShellFiles +, darwin +, testers +, pixi +}: + +rustPlatform.buildRustPackage rec { + pname = "pixi"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "prefix-dev"; + repo = "pixi"; + rev = "v${version}"; + hash = "sha256-NOa8OvZs+BoJQ9qIU1lpMmEOecZpmwwCNYpDk1LUSTI="; + }; + + cargoHash = "sha256-rDtr9ITYH5o/QPG1Iozh05iTA8c0i+3DnabXLzyqdrg="; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation IOKit SystemConfiguration Security ] + ); + + + checkFlags = [ + # Skip tests requiring network + "--skip=add_channel" + "--skip=add_functionality" + "--skip=add_functionality_os" + "--skip=add_functionality_union" + "--skip=add_pypi_functionality" + "--skip=test_alias" + "--skip=test_cwd" + "--skip=test_incremental_lock_file" + ]; + + postInstall = '' + installShellCompletion --cmd pix \ + --bash <($out/bin/pixi completion --shell bash) \ + --fish <($out/bin/pixi completion --shell fish) \ + --zsh <($out/bin/pixi completion --shell zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = pixi; + }; + + meta = with lib; { + description = "Package management made easy"; + homepage = "https://pixi.sh/"; + license = licenses.bsd3; + maintainers = with lib.maintainers; [ aaronjheng ]; + mainProgram = "pixi"; + }; +} From 9db85f27193e0e8db02a880e0cf00f017c5d16ba Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 14 Jan 2024 15:54:44 +0100 Subject: [PATCH 17/73] sfizz: fix compilation with gcc 13 --- pkgs/applications/audio/sfizz/default.nix | 3 +++ pkgs/applications/audio/sfizz/gcc13.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/applications/audio/sfizz/gcc13.patch diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 4f203a77dc86..c6a0ac824566 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; + # Fix missing include + patches = [./gcc13.patch]; + postPatch = '' cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp diff --git a/pkgs/applications/audio/sfizz/gcc13.patch b/pkgs/applications/audio/sfizz/gcc13.patch new file mode 100644 index 000000000000..9db969d25f3a --- /dev/null +++ b/pkgs/applications/audio/sfizz/gcc13.patch @@ -0,0 +1,13 @@ +Submodule plugins/vst/external/VST_SDK/VST3_SDK/public.sdk contains modified content +diff --git a/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h b/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h +index ff910aa..f15ae78 100644 +--- a/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h ++++ b/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h +@@ -37,6 +37,7 @@ + #pragma once + + #include "pluginterfaces/vst/vsttypes.h" ++#include + #include + + //------------------------------------------------------------------------ From 9246733a3a5aefc9aab8aece35910429a320c702 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 14 Jan 2024 07:29:39 +0000 Subject: [PATCH 18/73] guitarix: gcc13 fixes with upstream patch --- pkgs/applications/audio/guitarix/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 3a650646a8ae..84308d59d44c 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -51,6 +51,15 @@ stdenv.mkDerivation rec { sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg="; }; + patches = [ + (fetchpatch { + name = "gcc13-fixes.patch"; + url = "https://github.com/brummer10/guitarix/commit/b52736180b6966f24398f8a5ad179a58173473ec.patch"; + hash = "sha256-+jilgLujy/B6ijUb8NHzt3+4IKCt17X8LmuMLdmsvGw="; + relative = "trunk"; + }) + ]; + # doesnt apply cleanly, so doing with substituteInPlace # https://github.com/brummer10/guitarix/commit/39d7c21c4173eb0f121b1bbff439d9cf43331a00.patch postPatch = '' From 8fb19edbdf8367960e6890ecb7880427c4ab62c7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 14 Jan 2024 18:17:19 +0100 Subject: [PATCH 19/73] sidequest: set dontUnpack --- pkgs/applications/misc/sidequest/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index b5898c48cd90..226bb571b2ce 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -45,6 +45,7 @@ url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; sha256 = "8ac3d97400a8e3ce86902b5bea7b8d042a092acd888d20e5139490a38507f995"; }; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; From cf1dfaa32a0201cc14801ebb93b5ef865d42522a Mon Sep 17 00:00:00 2001 From: Toast <39011842+toast003@users.noreply.github.com> Date: Sat, 13 Jan 2024 18:41:51 +0100 Subject: [PATCH 20/73] catppuccin: add starship theme --- pkgs/data/themes/catppuccin/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/catppuccin/default.nix b/pkgs/data/themes/catppuccin/default.nix index c9a51ba241d4..25794c9e67d7 100644 --- a/pkgs/data/themes/catppuccin/default.nix +++ b/pkgs/data/themes/catppuccin/default.nix @@ -1,5 +1,5 @@ let - validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "qt5ct" "refind" "rofi" "waybar" ]; + validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "qt5ct" "refind" "rofi" "starship" "waybar" ]; in { fetchFromGitHub , lib @@ -112,6 +112,14 @@ let hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; }; + starship = fetchFromGitHub { + name = "starship"; + owner = "catppuccin"; + repo = "starship"; + rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; + hash = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; + }; + waybar = fetchFromGitHub { name = "waybar"; owner = "catppuccin"; @@ -195,6 +203,10 @@ stdenvNoCC.mkDerivation { cp ${sources.refind}/${variant}.conf $out/refind/ cp -r ${sources.refind}/assets/${variant} $out/refind/assets/ + '' + lib.optionalString (lib.elem "starship" themeList) '' + mkdir -p $out/starship + cp ${sources.starship}/palettes/${variant}.toml $out/starship/ + '' + lib.optionalString (lib.elem "waybar" themeList) '' mkdir -p $out/waybar cp ${sources.waybar}/${variant}.css $out/waybar/ From 21a031c3d9a3efd4fda4775271cd2a48868c6242 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 14 Jan 2024 15:35:07 -0500 Subject: [PATCH 21/73] k0sctl: 0.17.3 -> 0.17.4 Diff: https://github.com/k0sproject/k0sctl/compare/v0.17.3...v0.17.4 --- pkgs/applications/networking/cluster/k0sctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 90c69e8c3340..53b2a0fe71dc 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -6,13 +6,13 @@ buildGo121Module rec { pname = "k0sctl"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - hash = "sha256-KdD4Wy6PQJQWHnFntYAm/gstWv82AgKK4XvQVM1fnL4="; + hash = "sha256-E9EIyBDYsLqfKsb25o1SEh0lUAT/xEtcHHlkunS5Meg="; }; vendorHash = "sha256-0P1v7mZ+k7Th8/cwxRNlhDodzyagv0V9ZBXy1BUGk+k="; From 9ecb8b53f9bccd67c75d4bd36df64fc07c1ad66e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 22:09:04 +0000 Subject: [PATCH 22/73] brook: 20230606 -> 20240214 --- pkgs/tools/networking/brook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index ed01beeb7838..bdc16874779b 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20230606"; + version = "20240214"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F4muuU696YbKcPkpD1LAeyD8ghQAe65UdqV5wS1fATI="; + sha256 = "sha256-5+AqlmDa11PrB24XkelOFHK4sBi4j78WMLQrzDuP1/M="; }; - vendorHash = "sha256-uKlO1x5sGM8B1htmvRt9kND7tuH36iLN/Mev77vwZ6M="; + vendorHash = "sha256-cTw9k4AqS4NOJ0vX0InR0xxOfCXIgA3FxgL6oXryOnA="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; From 1747491cc2e273f99fc9363c1683983ddc4562da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jan 2024 05:19:05 +0000 Subject: [PATCH 23/73] libjpeg_original: 9e -> 9f --- pkgs/development/libraries/libjpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index aaa481e8fd5d..d161ff362bcb 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libjpeg"; - version = "9e"; + version = "9f"; src = fetchurl { url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-QHfWpqda6wGIT3CJGdJZNMkzBeSffj8225EpMg5vTz0="; + sha256 = "sha256-BHBcEQyyRpyqeftx+6PXv4NJFHBulkGkWJSFwfgyVls="; }; configureFlags = lib.optional static "--enable-static --disable-shared"; From 173b9d562f30d6a105e5691048c3b08c101c1fdd Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 14 Jan 2024 21:47:57 -0800 Subject: [PATCH 24/73] erofs: allow adding LZMA support LZMA support for EROFS is considered experimental in the current release and defaults to disabled, so `lzmaSupport` defaults to false. --- pkgs/tools/filesystems/erofs-utils/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index b57dcc4b3629..5346403fa0e0 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib, libselinux +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, xz, zlib, libselinux , fuseSupport ? stdenv.isLinux , selinuxSupport ? false +, lzmaSupport ? false }: stdenv.mkDerivation rec { @@ -17,12 +18,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ util-linux lz4 zlib ] ++ lib.optionals fuseSupport [ fuse ] - ++ lib.optionals selinuxSupport [ libselinux ]; + ++ lib.optionals selinuxSupport [ libselinux ] + ++ lib.optionals lzmaSupport [ xz ]; configureFlags = [ "MAX_BLOCK_SIZE=4096" ] ++ lib.optional fuseSupport "--enable-fuse" - ++ lib.optional selinuxSupport "--with-selinux"; + ++ lib.optional selinuxSupport "--with-selinux" + ++ lib.optional lzmaSupport "--enable-lzma"; meta = with lib; { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; From 912bd1b2145d4f339e57959e2f3bad5e9275b3e8 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Mon, 15 Jan 2024 12:02:20 +0000 Subject: [PATCH 25/73] apx: 2.2.0 -> 2.3.0 --- pkgs/tools/package-management/apx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index 3ef16403f474..d24a5bc07106 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "apx"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = "apx"; rev = "v${version}"; - hash = "sha256-za3QS0ZJuxSCt5xbYa/Kt4ARsDhUn34vJTy0fJoqr9U="; + hash = "sha256-/RGL2mCfJiJInnt5zgc1xXPqZxXCAcoWIbky99okvL0="; }; vendorHash = null; From 66580553974cab56f3959fbb75f900f4c7624c3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Jan 2024 13:03:40 +0100 Subject: [PATCH 26/73] python311Packages.pydicom: 2.4.3 -> 2.4.4 Diff: https://github.com/pydicom/pydicom/compare/refs/tags/v2.4.3...v2.4.4 --- pkgs/development/python-modules/pydicom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index ddb4482ef3e7..30b4bd4fa30e 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -11,13 +11,13 @@ let pname = "pydicom"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "pydicom"; repo = "pydicom"; rev = "refs/tags/v${version}"; - hash = "sha256-PF4iA/FPxPYD8OfgWqKRndwi2vURuzh6tlEwduxs/3E="; + hash = "sha256-iJE1horEmdL7bKPn+NlZLgmtCbLZCZWQ8NjDBQPzXk8="; }; # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded From 59738de84bdaa0b3c9975475bd85d30d7f42d542 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Jan 2024 13:10:43 +0100 Subject: [PATCH 27/73] python311Packages.pydicom: refactor --- .../development/python-modules/pydicom/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 30b4bd4fa30e..48824469b230 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -2,10 +2,11 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, pythonOlder -, pytestCheckHook +, flit-core , numpy , pillow +, pytestCheckHook +, pythonOlder , setuptools }: @@ -32,15 +33,19 @@ let in buildPythonPackage { inherit pname version src; - disabled = pythonOlder "3.6"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.10"; patches = [ # backport of https://github.com/pydicom/pydicom/commit/2513a20cc41743a42bdb86f4cbb4873899b7823c ./pillow-10.1.0-compat.patch ]; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ numpy pillow @@ -78,6 +83,7 @@ buildPythonPackage { meta = with lib; { description = "Python package for working with DICOM files"; homepage = "https://pydicom.github.io"; + changelog = "https://github.com/pydicom/pydicom/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; From f4acda87596b253986a22457c4ea08605dbd85fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jan 2024 12:38:02 +0000 Subject: [PATCH 28/73] python311Packages.rethinkdb: 2.4.10 -> 2.4.10.post1 --- pkgs/development/python-modules/rethinkdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index f419a3afbaa3..35db8bd3dd3d 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "rethinkdb"; - version = "2.4.10"; + version = "2.4.10.post1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Vez3RH3BH+wOLOmqxLpMC1f9xcnFfXfuZz1Z0kXHRmY="; + hash = "sha256-NjTgPuE91jf9cZa4BHS/RMZNProd0GnqkrlJJnAqYL0="; }; nativeBuildInputs = [ From 8427d946accc0389f20799153693b0ecfdd3e2b3 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 15 Jan 2024 09:27:34 -0500 Subject: [PATCH 29/73] btop: 1.2.13 -> 1.3.0 Diff: https://github.com/aristocratos/btop/compare/v1.2.13...v1.3.0 Changelog: https://github.com/aristocratos/btop/blob/v1.3.0/CHANGELOG.md --- pkgs/tools/system/btop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 6a51b29d1d1c..47d0808c4903 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, cmake , darwin , removeReferencesTo , btop @@ -9,23 +10,22 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.2.13"; + version = "1.3.0"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - hash = "sha256-F/muCjhcnM+VqAn6FlD4lv23OLITrmtnHkFc5zv97yk="; + hash = "sha256-QQM2/LO/EHovhj+S+4x3ro/aOVrtuxteVVvYAd6feTk="; }; + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.frameworks.IOKit ]; - env.ADDFLAGS = lib.optionalString stdenv.isDarwin - "-F${darwin.apple_sdk_11_0.frameworks.IOKit}/Library/Frameworks/"; - installFlags = [ "PREFIX=$(out)" ]; postInstall = '' From 8249c1fa880b62d025577521ff9751381aea41b8 Mon Sep 17 00:00:00 2001 From: toastal Date: Mon, 15 Jan 2024 22:24:12 +0700 Subject: [PATCH 30/73] =?UTF-8?q?lightningcss:=201.22.0=20=E2=86=92=201.23?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/lightningcss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index 47a4b1e94b8d..7edc7e3695aa 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - sha256 = "K7whGWIukMrCqGaunHVuvr9k1EOTPSMb0x/A2JysVI0="; + hash = "sha256-vMxf5WQtoj7FycU1zHn5t/bJtwh6t4wqyKfoetzojzU="; }; - cargoHash = "sha256-itwU6JIxDbem93KIpjWyKBiZhQP62D9h8ohIcMD14+0="; + cargoHash = "sha256-g7/1s3FvuwsJvypeHOqJA/lVBkQcLATWtlygI8IW+QA="; buildFeatures = [ "cli" From 74657ab9c4df19c0fa514b45c1d4d2f538a8575d Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Mon, 15 Jan 2024 11:17:21 -0500 Subject: [PATCH 31/73] joplin-desktop: 2.13.13 -> 2.13.15 --- pkgs/applications/misc/joplin-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 79a97f050149..47c9856260cf 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.13.13"; + version = "2.13.15"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "sha256-Cc9NhYrYimj1NjbwnEueQzqC6yCAZi0YUtmJRorarCk="; - x86_64-darwin = "sha256-tUdTcr5CkGqEdTuGwZvBmwMW3oCCXwdWnaXjjATHjQg="; - aarch64-darwin = "sha256-Xh54WrLbHcbGMkz9ZN07ZuSwelHdj97sH1eQb0cgAQg="; + x86_64-linux = "sha256-5tLONAChZaiJqvK/lg1NGTH3LYBlezIAmtQvng0nNNc="; + x86_64-darwin = "sha256-MFBOYA6weAwGLp/ezfU58RvSlGFFlkg0Flcx64q7Wo8="; + aarch64-darwin = "sha256-6CKXa/td567NtzTV7laU7l9xw8WOB9RZR6I1vXeLuyo="; }.${system} or throwSystem; }; From 08e935ce50e6e8ffa66994862e7e86e01086741d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jan 2024 16:17:51 +0000 Subject: [PATCH 32/73] python311Packages.tableauserverclient: 0.28 -> 0.29 --- .../python-modules/tableauserverclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index 6bcdde6c7390..76a028fe2fc0 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.28"; + version = "0.29"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jSblDVkuuBBZ7GmPKUYji8wtRoPS7g8r6Ye9EpnjvKA="; + hash = "sha256-FVJeKt1+qL4XuxFNqhWRtCJu5yEmcP/RLeQQyXndU0c="; }; propagatedBuildInputs = [ From df47db9a279172f726cf756cea18b7d6746ecf9e Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 14 Jan 2024 20:07:52 +0100 Subject: [PATCH 33/73] sqlite3-to-mysql: 2.1.6 -> 2.1.7 Signed-off-by: Florian Brandes Co-authored-by: Nick Cao --- pkgs/tools/misc/sqlite3-to-mysql/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index 08da05b8205b..a4947eb6c8bd 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.1.6"; + version = "2.1.7"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.8"; @@ -18,11 +18,12 @@ python3Packages.buildPythonApplication rec { owner = "techouse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RIe4If7R8snbNN2yIPxAh39EQplVyhMF2c0G06Zipds="; + hash = "sha256-TglHny0HgVth3o73GQYddh9sdyQ0L+4J4dJBAeJToiM="; }; nativeBuildInputs = with python3Packages; [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3Packages; [ @@ -41,6 +42,10 @@ python3Packages.buildPythonApplication rec { mysql80 ]; + pythonRelaxDeps = [ + "mysql-connector-python" + ]; + # tests require a mysql server instance doCheck = false; From c5c4b0c5e8899cc42086d674426bc7f8f223d5d3 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 15 Jan 2024 17:34:04 +0100 Subject: [PATCH 34/73] libphonenumber: make pname consistent ... with attr and project name. Also mentioned in https://github.com/NixOS/nixpkgs/issues/276443 --- pkgs/development/libraries/libphonenumber/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index a9b0df3304be..373ceaf04354 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu, Foundation, buildPackages }: stdenv.mkDerivation rec { - pname = "phonenumber"; + pname = "libphonenumber"; version = "8.12.37"; src = fetchFromGitHub { From 29b2ca9d21fa4ddce36e761ae4ceff98b1c179e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jan 2024 17:38:29 +0100 Subject: [PATCH 35/73] python312Packages.pbr: mark as broken --- pkgs/development/python-modules/pbr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index dbf6afe6f330..fed9e7cd81fe 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , setuptools , callPackage }: @@ -32,6 +33,7 @@ buildPythonPackage rec { description = "Python Build Reasonableness"; homepage = "https://github.com/openstack/pbr"; license = licenses.asl20; + broken = pythonAtLeast "3.12"; # uses removed distutils maintainers = teams.openstack.members; }; } From 493c9df3f0e252b9954e884b591a658891592c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jan 2024 17:40:13 +0100 Subject: [PATCH 36/73] python311Packages.dulwich: use xdist to speedup tests, update homepage The test run time went for me from 66 sec to 8.8 sec which is fantastic! --- pkgs/development/python-modules/dulwich/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 3dfb70f88832..fc9245f33777 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -11,6 +11,7 @@ , gnupg , gpgme , paramiko +, pytest-xdist , pytestCheckHook , pythonOlder , urllib3 @@ -53,6 +54,7 @@ buildPythonPackage rec { geventhttpclient git glibcLocales + pytest-xdist pytestCheckHook ] ++ passthru.optional-dependencies.fastimport ++ passthru.optional-dependencies.pgp @@ -85,7 +87,7 @@ buildPythonPackage rec { does not depend on Git itself. All functionality is available in pure Python. ''; homepage = "https://www.dulwich.io/"; - changelog = "https://github.com/dulwich/dulwich/blob/dulwich-${version}/NEWS"; + changelog = "https://github.com/jelmer/dulwich/blob/dulwich-${version}/NEWS"; license = with licenses; [ asl20 gpl2Plus ]; maintainers = with maintainers; [ koral ]; }; From 211eb220046db6d748dddfcc3596e62a129b9319 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jan 2024 17:58:43 +0000 Subject: [PATCH 37/73] python311Packages.types-dateutil: 2.8.19.9 -> 2.8.19.20240106 --- pkgs/development/python-modules/types-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 92dfde3b5e6f..a0e4c6e9121d 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.8.19.9"; + version = "2.8.19.20240106"; format = "setuptools"; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-Y3cW+zr73H62g/ZBFx+HSTevExSc1Faoxj6PgRJ6Oe0="; + hash = "sha256-H42yIcO5jmygLqg6WDcbIsN09Crlu98YbbnJp2WBRZ8="; }; pythonImportsCheck = [ From d1ec935f4a98bd687132032fe934f387bac5d16b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jan 2024 18:04:37 +0000 Subject: [PATCH 38/73] python311Packages.types-psycopg2: 2.9.21.20 -> 2.9.21.20240106 --- pkgs/development/python-modules/types-psycopg2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index 4050efead48d..ba256ebc78de 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20"; + version = "2.9.21.20240106"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-c7rqaJV1v1uxuRW3g/sFJARMYkKSiu7xrlqeMvB4DT0="; + hash = "sha256-DQo1BElxS6KESMTxCgo67Dbp4+/RRQcw4ifhe3BKS+o="; }; nativeBuildInputs = [ From 953d78a4f4a2f4723163536afb0d4a2d6f5cb612 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 15 Jan 2024 11:11:55 -0800 Subject: [PATCH 39/73] signalbackup-tools: 20240106-2 -> 20240115-3 Diff: https://github.com/bepaald/signalbackup-tools/compare/20240106-2...20240115-3 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 18f389621e07..b6754b499d3a 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240106-2"; + version = "20240115-3"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-It6ie7KC0eGecwEbPXTRfRngY7ecQV/VmIqvnwrVuhI="; + hash = "sha256-Ba+9irsOnGcAUJtCwbdes9DYS704dNuKAqNvJGXQKMM="; }; postPatch = '' From 50e881c500b597fdce5e84ba9ec6fbb6bd329e41 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 15 Jan 2024 14:16:07 -0500 Subject: [PATCH 40/73] senpai: 0.2.0 -> 0.3.0 Changelog: https://git.sr.ht/~delthas/senpai/refs/v0.3.0 --- .../irc/senpai/bump-go-version.patch | 84 +++++++++++++++++++ .../networking/irc/senpai/default.nix | 14 +++- 2 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/irc/senpai/bump-go-version.patch diff --git a/pkgs/applications/networking/irc/senpai/bump-go-version.patch b/pkgs/applications/networking/irc/senpai/bump-go-version.patch new file mode 100644 index 000000000000..757368942499 --- /dev/null +++ b/pkgs/applications/networking/irc/senpai/bump-go-version.patch @@ -0,0 +1,84 @@ +diff --git a/go.mod b/go.mod +index 8841027..fda8eb7 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module git.sr.ht/~delthas/senpai + +-go 1.16 ++go 1.18 + + require ( + git.sr.ht/~emersion/go-scfg v0.0.0-20231004133111-9dce55c8d63b +@@ -13,4 +13,14 @@ require ( + mvdan.cc/xurls/v2 v2.5.0 + ) + ++require ( ++ github.com/gdamore/encoding v1.0.0 // indirect ++ github.com/godbus/dbus/v5 v5.1.0 // indirect ++ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect ++ github.com/rivo/uniseg v0.4.3 // indirect ++ golang.org/x/sys v0.14.0 // indirect ++ golang.org/x/term v0.14.0 // indirect ++ golang.org/x/text v0.14.0 // indirect ++) ++ + replace github.com/gdamore/tcell/v2 => github.com/delthas/tcell/v2 v2.4.1-0.20230710100648-1489e78d90fb +diff --git a/go.sum b/go.sum +index 89c5397..f4d3eaa 100644 +--- a/go.sum ++++ b/go.sum +@@ -20,44 +20,34 @@ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh + github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= + github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= + github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= + github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= + golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= + golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= + golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= + golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= + golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= + golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= + golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= + golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= + golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= + golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= + golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= + golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= + golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= +@@ -65,7 +55,6 @@ golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= + golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= + golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + mvdan.cc/xurls/v2 v2.5.0 h1:lyBNOm8Wo71UknhUs4QTFUNNMyxy2JEIaKKo0RWOh+8= + mvdan.cc/xurls/v2 v2.5.0/go.mod h1:yQgaGQ1rFtJUzkmKiHYSSfuQxqfYmd//X6PxvholpeE= diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index eaefa41a6650..fbf5dcb844d4 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,16 +2,21 @@ buildGoModule rec { pname = "senpai"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromSourcehut { - owner = "~taiite"; + owner = "~delthas"; repo = "senpai"; rev = "v${version}"; - sha256 = "sha256-q167og8S8YbLcREZ7DVbJhjMzx4iO0WgIFkOV2IpieM="; + sha256 = "sha256-A5kBrJJi+RcSpB0bi2heKzNl5LjdeT9h2Pc9kKXDg1A="; }; - vendorHash = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; + vendorHash = "sha256-kKYee1QJX7N101MTikHUbX+AqZ2NhM4soE4JAAOdAPI="; + + patches = [ + # fix build failures, submitted upstream https://lists.sr.ht/~delthas/senpai-dev/patches/48581 + ./bump-go-version.patch + ]; subPackages = [ "cmd/senpai" @@ -31,6 +36,7 @@ buildGoModule rec { meta = with lib; { description = "Your everyday IRC student"; homepage = "https://sr.ht/~taiite/senpai/"; + changelog = "https://git.sr.ht/~delthas/senpai/refs/v${version}"; license = licenses.isc; maintainers = with maintainers; [ malte-v ]; }; From 6a0afae6c206ff51e444f9c80ea17cc8a5924fce Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 15 Jan 2024 16:33:58 +0200 Subject: [PATCH 41/73] kanidm: fix build for rust v1.75 --- .../0001-fix-warnings-for-rust-v1.75.patch | 80 +++++++++++++++++++ pkgs/servers/kanidm/Cargo.lock | 56 ++++++------- pkgs/servers/kanidm/default.nix | 13 ++- 3 files changed, 118 insertions(+), 31 deletions(-) create mode 100644 pkgs/servers/kanidm/0001-fix-warnings-for-rust-v1.75.patch diff --git a/pkgs/servers/kanidm/0001-fix-warnings-for-rust-v1.75.patch b/pkgs/servers/kanidm/0001-fix-warnings-for-rust-v1.75.patch new file mode 100644 index 000000000000..a258484e714a --- /dev/null +++ b/pkgs/servers/kanidm/0001-fix-warnings-for-rust-v1.75.patch @@ -0,0 +1,80 @@ +From de330efaf02ed66d6641ab3bb55eed4bcfad430b Mon Sep 17 00:00:00 2001 +From: Ilan Joselevich +Date: Sun, 14 Jan 2024 23:53:12 +0200 +Subject: [PATCH] fix warnings for rust v1.75 + +--- + server/lib/src/idm/authsession.rs | 4 ++-- + server/testkit/tests/integration.rs | 5 ++--- + server/web_ui/login_flows/src/oauth2.rs | 3 +-- + unix_integration/nss_kanidm/src/lib.rs | 3 +-- + 4 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/server/lib/src/idm/authsession.rs b/server/lib/src/idm/authsession.rs +index 734864f0d..c65b88494 100644 +--- a/server/lib/src/idm/authsession.rs ++++ b/server/lib/src/idm/authsession.rs +@@ -3,7 +3,7 @@ + //! factor to assert that the user is legitimate. This also contains some + //! support code for asynchronous task execution. + use std::collections::BTreeMap; +-pub use std::collections::BTreeSet as Set; ++ + use std::convert::TryFrom; + use std::fmt; + use std::time::Duration; +@@ -1237,7 +1237,7 @@ impl AuthSession { + + #[cfg(test)] + mod tests { +- pub use std::collections::BTreeSet as Set; ++ + use std::str::FromStr; + use std::time::Duration; + +diff --git a/server/testkit/tests/integration.rs b/server/testkit/tests/integration.rs +index e6879b44b..472022892 100644 +--- a/server/testkit/tests/integration.rs ++++ b/server/testkit/tests/integration.rs +@@ -2,12 +2,11 @@ + + use std::process::Output; + +-use tempfile::tempdir; ++ + + use kanidm_client::KanidmClient; + use kanidmd_testkit::{ +- login_put_admin_idm_admins, ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_USER, +- NOT_ADMIN_TEST_USERNAME, ++ login_put_admin_idm_admins, ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_PASSWORD, + }; + use testkit_macros::cli_kanidm; + +diff --git a/server/web_ui/login_flows/src/oauth2.rs b/server/web_ui/login_flows/src/oauth2.rs +index a41e3083f..d735a7b4d 100644 +--- a/server/web_ui/login_flows/src/oauth2.rs ++++ b/server/web_ui/login_flows/src/oauth2.rs +@@ -2,8 +2,7 @@ use gloo::console; + use kanidm_proto::constants::uri::{OAUTH2_AUTHORISE, OAUTH2_AUTHORISE_PERMIT}; + use kanidm_proto::constants::{APPLICATION_JSON, KOPID}; + pub use kanidm_proto::oauth2::{ +- AccessTokenRequest, AccessTokenResponse, AuthorisationRequest, AuthorisationResponse, +- CodeChallengeMethod, ErrorResponse, ++ AuthorisationRequest, AuthorisationResponse, + }; + use kanidmd_web_ui_shared::constants::{CONTENT_TYPE, CSS_ALERT_DANGER, URL_OAUTH2}; + use kanidmd_web_ui_shared::utils::{do_alert_error, do_footer, window}; +diff --git a/unix_integration/nss_kanidm/src/lib.rs b/unix_integration/nss_kanidm/src/lib.rs +index ef13192b9..27e3321a8 100644 +--- a/unix_integration/nss_kanidm/src/lib.rs ++++ b/unix_integration/nss_kanidm/src/lib.rs +@@ -20,5 +20,4 @@ extern crate lazy_static; + #[cfg(target_family = "unix")] + mod implementation; + +-#[cfg(target_family = "unix")] +-pub use implementation::*; ++ +-- +2.42.0 diff --git a/pkgs/servers/kanidm/Cargo.lock b/pkgs/servers/kanidm/Cargo.lock index b1c30812244d..7f6b69bca0d6 100644 --- a/pkgs/servers/kanidm/Cargo.lock +++ b/pkgs/servers/kanidm/Cargo.lock @@ -452,7 +452,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "base64urlsafedata" version = "0.1.3" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64 0.21.5", "paste 1.0.14", @@ -1106,7 +1106,7 @@ dependencies = [ [[package]] name = "daemon" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "clap", "clap_complete", @@ -2889,7 +2889,7 @@ dependencies = [ [[package]] name = "kanidm-ipa-sync" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base64urlsafedata", "chrono", @@ -2914,7 +2914,7 @@ dependencies = [ [[package]] name = "kanidm-ldap-sync" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base64urlsafedata", "chrono", @@ -2940,7 +2940,7 @@ dependencies = [ [[package]] name = "kanidm_build_profiles" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base64 0.21.5", "gix", @@ -2950,7 +2950,7 @@ dependencies = [ [[package]] name = "kanidm_client" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "hyper", "kanidm_lib_file_permissions", @@ -2988,7 +2988,7 @@ dependencies = [ [[package]] name = "kanidm_lib_file_permissions" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "kanidm_utils_users", "whoami", @@ -2996,7 +2996,7 @@ dependencies = [ [[package]] name = "kanidm_proto" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base32", "base64urlsafedata", @@ -3016,7 +3016,7 @@ dependencies = [ [[package]] name = "kanidm_tools" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "async-recursion", "clap", @@ -3049,7 +3049,7 @@ dependencies = [ [[package]] name = "kanidm_unix_int" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "async-trait", "base64urlsafedata", @@ -3088,14 +3088,14 @@ dependencies = [ [[package]] name = "kanidm_utils_users" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "libc", ] [[package]] name = "kanidmd_core" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "async-trait", "axum", @@ -3148,7 +3148,7 @@ dependencies = [ [[package]] name = "kanidmd_lib" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base64 0.21.5", "base64urlsafedata", @@ -3215,7 +3215,7 @@ dependencies = [ [[package]] name = "kanidmd_testkit" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "assert_cmd", "compact_jwt", @@ -3252,7 +3252,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_admin" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "gloo", "gloo-utils 0.2.0", @@ -3275,7 +3275,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_login_flows" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "gloo", "gloo-utils 0.2.0", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_shared" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "gloo", "js-sys", @@ -3318,7 +3318,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_user" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "gloo", "gloo-timers 0.3.0", @@ -3739,7 +3739,7 @@ dependencies = [ [[package]] name = "nss_kanidm" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "kanidm_unix_int", "lazy_static", @@ -4015,7 +4015,7 @@ dependencies = [ [[package]] name = "orca" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "clap", "crossbeam", @@ -4059,7 +4059,7 @@ dependencies = [ [[package]] name = "pam_kanidm" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "kanidm_unix_int", "libc", @@ -5191,7 +5191,7 @@ dependencies = [ [[package]] name = "sketching" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "num_enum", "tracing", @@ -5273,7 +5273,7 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "sshkey-attest" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64urlsafedata", "nom", @@ -6128,7 +6128,7 @@ dependencies = [ [[package]] name = "webauthn-attestation-ca" version = "0.1.0" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64urlsafedata", "openssl", @@ -6140,7 +6140,7 @@ dependencies = [ [[package]] name = "webauthn-authenticator-rs" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "async-stream", "async-trait", @@ -6172,7 +6172,7 @@ dependencies = [ [[package]] name = "webauthn-rs" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64urlsafedata", "serde", @@ -6185,7 +6185,7 @@ dependencies = [ [[package]] name = "webauthn-rs-core" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64 0.21.5", "base64urlsafedata", @@ -6209,7 +6209,7 @@ dependencies = [ [[package]] name = "webauthn-rs-proto" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64urlsafedata", "js-sys", diff --git a/pkgs/servers/kanidm/default.nix b/pkgs/servers/kanidm/default.nix index 72260dd4155b..d21c64992cf2 100644 --- a/pkgs/servers/kanidm/default.nix +++ b/pkgs/servers/kanidm/default.nix @@ -25,14 +25,21 @@ rustPlatform.buildRustPackage rec { owner = pname; repo = pname; # Latest 1.1.0-rc.15 tip - rev = "a5ca8018e3a636dbb0a79b3fd869db059d92979d"; - hash = "sha256-PFGoeGn7a/lVR6rOmOKA3ydAoo3/+9RlkwBAKS22Psg="; + rev = "4d250f817dbd24d77f72427bb93ef3a367a553c6"; + hash = "sha256-cXPqTIDHMWcsRFi1/u8lIpwk2m6rh4C70IwVky7B2qs="; }; + patches = [ + # TODO: Remove in the next update + # or when https://github.com/kanidm/kanidm/commit/dbf476fe5ea2c120dff9a85e552be9f898c69ce7 is backported + ./0001-fix-warnings-for-rust-v1.75.patch + ]; + + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "base64urlsafedata-0.1.3" = "sha256-D+u4CIhx8BNyx+EH1efS4mrinjeSJopWCteSaMY1kh8="; + "base64urlsafedata-0.1.3" = "sha256-JLUxLQCwZgxCmXt636baZYo8nQW/ZfHZOqnOIrIks2s="; "sshkeys-0.3.2" = "sha256-CNG9HW8kSwezAdIYW+CR5rqFfmuso4R0+m4OpIyXbSM="; }; }; From f354301373bf86e5b1a2eebd89bcb564716c584f Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 15 Jan 2024 15:12:29 -0500 Subject: [PATCH 42/73] cmake-language-server: 0.1.8 -> 0.1.9 https://github.com/regen100/cmake-language-server/releases/tag/v0.1.9 --- .../tools/misc/cmake-language-server/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index 93ad66cd0596..f3ecd30cd4a2 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -1,27 +1,27 @@ { lib , buildPythonApplication +, pythonOlder , fetchFromGitHub +, pdm-backend , cmake-format , pygls , cmake -, pdm-backend , pytest-datadir , pytestCheckHook -, pythonOlder }: buildPythonApplication rec { pname = "cmake-language-server"; - version = "0.1.8"; + version = "0.1.9"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "regen100"; repo = "cmake-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-7AlF+FqhZR+6lLsR1dxAGHd/GU+mB3ojYLDXVm7Il4M="; + hash = "sha256-8ypl0YA6ep8/jBL3tsutSgCW13NZTZzaNafaOamcT08="; }; patches = [ @@ -64,6 +64,7 @@ buildPythonApplication rec { meta = with lib; { description = "CMake LSP Implementation"; homepage = "https://github.com/regen100/cmake-language-server"; + changelog = "https://github.com/regen100/cmake-language-server/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; mainProgram = "cmake-language-server"; From ad4ad8c53beb9e9853dbebb43be7eedf3fd352f9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 16 Jan 2024 00:16:25 +0100 Subject: [PATCH 43/73] python3Packages.gradio-client: allow local networking on darwin --- pkgs/development/python-modules/gradio/client.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index e68f793f7301..1d7223e6a248 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -94,6 +94,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "gradio_client" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://www.gradio.app/"; description = "Lightweight library to use any Gradio app as an API"; From 077b73e316b17b1e9a44f4b8d90282cb7cc65878 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jan 2024 00:23:59 +0000 Subject: [PATCH 44/73] simple-http-server: 0.6.7 -> 0.6.8 --- pkgs/servers/simple-http-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix index 002d456ef026..401592742426 100644 --- a/pkgs/servers/simple-http-server/default.nix +++ b/pkgs/servers/simple-http-server/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xi5tJIfK4zjckKERhxHuDqeyOB9Dxul/eFLKOtpgR/w="; + sha256 = "sha256-QVNHomav8k1HflrOoQ7Ub5ZSCExpikbe0iAaVlAJEEs="; }; - cargoSha256 = "sha256-wv1hlBTQe1Mm67J2FqrrXSSlZkFPB0TzKc5VUMMfUIQ="; + cargoHash = "sha256-uDdzv0uPITE4DySoHPMFkJ0/wrPNZOao43Z7tOhRboI="; nativeBuildInputs = [ pkg-config ]; From 50b6412a3146eabc4cd2a6a12eddbb514d3523f5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 13 Jan 2024 21:45:57 -0500 Subject: [PATCH 45/73] mingetty: fix cross compilation --- pkgs/os-specific/linux/mingetty/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index eb58dc553676..eff1bf50a361 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -9,9 +9,14 @@ stdenv.mkDerivation rec { sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; }; + makeFlags = [ + "CC:=$(CC)" + "SBINDIR=${placeholder "out"}/sbin" + "MANDIR=${placeholder "out"}/share/man/man8" + ]; + preInstall = '' mkdir -p $out/sbin $out/share/man/man8 - makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) ''; meta = with lib; { From 562fb1664c929b9dcf305b40609ba34d7e8c0a6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jan 2024 02:45:25 +0000 Subject: [PATCH 46/73] convimg: 9.2 -> 9.3 --- pkgs/tools/misc/convimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/tools/misc/convimg/default.nix index 93b01723bf62..1e37c2636bbe 100644 --- a/pkgs/tools/misc/convimg/default.nix +++ b/pkgs/tools/misc/convimg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convimg"; - version = "9.2"; + version = "9.3"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "sha256-37nJyaUyC5aQ4h3sH+s8XOzyLh6zfzgIEDp+M6SERSg="; + sha256 = "sha256-xnfMHlbQ7XG/mvnWoGkRHhxIK2u7kWJTVnLxd9c5oNU="; fetchSubmodules = true; }; From c70fd0e43968b0e4f9d524e1377d649a26236682 Mon Sep 17 00:00:00 2001 From: huantian Date: Sun, 14 Jan 2024 22:18:07 -0800 Subject: [PATCH 47/73] r2modman: 3.1.45 -> 3.1.46 --- pkgs/games/r2modman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 8c284bece161..30648d67ae67 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.1.45"; + version = "3.1.46"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-6o6iPDKKqCzt7H0a64HGTvEvwO6hjRh1Drl8o4x+4ew="; + hash = "sha256-Oo23U3hwkhhLRiOIikIZcnoBFmkRWMK8UECyDRohBj0="; }; offlineCache = fetchYarnDeps { From 58358ede0302e6099d2abac9fec4b975620bae3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jan 2024 06:28:26 +0000 Subject: [PATCH 48/73] figma-linux: 0.11.2 -> 0.11.3 --- pkgs/applications/graphics/figma-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix index e76426ab103f..fd136a5b4026 100644 --- a/pkgs/applications/graphics/figma-linux/default.nix +++ b/pkgs/applications/graphics/figma-linux/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation (finalAttrs: { pname = "figma-linux"; - version = "0.11.2"; + version = "0.11.3"; src = fetchurl { url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${finalAttrs.version}/figma-linux_${finalAttrs.version}_linux_amd64.deb"; - hash = "sha256-WKL5RabTUD8xIOUoISyn26NXYrNImKZdjXnTYkXpfkE="; + hash = "sha256-9UfyCqgsg9XAFyZ7V7TogkQou4x+ixFUfjXZ1/qlDmA="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; From 6a7b656fe77f9305ed2a5fb38da08b6a34ed5d09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jan 2024 07:40:51 +0000 Subject: [PATCH 49/73] gptman: 1.0.2 -> 1.1.0 --- pkgs/tools/system/gptman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/tools/system/gptman/default.nix index 3e3fc623a9e7..533210ee4d8f 100644 --- a/pkgs/tools/system/gptman/default.nix +++ b/pkgs/tools/system/gptman/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gptman"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "rust-disk-partition-management"; repo = pname; rev = "v${version}"; - hash = "sha256-Qi2nrvF566AK+JsP7V9tVQXwAU63TNpfTFZLuM/h1Ps="; + hash = "sha256-ebV61EilGggix6JSN/MW4Ka0itkSpvikLDSO005TTYY="; }; - cargoHash = "sha256-YMlwlSq14S37SqewglvxZYUL67fT66hh22t0N8h+2vk="; + cargoHash = "sha256-P+qez0oVsHBiaBYban2o8MRvF8ElLf5zb+p+tYunWWA="; buildInputs = lib.optional stdenv.isDarwin libiconv; From d722b456e808e463d0bfdfe11dd9497511ef23c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 16 Jan 2024 09:31:27 +0100 Subject: [PATCH 50/73] ci: Only check nix files when any nix file changed --- .github/workflows/nix-parse.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse.yml index 8b2ef0b8da49..36560ae22558 100644 --- a/.github/workflows/nix-parse.yml +++ b/.github/workflows/nix-parse.yml @@ -21,10 +21,14 @@ jobs: repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \ | jq '.[] | select(.status != "removed" and (.filename | endswith(".nix"))) | .filename' \ > "$HOME/changed_files" + if [[ -s "$HOME/changed_files" ]]; then + echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV" + fi - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge + if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }} - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24 - name: Parse all changed or added nix files run: | @@ -33,3 +37,4 @@ jobs: out="$(nix-instantiate --parse "$file")" || { echo "$out" && ret=1; } done < "$HOME/changed_files" exit "$ret" + if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }} From c94d287275973297fed829784fad2fc9446e3abf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jan 2024 09:32:17 +0100 Subject: [PATCH 51/73] python311Packages.aioridwell: 2023.12.0 -> 2024.01.0 Diff: https://github.com/bachya/aioridwell/compare/refs/tags/2023.12.0...2024.01.0 Changelog: https://github.com/bachya/aioridwell/releases/tag/2024.01.0 --- pkgs/development/python-modules/aioridwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 63f14b199131..6598b42ed8bf 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2023.12.0"; + version = "2024.01.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Lg5O9xwEEgGFIrQoS4r4EMmYDX3yAkcMwHNMHMhLapI="; + hash = "sha256-B5k8uXDHq0U6fJVW8oy2sWUj5OIVGUfe9EtCjnIr3OE="; }; nativeBuildInputs = [ From f6fdcbb8231ad4faa2bc5eb259b467c466620455 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jan 2024 09:34:03 +0100 Subject: [PATCH 52/73] python311Packages.flipr-api: 1.5.0 -> 1.5.1 Diff: https://github.com/cnico/flipr-api/compare/refs/tags/1.5.0...1.5.1 Changelog: https://github.com/cnico/flipr-api/releases/tag/1.5.1 --- pkgs/development/python-modules/flipr-api/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix index 1f23aaa2481e..43b865b9faa3 100644 --- a/pkgs/development/python-modules/flipr-api/default.nix +++ b/pkgs/development/python-modules/flipr-api/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "flipr-api"; - version = "1.5.0"; - format = "pyproject"; + version = "1.5.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "cnico"; - repo = pname; + repo = "flipr-api"; rev = "refs/tags/${version}"; - hash = "sha256-IAxB3i/HkwO5sjDh2aBCtijOcG0VIbatQjTWIh0inoM="; + hash = "sha256-xgLi2lH+EPPNlMixqOzdBGVLuoJh5dhZ2tHZ0UH+lOk="; }; nativeBuildInputs = [ From dd7072d5d906a77efb34221ea15bfbc79ea82d90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jan 2024 09:36:58 +0100 Subject: [PATCH 53/73] python311Packages.pyfritzhome: 0.6.9 -> 0.6.10 Diff: https://github.com/hthiery/python-fritzhome/compare/refs/tags/0.6.9...0.6.10 Changelog: https://github.com/hthiery/python-fritzhome/releases/tag/0.6.10 --- .../python-modules/pyfritzhome/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 5a158aa3e25e..982e9b1509d6 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -1,15 +1,17 @@ { lib , buildPythonPackage +, cryptography , fetchFromGitHub , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.9"; - format = "setuptools"; + version = "0.6.10"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,10 +19,15 @@ buildPythonPackage rec { owner = "hthiery"; repo = "python-fritzhome"; rev = "refs/tags/${version}"; - hash = "sha256-BhJkUbTAzMkzWINVoBDG2Vnf4Fd+kX1oBkXWD7UNbTw="; + hash = "sha256-jdv49cpd2ewfrhWzjWM5Uxhaj3UZfOXMMOZeobpXe0E="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + cryptography requests ]; @@ -35,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Library to access AVM FRITZ!Box homeautomation"; homepage = "https://github.com/hthiery/python-fritzhome"; + changelog = "https://github.com/hthiery/python-fritzhome/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From de1b7af74c06b902ffc5c3d48c5ed87c054aa6c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jan 2024 08:55:48 +0000 Subject: [PATCH 54/73] httpx: 1.3.7 -> 1.3.8 --- pkgs/tools/security/httpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 294c0e0302f3..b7dd4afd94f3 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-FiCY9dZDZ92c6MayloS97Ff1trc5w4M/AIS6XORZf5U="; + hash = "sha256-mHksSCOy0vF7YRg2Pu6r8VzA8YNP8JXTCd44QoGTyww="; }; - vendorHash = "sha256-++vCyunRkLn9K1u+zXSN4TzIS9J8emc/w85ToqmG7gY="; + vendorHash = "sha256-TctifN2YhW5t+nuFVB1yPgOopLzQfgi5QIJitMlVPJc="; subPackages = [ "cmd/httpx" From e3e766c556b726f807a3355a49af336f65e3389a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 16 Jan 2024 10:14:48 +0100 Subject: [PATCH 55/73] rye: 0.16.0 -> 0.17.0 Diff: https://github.com/mitsuhiko/rye/compare/refs/tags/0.16.0...0.17.0 Changelog: https://github.com/mitsuhiko/rye/releases/tag/0.17.0 --- pkgs/development/tools/rye/Cargo.lock | 2 +- pkgs/development/tools/rye/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index a4a5984a04de..b15cc181f4d5 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -1772,7 +1772,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.16.0" +version = "0.17.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index 5a40f695419a..44100627ca3d 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-AIM61JEgWMDjeZVnOVamBiCXTT5LLEktwQpRtnflgcw="; + hash = "sha256-4vf+jmEu78LYFAcRrGdC02y+NsLM7zoBpHKCeaS60bY="; }; cargoLock = { From f4aea1ca4b709052273ec40fdd4419a2f4c76c3f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 16 Jan 2024 10:26:31 +0100 Subject: [PATCH 56/73] kotlin-language-server: 1.3.7 -> 1.3.9 https://github.com/fwcd/kotlin-language-server/releases/tag/1.3.8 https://github.com/fwcd/kotlin-language-server/releases/tag/1.3.9 --- .../tools/language-servers/kotlin-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix index 8ec9ebb8f30a..af7775f57246 100644 --- a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix +++ b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "kotlin-language-server"; - version = "1.3.7"; + version = "1.3.9"; src = fetchzip { url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; - hash = "sha256-BEQywg3ZU4LtF9trntGbDp64SIWH4y93o/VVMSRP+cc="; + hash = "sha256-4piXggWK/BXDXrgkvJisaO5nOs72cvU1F47rKy4z+rc="; }; dontBuild = true; From 37a32b1e5ac00917d995c4b328b1956cc685480a Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 15 Jan 2024 14:50:05 +0100 Subject: [PATCH 57/73] curaengine: fix build with GCC 13 --- pkgs/applications/misc/curaengine/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 085fcab1475c..2abe82913a4e 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }: +{ lib, stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf, fetchpatch }: stdenv.mkDerivation rec { pname = "curaengine"; @@ -16,6 +16,15 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; + # TODO already fixed in master, remove in next release + patches = [ + (fetchpatch { + url = "https://github.com/Ultimaker/CuraEngine/commit/de60e86a6ea11cb7d121471b5dd192e5deac0f3d.patch"; + hash = "sha256-/gT9yErIDDYAXvZ6vX5TGlwljy31K563+sqkm1UGljQ="; + includes = [ "src/utils/math.h" ]; + }) + ]; + meta = with lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; homepage = "https://github.com/Ultimaker/CuraEngine"; From 0886a2e8a015d97b04b2c49750bdfea2a2c75dcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jan 2024 10:06:36 +0000 Subject: [PATCH 58/73] infracost: 0.10.31 -> 0.10.32 --- pkgs/tools/misc/infracost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index ce555facf410..2ed332b58fbd 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.31"; + version = "0.10.32"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-slZFZu+NEOLy4oxdcZwW2OhabGxE/RPsfEhO0W6+gT0="; + sha256 = "sha256-/GXT8ptoE6AjW0yTyQ8oLFqok59hIu+bOoE8FpdrOrY="; }; - vendorHash = "sha256-o8CMISBU5C/SDexeEiwnxTC9hvbCWUrm6a/2TOE9Bmw="; + vendorHash = "sha256-ji9TpUcq0aUAn5vV5dnaC15i0Uli2Qsz/BrOKB3/Rl4="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; From 9344875c7c187106de4cf6bdac427efb55a03e51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jan 2024 11:15:27 +0000 Subject: [PATCH 59/73] ircdog: 0.5.1 -> 0.5.2 --- pkgs/applications/networking/irc/ircdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix index 02323314db4a..5da057b29154 100644 --- a/pkgs/applications/networking/irc/ircdog/default.nix +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ircdog"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "goshuirc"; repo = "ircdog"; rev = "refs/tags/v${version}"; - hash = "sha256-nXXSHNQp+yFfgY/VPqaMLM6lv4oYE97rdgHYW+0+L9g="; + hash = "sha256-rV9IBa30v1T3Zw/av8nfmX9Bg20FPAGdJkMn17r8rYw="; }; vendorHash = null; From ffe069543444f8b9b409d09b292486cd344a13b0 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 16 Jan 2024 11:46:34 +0000 Subject: [PATCH 60/73] lnd: 0.17.0-beta -> 0.17.3-beta --- pkgs/applications/blockchains/lnd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index e9f739b188ae..9baa951b370f 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.17.0-beta"; + version = "0.17.3-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-HndO7vp/sia352hs23xAgrpyJ/CfbRxYAAhLZ4q94Pc="; + hash = "sha256-JZ+DhFIDMRDDeW6YNeUy/pQt+IbFyZiiqFn4//S2Oao="; }; - vendorHash = "sha256-4n81AZLKCTEV4+p4kRhZbzYsdRGIztzh6EKPin8W1Z0="; + vendorHash = "sha256-lvysD9/26OoPCKBOGu/R95x1UKvhcLtn17bQLPT4ofM="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; From e8500af5c57c4b3c458b7bef0fa31d925ae06ae4 Mon Sep 17 00:00:00 2001 From: Ratson Date: Tue, 16 Jan 2024 20:35:56 +0800 Subject: [PATCH 61/73] edusong: update http url to https --- pkgs/data/fonts/edusong/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/edusong/default.nix b/pkgs/data/fonts/edusong/default.nix index bf7d39aa20c5..fa4d13693b12 100644 --- a/pkgs/data/fonts/edusong/default.nix +++ b/pkgs/data/fonts/edusong/default.nix @@ -7,8 +7,8 @@ stdenvNoCC.mkDerivation rec { src = fetchzip { name = "${pname}-${version}"; url = - "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/eduSong_Unicode.zip"; - sha256 = "1b74wj9hdzlnrvldwlkh21sfhqxwh9qghf1k0fv66zs6n48vb0d4"; + "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/eduSong_Unicode.zip"; + hash = "sha256-pIG1EbFGf2O2AzM4+HCCvGPodBBwUt7ozpb+BpPk5Kw="; }; installPhase = '' @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { Song or Ming is a category of CKJ typefaces in print. ''; homepage = - "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=48"; + "https://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=48"; license = lib.licenses.cc-by-nd-30; maintainers = with lib.maintainers; [ ShamrockLee ]; }; From 4c7712d2f542f8a1898d0dda0980bd7bcf83c51e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jan 2024 20:42:33 +0100 Subject: [PATCH 62/73] linux_6_6: 6.6.11 -> 6.6.12 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index abe66e00bd3b..91bd65753287 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:165mljr8v1cf4vf4a4b44hx089rprkssvi2azq5wbxxg3basbind" }, "6.6": { - "version": "6.6.11", - "hash": "sha256:0lhyczcj1fhh52fjf06ikp5yh7kxc1qymsw44rv6v25vc6kfbqmg" + "version": "6.6.12", + "hash": "sha256:01a6czk6xz9syxvkb2yhbn3vypqy2mnjq7ni84x4nklw7n6frmqz" }, "6.7": { "version": "6.7", From 2a0eb3136163209040fe57cf6b7edb5fca728bd5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jan 2024 20:43:17 +0100 Subject: [PATCH 63/73] linux_6_1: 6.1.72 -> 6.1.73 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 91bd65753287..4a1ae16d1bd0 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq" }, "6.1": { - "version": "6.1.72", - "hash": "sha256:09h9kzv2xfrn369ynl09dfnjl9025b9vpkcxg75gyp63fy8fdp4q" + "version": "6.1.73", + "hash": "sha256:11vyblm4nkjncdi3akcyizw7jkyxsqn2mjixc51f7kgiddq4ibbc" }, "5.15": { "version": "5.15.146", From 98c3e64d968ec1500b7e4396574a77362a17dea9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jan 2024 20:43:46 +0100 Subject: [PATCH 64/73] linux_5_15: 5.15.146 -> 5.15.147 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 4a1ae16d1bd0..3e94d038b47e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:11vyblm4nkjncdi3akcyizw7jkyxsqn2mjixc51f7kgiddq4ibbc" }, "5.15": { - "version": "5.15.146", - "hash": "sha256:14nijbspmzd4r38l8cpl4vn9dhawzcfnhyc0gnaxl2m8l9gpm02s" + "version": "5.15.147", + "hash": "sha256:1m7wznqiakarpar4a0nbwxql0hkvds0s79zx3r1xn0fj4mbfdhan" }, "5.10": { "version": "5.10.207", From 8140229b0bb0e8e2c6adf616f576545d3ffbee9d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jan 2024 20:44:07 +0100 Subject: [PATCH 65/73] linux_5_10: 5.10.207 -> 5.10.208 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3e94d038b47e..1fe80af6ffa5 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:1m7wznqiakarpar4a0nbwxql0hkvds0s79zx3r1xn0fj4mbfdhan" }, "5.10": { - "version": "5.10.207", - "hash": "sha256:06sg6cd7a881yv9kzh4583g6hjv14zflx2blsls1bgwn4a4ykb46" + "version": "5.10.208", + "hash": "sha256:0vpvy47cmcinhs76cjl2n81zrlhbqgpi4v29izn2hzsl15x189ch" }, "5.4": { "version": "5.4.266", From 34b2bea9f7962261fd21930d645d1b3fb09bc63b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jan 2024 20:44:16 +0100 Subject: [PATCH 66/73] linux_5_4: 5.4.266 -> 5.4.267 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 1fe80af6ffa5..b7da6a004223 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0vpvy47cmcinhs76cjl2n81zrlhbqgpi4v29izn2hzsl15x189ch" }, "5.4": { - "version": "5.4.266", - "hash": "sha256:1dmcn9i3nvf1gldm1a32gnl5ybwbk2lizb3wa4gc06g7dxz2y1ys" + "version": "5.4.267", + "hash": "sha256:0hqw8ww7y9mjrh1wgdkiwk8llxpf4lxwmsmzxm8j4l615kpqvlj2" }, "4.19": { "version": "4.19.304", From b0209635c0494482f910a699f8b671029863c4cc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jan 2024 20:44:26 +0100 Subject: [PATCH 67/73] linux_4_19: 4.19.304 -> 4.19.305 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b7da6a004223..197b5d638861 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0hqw8ww7y9mjrh1wgdkiwk8llxpf4lxwmsmzxm8j4l615kpqvlj2" }, "4.19": { - "version": "4.19.304", - "hash": "sha256:165mljr8v1cf4vf4a4b44hx089rprkssvi2azq5wbxxg3basbind" + "version": "4.19.305", + "hash": "sha256:1s6srmhd3visqchshg566c7gq5wnxr3m74854kxksqhhfif450ns" }, "6.6": { "version": "6.6.12", From e75479d0a63c28ea099c7aea51ff8bbbb3d68cbe Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 16 Jan 2024 09:32:05 -0500 Subject: [PATCH 68/73] python3Packages.ledgerblue: enable build on darwin --- pkgs/development/python-modules/ledgerblue/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 5a39ef7ecba4..9342f8d3b5da 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , bleak , buildPythonPackage , ecpy @@ -29,7 +30,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - bleak ecpy future hidapi @@ -41,6 +41,9 @@ buildPythonPackage rec { pyelftools python-u2flib-host websocket-client + ] + ++ lib.optionals stdenv.isLinux [ + bleak ]; # No tests From f5f34e91d79ccfd07a0eecb17d35a39aeabbe96d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 16 Jan 2024 09:32:21 -0500 Subject: [PATCH 69/73] python3Packages.libagent: 0.14.5 -> 0.14.8 --- pkgs/development/python-modules/libagent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 5b537f0c0084..12c4ce39d759 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -18,18 +18,18 @@ , pynacl }: -# XXX: when changing this package, please test the package onlykey-agent. +# When changing this package, please test packages {keepkey,ledger,onlykey,trezor}-agent buildPythonPackage rec { pname = "libagent"; - version = "0.14.5"; + version = "0.14.8"; format = "setuptools"; src = fetchFromGitHub { owner = "romanz"; repo = "trezor-agent"; rev = "v${version}"; - hash = "sha256-RISAy0efdatr9u4CWNRGnlffkC8ksw1NyRpJWKwqz+s="; + hash = "sha256-tcVott/GlHsICQf640Gm5jx89fZWsCdcYnBxi/Kh2oc="; }; # hardcode the path to gpgconf in the libagent library From 495b938c3b1c5fe6c753705a60b2c673f8f41c6f Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Mon, 15 Jan 2024 19:37:58 +0100 Subject: [PATCH 70/73] electrum: add QtWayland and certifi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtWayland is added so that Electrum will work natively on Wayland. If you try to launch it on Wayland without QtWayland, you will get an error saying that QT couldn't find a module for Wayland. Certifi is added, because it's specified as a requirement for Electrum in their requirements.txt file here: https://github.com/spesmilo/electrum/blob/4.4.6/contrib/requirements/requirements.txt Co-Authored-By: Jörg Thalheim --- pkgs/applications/misc/electrum/default.nix | 3 +++ pkgs/applications/misc/electrum/grs.nix | 3 +++ pkgs/applications/misc/electrum/ltc.nix | 3 +++ 3 files changed, 9 insertions(+) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index a1300983d28f..65fb5c0171f0 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -8,6 +8,7 @@ , secp256k1 , enableQt ? true , callPackage +, qtwayland }: let @@ -53,6 +54,7 @@ python3.pkgs.buildPythonApplication { ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + buildInputs = lib.optional stdenv.isLinux qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -70,6 +72,7 @@ python3.pkgs.buildPythonApplication { qrcode requests tlslite-ng + certifi # plugins btchip-python ledger-bitcoin diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index 4850cfeb1da5..87a85e9f986d 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -6,6 +6,7 @@ , zbar , secp256k1 , enableQt ? true +, qtwayland }: let @@ -35,6 +36,7 @@ python3.pkgs.buildPythonApplication { }; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + buildInputs = lib.optional stdenv.isLinux qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -53,6 +55,7 @@ python3.pkgs.buildPythonApplication { qrcode requests tlslite-ng + certifi # plugins btchip-python ledger-bitcoin diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 83738fd18149..844a49974b8f 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -7,6 +7,7 @@ , zbar , secp256k1 , enableQt ? true +, qtwayland }: let @@ -70,6 +71,7 @@ python3.pkgs.buildPythonApplication { qrcode requests tlslite-ng + certifi # plugins btchip-python ckcc-protocol @@ -110,6 +112,7 @@ python3.pkgs.buildPythonApplication { ''; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + buildInputs = lib.optional stdenv.isLinux qtwayland; pytestFlagsArray = [ "electrum_ltc/tests" ]; From fa83d552b8eaa16bcc058a0b3be0c3eae76dc0bd Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 16 Jan 2024 18:45:23 +0300 Subject: [PATCH 71/73] x11: sort pkg-config modules --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ec79b05c4f65..b2919d5cca6e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1450,7 +1450,7 @@ self: with self; { buildInputs = [ libX11 libXext xorgproto libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xmuu" "xmu" ]; + pkgConfigModules = [ "xmu" "xmuu" ]; platforms = lib.platforms.unix; }; })) {}; @@ -1650,7 +1650,7 @@ self: with self; { buildInputs = [ xorgproto libX11 libXext libXv ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xvmc-wrapper" "xvmc" ]; + pkgConfigModules = [ "xvmc" "xvmc-wrapper" ]; platforms = lib.platforms.unix; }; })) {}; @@ -1811,7 +1811,7 @@ self: with self; { buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xcb-composite" "xcb-xtest" "xcb-record" "xcb-glx" "xcb-dpms" "xcb-xevie" "xcb-dri2" "xcb-shm" "xcb-sync" "xcb-xprint" "xcb-dri3" "xcb-screensaver" "xcb-render" "xcb-xkb" "xcb-xinput" "xcb-shape" "xcb-ge" "xcb-xfixes" "xcb" "xcb-damage" "xcb-present" "xcb-xf86dri" "xcb-xvmc" "xcb-randr" "xcb-xinerama" "xcb-xselinux" "xcb-xv" "xcb-res" ]; + pkgConfigModules = [ "xcb" "xcb-composite" "xcb-damage" "xcb-dbe" "xcb-dpms" "xcb-dri2" "xcb-dri3" "xcb-ge" "xcb-glx" "xcb-present" "xcb-randr" "xcb-record" "xcb-render" "xcb-res" "xcb-screensaver" "xcb-shape" "xcb-shm" "xcb-sync" "xcb-xevie" "xcb-xf86dri" "xcb-xfixes" "xcb-xinerama" "xcb-xinput" "xcb-xkb" "xcb-xprint" "xcb-xselinux" "xcb-xtest" "xcb-xv" "xcb-xvmc" ]; platforms = lib.platforms.unix; }; })) {}; @@ -2271,7 +2271,7 @@ self: with self; { buildInputs = [ gperf libxcb xorgproto ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xcb-atom" "xcb-event" "xcb-aux" "xcb-util" ]; + pkgConfigModules = [ "xcb-atom" "xcb-aux" "xcb-event" "xcb-util" ]; platforms = lib.platforms.unix; }; })) {}; @@ -2391,7 +2391,7 @@ self: with self; { buildInputs = [ gperf libxcb xorgproto ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xcb-icccm" "xcb-ewmh" ]; + pkgConfigModules = [ "xcb-ewmh" "xcb-icccm" ]; platforms = lib.platforms.unix; }; })) {}; @@ -4151,7 +4151,7 @@ self: with self; { buildInputs = [ libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xf86vidmodeproto" "xineramaproto" "xproxymngproto" "glproto" "presentproto" "applewmproto" "xcmiscproto" "recordproto" "resourceproto" "printproto" "xcalibrateproto" "renderproto" "fontsproto" "dpmsproto" "kbproto" "videoproto" "dri2proto" "bigreqsproto" "dri3proto" "evieproto" "inputproto" "fixesproto" "lg3dproto" "xf86rushproto" "compositeproto" "xwaylandproto" "trapproto" "dmxproto" "xextproto" "xproto" "xf86dgaproto" "xf86miscproto" "xf86bigfontproto" "windowswmproto" "scrnsaverproto" "damageproto" "xf86driproto" "randrproto" "fontcacheproto" ]; + pkgConfigModules = [ "applewmproto" "bigreqsproto" "compositeproto" "damageproto" "dmxproto" "dpmsproto" "dri2proto" "dri3proto" "evieproto" "fixesproto" "fontcacheproto" "fontsproto" "glproto" "inputproto" "kbproto" "lg3dproto" "presentproto" "printproto" "randrproto" "recordproto" "renderproto" "resourceproto" "scrnsaverproto" "trapproto" "videoproto" "windowswmproto" "xcalibrateproto" "xcmiscproto" "xextproto" "xf86bigfontproto" "xf86dgaproto" "xf86driproto" "xf86miscproto" "xf86rushproto" "xf86vidmodeproto" "xineramaproto" "xproto" "xproxymngproto" "xwaylandproto" ]; platforms = lib.platforms.unix; }; })) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 175ee92208d8..94755a1637ba 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -332,7 +332,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { my $pcProvidesStr = ""; if (defined $pcProvides{$pkg}) { - $pcProvidesStr = join "", map { "\"" . $_ . "\" " } @{$pcProvides{$pkg}}; + $pcProvidesStr = join "", map { "\"" . $_ . "\" " } (sort @{$pcProvides{$pkg}}); } print OUT < Date: Tue, 16 Jan 2024 18:46:04 +0300 Subject: [PATCH 72/73] xorg.xserver: 21.1.10 -> 21.1.11 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b2919d5cca6e..8786e0798627 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4159,11 +4159,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.10"; + version = "21.1.11"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.10.tar.xz"; - sha256 = "1l0iaq83vbl9jr34sa7v7630c5bnp64drlw8yg6c6yn5xyib7c6f"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz"; + sha256 = "1vr6sc38sqipazsm61bcym2ggbgfgaamz7wf05mb31pvayyssg8x"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index c7f54a0c0ecc..1234f05b9723 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz mirror://xorg/individual/util/makedepend-1.0.8.tar.xz mirror://xorg/individual/util/util-macros-1.20.0.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.10.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz From 3b22cec4600677335e32a6956abf0af7bf3302cc Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 16 Jan 2024 18:47:07 +0300 Subject: [PATCH 73/73] xwayland: 23.2.3 -> 23.2.4 --- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 30fc6a1e35fd..6b2efa04a5c4 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.3"; + version = "23.2.4"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-652apyMsR0EsiDXsFal8V18DVjcmx4d1T/DAGb0H4wI="; + sha256 = "sha256-qZ4Vm20NMwmLO2qyKoi/zs4jyLnQynLFNcVdywaBtGs="; }; depsBuildBuild = [