From 4ddd6f65363a338c20f2a820f8b747317a1b18ca Mon Sep 17 00:00:00 2001 From: Janik H Date: Sun, 12 Mar 2023 16:55:17 +0100 Subject: [PATCH 1/5] engelsystem: 3.1.0 -> 3.3.0 --- pkgs/servers/web-apps/engelsystem/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index eee76b1bf594..ed67fc57e956 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -3,14 +3,15 @@ let phpExt = php.withExtensions ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]); -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "engelsystem"; - version = "3.1.0"; + version = "3.3.0"; src = fetchzip { url = - "https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip"; - sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai"; + "https://github.com/engelsystem/engelsystem/releases/download/v3.3.0/engelsystem-v3.3.0.zip"; + hash = "sha256-DS0klm26udXsiiFToeOJooA1WUR8gk0qf/UJL8E77ps="; }; buildInputs = [ phpExt ]; @@ -20,7 +21,6 @@ in stdenv.mkDerivation rec { # prepare rm -r ./storage/ - rm -r ./docker/ ln -sf /etc/engelsystem/config.php ./config/config.php ln -sf /var/lib/engelsystem/storage/ ./storage @@ -43,6 +43,7 @@ in stdenv.mkDerivation rec { description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; homepage = "https://engelsystem.de"; + changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${version}"; license = licenses.gpl2; maintainers = with maintainers; [ kloenk ]; mainProgram = "migrate"; From 83984bdee76ed1fffb7d3b7ee0cb931e360328ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 22:59:10 +0100 Subject: [PATCH 2/5] httpx: 1.2.7 -> 1.2.8 Diff: https://github.com/projectdiscovery/httpx/compare/refs/tags/v1.2.7...v1.2.8 Changelog: https://github.com/projectdiscovery/httpx/releases/tag/v1.2.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 bcf55ea52639..d32e486eec7b 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.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-kZU7k7vAKgQfCQobGa5i5ZnO8ARUSozv4gz93g912uM="; + hash = "sha256-uZTYRsOAmuROA8ZrePruE+eDIx9TW98ljByDkstZC1Q="; }; - vendorHash = "sha256-1EQt7L+dQvpBOGVHeaIOCUG960yv5h9nuQNnF4wSoug="; + vendorHash = "sha256-czW1bnQp5+Om5EfW1DvCkAaNaqfAupmSJJvS14xKQUg="; # Tests require network access doCheck = false; From 408f52a103806a8f13f4a5bf0db87ef9939f5b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Mar 2023 23:34:37 +0100 Subject: [PATCH 3/5] topgrade: 10.3.1 -> 10.3.2 Diff: https://github.com/topgrade-rs/topgrade/compare/v10.3.1...v10.3.2 Changelog: https://github.com/topgrade-rs/topgrade/releases/tag/v10.3.2 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 8679a655df9c..a9d5aa4e5866 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "10.3.1"; + version = "10.3.2"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-sOXp/oo29oVdmn3qEb7HCSlYYOvbTpD21dX4JSYaqps="; + hash = "sha256-yYRKNiX8JvCP44+mdLIOSjpxaVDz1YUNrj/IZ0bC72Y="; }; - cargoHash = "sha256-fZjMTVn4gx1hvtiD5NRkXY2f9HNSv7Vx3HdHypne5U0="; + cargoHash = "sha256-2b6TOkjoycPA8rwca3nT212Yxl6q2Hmvv0f4Ic9hnWM="; nativeBuildInputs = [ installShellFiles From bc6c2ee545b7e1034a8c298ed4b3c69a21933ae1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Mar 2023 01:41:18 +0100 Subject: [PATCH 4/5] rure: fix darwin dylib names This hasn't been an issue on x86_64, but running it anyways shouldn't hurt. aarch64-darwin's trouble could be due to codesigning? Besides that there don't seem to be many differences between the actual derivations. This also unbreaks the test suite of regex-rure. --- pkgs/development/haskell-modules/configuration-darwin.nix | 5 ----- pkgs/development/libraries/rure/default.nix | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 1dbb3172b02e..c54e2dd03d30 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -318,11 +318,6 @@ self: super: ({ # https://github.com/NixOS/nixpkgs/issues/149692 Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; - # regex-rure's test suite fails with a dylib not loaded error due to some - # rpath issue. - regex-rure = dontDistribute (markBroken super.regex-rure); - jacinda = dontDistribute super.jacinda; - } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: diff --git a/pkgs/development/libraries/rure/default.nix b/pkgs/development/libraries/rure/default.nix index aef8b9c8f3e2..1771abd3367a 100644 --- a/pkgs/development/libraries/rure/default.nix +++ b/pkgs/development/libraries/rure/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchCrate +, fixDarwinDylibNames }: let @@ -27,6 +28,10 @@ rustPlatform.buildRustPackage { install -Dm644 include/rure.h -t "$dev/include" ''; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; + passthru.updateScript = ./update.sh; meta = { From 7c84ea61abbe8038e273fbef035e0364a35be17d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Mar 2023 01:45:08 +0100 Subject: [PATCH 5/5] rure: update locked dependencies --- pkgs/development/libraries/rure/Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/development/libraries/rure/Cargo.lock index 9aa6e7d04641..89fefcd9072e 100644 --- a/pkgs/development/libraries/rure/Cargo.lock +++ b/pkgs/development/libraries/rure/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] name = "libc" -version = "0.2.137" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "memchr" @@ -25,9 +25,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr",