From 137dd249c5f1748ded9332194e0c0d470786ad3e Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 31 May 2023 09:23:09 -0400 Subject: [PATCH 01/38] writeTextFile: revert workaround for `executable = null` --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ pkgs/build-support/trivial-builders/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index ef4465d9ddfd..4cd088dd115e 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -14,6 +14,8 @@ ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} +- `writeTextFile` now requires `executable` to be boolean, values like `null` or `""` will now fail to evaluate. + - The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`. - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 7152f9a1be41..d3cb22a1f535 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -141,7 +141,7 @@ rec { runCommand name { inherit text executable checkPhase allowSubstitutes preferLocalBuild; passAsFile = [ "text" ]; - meta = lib.optionalAttrs (toString executable != "" && matches != null) { + meta = lib.optionalAttrs (executable && matches != null) { mainProgram = lib.head matches; } // meta; } From faad480c76fbbc225853296cfe0f3ac5b2c31064 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Jun 2023 21:46:36 +0000 Subject: [PATCH 02/38] hyperrogue: 12.1o -> 12.1q --- pkgs/games/hyperrogue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 17a5fd95e037..cd44b9904c46 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1o"; + version = "12.1q"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-p7F+A7+wjHb17nJqsULhBZMs2P64s9gDOk2Oh4dc/lQ="; + sha256 = "sha256-dYkeAQBpnETbJiXZSejFPJVhXt3kJBBv6qBKPb7t9fU="; }; CXXFLAGS = [ From 4e42d8309a36da655f8af21b016cdf696d3bbe97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Jun 2023 23:21:58 +0000 Subject: [PATCH 03/38] cloudlog: 2.4.2 -> 2.4.3 --- pkgs/applications/radio/cloudlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 7e4c409cdffc..669a596ccbde 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-btfHHrb7m6ITWe/18u2pmZiZKpKebKMThqcXFIvO/P8="; + sha256 = "sha256-2L+Yp8yxhmoVh34cW1s5Xy1f0X2xUo3UP32XcAV2LsM="; }; postPath = '' From bfbcd4c912bfefe37faacd422d6d68a68890d860 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Jun 2023 23:42:02 +0000 Subject: [PATCH 04/38] imgproxy: 3.17.0 -> 3.18.0 --- pkgs/servers/imgproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 970d3a8be3c5..68bcd61293d5 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-7kNBXMjkOs8fLDUBdQJHOjwJhYYAbGPZZDA0NLFirH8="; + sha256 = "sha256-c85G76u0qLyRbiXEWpYKZerrkZmHkq+VmCdHJk6pH9M="; rev = "v${version}"; }; From 4bda0f0beb23fce2b1c3cfad7c0a7fe6306256a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 04:31:10 +0000 Subject: [PATCH 05/38] whatsapp-for-linux: 1.6.2 -> 1.6.3 --- .../instant-messengers/whatsapp-for-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 32eaf8ada5ca..ed9cf85640e2 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "whatsapp-for-linux"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "eneshecan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-odE5syAFasGosc1WMU/pvQtk3YxuCci1YevZqNKfzYw="; + sha256 = "sha256-YmiEzemoGLwCUVfnuTmruSkI0oBg7yNuodWmXTMGh8g="; }; nativeBuildInputs = [ From 9783bd46c9c307afb29ff51d6f126b66ba6f0644 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 06:58:49 +0000 Subject: [PATCH 06/38] opera: 98.0.4759.39 -> 99.0.4788.31 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index aff843adb77c..2bb9a8be351f 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "98.0.4759.39"; + version = "99.0.4788.31"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-3HVgEOscds+VBn9ajmkRnPdqNi9lLItJrb3uRH6L96Q="; + hash = "sha256-73A47Yl454ZyOkglLvnp10zjoE1bf8v5tm4Rng3UBac="; }; unpackPhase = "dpkg-deb -x $src ."; From 33d8777af9d151a722b24da45d63e003309f46e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 08:46:43 +0000 Subject: [PATCH 07/38] diamond: 2.1.6 -> 2.1.7 --- pkgs/applications/science/biology/diamond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index cec34547c62c..76ef4b7784c4 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-2FxJTF/fF/Xi0TglXDlf3sSwncv2f6gc129nTbk8YU0="; + sha256 = "sha256-5AjP7zH0WZhJqhcjgQjeK/WPCqy1Tl1gXXqRsHbqkys="; }; From 5319c6b53bccc2f58e10a11424d8700ce0071926 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 12:48:14 +0000 Subject: [PATCH 08/38] stellar-core: 19.10.0 -> 19.11.0 --- pkgs/applications/blockchains/stellar-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 001bc4a537fa..72b1c691c581 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.10.0"; + version = "19.11.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BcZsj2TbeJW91aiZ2I7NbDa+rgjfs6lQUsWOnhFQXtw="; + sha256 = "sha256-48fEVbK5yswPkTwlfemXB2ieAs2+SIM6dspqOBiRKCU="; fetchSubmodules = true; }; From 30d8b2afa8158a7e8d8515c530e33e4291e88b17 Mon Sep 17 00:00:00 2001 From: Oliver Wilkes Date: Fri, 10 Mar 2023 18:39:21 +0000 Subject: [PATCH 09/38] maintainers: add ooliver1 --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2b1f3e1106cd..faed0cb5404e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11971,6 +11971,15 @@ github = "ony"; githubId = 11265; }; + ooliver1 = { + name = "Oliver Wilkes"; + email = "oliverwilkes2006@icloud.com"; + github = "ooliver1"; + githubId = 34910574; + keys = [{ + fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273"; + }]; + }; opeik = { email = "sandro@stikic.com"; github = "opeik"; From bb1da66f9d802aab670f9df5f5f98460c064b255 Mon Sep 17 00:00:00 2001 From: Oliver Wilkes Date: Fri, 10 Mar 2023 21:03:32 +0000 Subject: [PATCH 10/38] eludris: init at 0.3.3 --- pkgs/tools/misc/eludris/default.nix | 34 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/misc/eludris/default.nix diff --git a/pkgs/tools/misc/eludris/default.nix b/pkgs/tools/misc/eludris/default.nix new file mode 100644 index 000000000000..ac3ecc2e5a6c --- /dev/null +++ b/pkgs/tools/misc/eludris/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, stdenv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "eludris"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "eludris"; + repo = pname; + rev = "v${version}"; + hash = "sha256-TVYgimkGUSITB3IaMlMd10PWomqyJRvONvJwiW85U4M="; + }; + + cargoHash = "sha256-5B9D19jFh5+eNTjiho22CFsn51nmwLry08zSDWvs1OU="; + + cargoBuildFlags = [ "-p eludris" ]; + cargoTestFlags = [ "-p eludris" ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ pkg-config ]; + + meta = with lib; { + description = "A simple CLI to help you with setting up and managing your Eludris instance"; + homepage = "https://github.com/eludris/eludris/tree/main/cli"; + license = licenses.mit; + maintainers = with maintainers; [ ooliver1 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 192662252060..22e54a6ee03f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -555,6 +555,10 @@ with pkgs; efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; + eludris = callPackage ../tools/misc/eludris { + inherit (darwin.apple_sdk.frameworks) Security; + }; + enumer = callPackage ../tools/misc/enumer { }; evans = callPackage ../development/tools/evans { }; From 8d83062b048c05a30a86dffa4a746a575cfd0349 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jun 2023 19:27:49 +0200 Subject: [PATCH 11/38] chromiumBeta: 114.0.5735.45 -> 115.0.5790.13 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 541a5af91a11..0630e0a96b74 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,15 +19,15 @@ } }, "beta": { - "version": "114.0.5735.45", - "sha256": "1z7z4mq3yw9i17xprza3v33wx28zpk7s3g8xcgapdydw0rgxz30v", - "sha256bin64": "1387x7mab2sh3wg39z48gl8fjhq39jllbcgzic8rdzpbhlcgs7br", + "version": "115.0.5790.13", + "sha256": "0ias5jn8lwpds3gsmjps0rlks58ln5znwx52h767f8mc9y24fagx", + "sha256bin64": "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566", "deps": { "gn": { - "version": "2023-04-19", + "version": "2023-05-19", "url": "https://gn.googlesource.com/gn", - "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", - "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" + "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7", + "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a" } } }, From 3e24038fba7edfa12dd42d13f3167a3304b5841a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jun 2023 19:27:50 +0200 Subject: [PATCH 12/38] chromiumDev: 115.0.5790.3 -> 116.0.5803.2 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 541a5af91a11..9d80f3ccbe14 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "115.0.5790.3", - "sha256": "1haai0jabghwl37k929138s4l6izmifssdvn2wgsig9jhiihxz29", - "sha256bin64": "12avl8ilvhmlvbag045yhnx0bbbsyx5d3jqh5af07pmbcxksgf96", + "version": "116.0.5803.2", + "sha256": "0s3l0wvbvy0wcwxipbl9vlbp1441yfj8ylrwhlh7gy898ajl9q0j", + "sha256bin64": "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs", "deps": { "gn": { - "version": "2023-05-19", + "version": "2023-05-26", "url": "https://gn.googlesource.com/gn", - "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7", - "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a" + "rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8", + "sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j" } } }, From af49f98525a529c0803e130023215f9d0ef620fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 19:03:37 +0000 Subject: [PATCH 13/38] re-flex: 3.3.3 -> 3.3.4 --- pkgs/development/tools/parsing/re-flex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 0ae0dc9eb933..c9572e548c18 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-pfCszi75TAo9ibpuWlfIDm5OO7Eo6joNPIer4JoDJRw="; + sha256 = "sha256-Fb6Z3LejlWY1L7PkITRh4bCVKpzuwpGOeTc2ZoLxRO0="; }; nativeBuildInputs = [ boost autoconf automake ]; From 2390ba5fac490dfd687420423dd91fd22e6a095c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 19:08:50 +0000 Subject: [PATCH 14/38] wxsqlite3: 4.9.3 -> 4.9.4 --- pkgs/development/libraries/wxsqlite3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 10b5558589a6..5dc9829b1a3a 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.3"; + version = "4.9.4"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-HdsPCdZF1wMTGYFaXzq+f4bUFjgCAklsKhhdyMKaxp8="; + hash = "sha256-aM79DI/Kj1QEIJ1HMttlfqK/WZER9RJhQbrnbPto57U="; }; nativeBuildInputs = [ autoreconfHook ]; From 37111dc014417c8a45347ce46bfbc63d30be74eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 19:28:35 +0000 Subject: [PATCH 15/38] envfs: 1.0.0 -> 1.0.1 --- pkgs/tools/filesystems/envfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/envfs/default.nix b/pkgs/tools/filesystems/envfs/default.nix index de85a4ab0ca2..ceb6c0412e30 100644 --- a/pkgs/tools/filesystems/envfs/default.nix +++ b/pkgs/tools/filesystems/envfs/default.nix @@ -1,14 +1,14 @@ { rustPlatform, lib, fetchFromGitHub, nixosTests }: rustPlatform.buildRustPackage rec { pname = "envfs"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "envfs"; rev = version; - hash = "sha256-aF8V1LwPGifFWoVxM0ydOnTX1pDVJ6HXevTxADJ/rsw="; + hash = "sha256-ttW1NUCtwnjAoiu7QgLGrlAB2PyY4oXm91LpWhbz8qk="; }; - cargoHash = "sha256-kw56tbe5zvWY5bI//dUqR1Rlumz8kOG4HeXiyEyL0I0="; + cargoHash = "sha256-BgXKwKD6w/GraBQEq61D7S7m2Q9TnkXNFJEIgDYo9L4="; passthru.tests = { envfs = nixosTests.envfs; From df0136b8e085022de88c9fe77d5084c03a808d35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 20:23:36 +0000 Subject: [PATCH 16/38] vivaldi: 6.0.2979.18 -> 6.0.2979.22 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 551f7472d911..7f9d43122f25 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -23,7 +23,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.0.2979.18"; + version = "6.0.2979.22"; suffix = { aarch64-linux = "arm64"; @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-S3b0mmWsQhWDKPz34Gzb50q+wAURAFNEt6IvCqo8CMs="; - x86_64-linux = "sha256-uqhXL7kndmGoOOalyQ6mVxRB3k8L11UJzADCnNakj64="; + aarch64-linux = "sha256-x7wBbd7BdurnWGFeHD5kYb5t0/zGEXQaUwbHnNA4iME="; + x86_64-linux = "sha256-uN2nBWlullxpOZP2PzVCwKcNmO9XmDS3WiFOcp0dOqg="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 01e460d69ecaad102de4aa47370a249d0add3d7d Mon Sep 17 00:00:00 2001 From: Francis Couture-Harpin Date: Thu, 1 Jun 2023 23:29:49 -0400 Subject: [PATCH 17/38] perlPackages.HashSharedMem: fix build on aarch64-linux The [(failing-)build log](https://hydra.nixos.org/build/219379873/nixlog/1) has errors that look like: `undefined symbol: __aarch64_cas8_sync`. This led me to find out about the newly-introduced `-moutline-atomics`, which is **on by default** in GCC 10.1 (according to [this blog post](https://community.arm.com/arm-community-blogs/b/tools-software-ides-blog/posts/making-the-most-of-the-arm-architecture-in-gcc-10)) and in Clang 12.0.0 (according to [the release notes](https://releases.llvm.org/12.0.0/tools/clang/docs/ReleaseNotes.html)) Not all ARMv8-A processors support atomic stuff like `__aarch64_cas8_sync`, it's only those that are ARMv8.1-A or later that do. Examples of pre-ARMv8.1-A processors include the Cortex-A72 used in the Raspberry Pi 4 (which is how I discovered this problem (I am running `hydra` on it, which indirectly depends on `HashSharedMem`)), and any older ARMv8-A processors. The problem here is solvable either by linking the compiler runtime library (which I did not try, since I don't know exactly which one to use) *or* by simply not generating outlines for atomic operations. I went with the "easier" path (which was also what was was happening in older versions of GCC, I think) of disabling atomic outlines with `-mno-outline-atomics`, and it works! --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 401a5f9705af..dac7c4979992 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10912,6 +10912,7 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Hash-SharedMem-0.005.tar.gz"; hash = "sha256-Mkd2gIYC973EStqpN4lTZUVAKakm+mEfMhyb9rlAu14="; }; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-mno-outline-atomics"; buildInputs = [ ScalarString ]; meta = { description = "Efficient shared mutable hash"; From ea7b4a528767ce9d1dce48de4d56e8e3485c4df0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 21:28:04 +0000 Subject: [PATCH 18/38] python310Packages.pyopencl: 2022.3.1 -> 2023.1 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 8a233014155f..ed5d40843e0a 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -22,7 +22,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2022.3.1"; + version = "2023.1"; nativeCheckInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -40,7 +40,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Sj2w/mG1zclSZ1Jt7r1xp+HXlWlNSw/idh8GMLzKNiE="; + hash = "sha256-2d5gcnKRmlB6nCTD3+7q/nLAX3zWyeN7IRno7jxTqJE="; }; # py.test is not needed during runtime, so remove it from `install_requires` From 63e829fe273e138348d551ba7f02469714b799a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 21:33:31 +0000 Subject: [PATCH 19/38] lilypond-unstable: 2.25.4 -> 2.25.5 --- pkgs/misc/lilypond/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index e746e37a5c8b..63f399958da3 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.4"; + version = "2.25.5"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-O7YQc00774Nz6KIGC1Za1HBvKaHmUjXeKkZs0YR1HUA="; + sha256 = "sha256-QgFGiNKqfC7Q7E0/yhsXFwKZoj+/07c0GwTPWiDz/u4="; }; passthru.updateScript = { From 71adbbc7f370b6dc0f62253943f6946e745fa81d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 4 Jun 2023 04:20:00 +0000 Subject: [PATCH 20/38] millet: 0.10.0 -> 0.10.1 Diff: https://github.com/azdavis/millet/compare/v0.10.0...v0.10.1 Changelog: https://github.com/azdavis/millet/raw/v0.10.1/docs/CHANGELOG.md --- .../tools/language-servers/millet/Cargo.lock | 83 +++++++++++-------- .../tools/language-servers/millet/default.nix | 4 +- 2 files changed, 50 insertions(+), 37 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 019f8a6005bc..b279fbe48d84 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.10.0" +version = "0.10.1" dependencies = [ "config", "diagnostic", @@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.10.0" +version = "0.10.1" dependencies = [ "fast-hash", "str-util", @@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "cm-syntax" -version = "0.10.0" +version = "0.10.1" dependencies = [ "lex-util", "paths", @@ -138,9 +138,19 @@ dependencies = [ "fast-hash", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "config" -version = "0.10.0" +version = "0.10.1" dependencies = [ "fast-hash", "serde", @@ -385,7 +395,7 @@ dependencies = [ [[package]] name = "input" -version = "0.10.0" +version = "0.10.1" dependencies = [ "cm-syntax", "config", @@ -444,7 +454,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524" [[package]] name = "lang-srv" -version = "0.10.0" +version = "0.10.1" dependencies = [ "analysis", "anyhow", @@ -472,7 +482,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.10.0" +version = "0.10.1" [[package]] name = "libc" @@ -547,9 +557,10 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.10.0" +version = "0.10.1" dependencies = [ "analysis", + "codespan-reporting", "config", "diagnostic", "env_logger", @@ -558,11 +569,13 @@ dependencies = [ "paths", "pico-args", "sml-naive-fmt", + "text-pos", + "text-size-util", ] [[package]] name = "millet-ls" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "env_logger", @@ -591,7 +604,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.10.0" +version = "0.10.1" dependencies = [ "fast-hash", "paths", @@ -602,7 +615,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.10.0" +version = "0.10.1" dependencies = [ "config", "diagnostic", @@ -626,7 +639,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.10.0" +version = "0.10.1" dependencies = [ "lex-util", "paths", @@ -698,7 +711,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.10.0" +version = "0.10.1" dependencies = [ "better-panic", ] @@ -892,7 +905,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.10.0" +version = "0.10.1" dependencies = [ "fast-hash", "str-util", @@ -900,14 +913,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.10.0" +version = "0.10.1" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.10.0" +version = "0.10.1" dependencies = [ "fast-hash", "fmt-util", @@ -918,7 +931,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.10.0" +version = "0.10.1" dependencies = [ "config", "sml-dynamics", @@ -933,7 +946,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.10.0" +version = "0.10.1" dependencies = [ "config", "elapsed", @@ -947,7 +960,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.10.0" +version = "0.10.1" dependencies = [ "fast-hash", "once_cell", @@ -956,7 +969,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.10.0" +version = "0.10.1" dependencies = [ "la-arena", "sml-lab", @@ -967,7 +980,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.10.0" +version = "0.10.1" dependencies = [ "config", "diagnostic", @@ -981,14 +994,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.10.0" +version = "0.10.1" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.10.0" +version = "0.10.1" dependencies = [ "diagnostic", "lex-util", @@ -1002,7 +1015,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#7ae671a607a143fd8529e34019 [[package]] name = "sml-naive-fmt" -version = "0.10.0" +version = "0.10.1" dependencies = [ "fast-hash", "sml-comment", @@ -1011,11 +1024,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.10.0" +version = "0.10.1" [[package]] name = "sml-parse" -version = "0.10.0" +version = "0.10.1" dependencies = [ "diagnostic", "event-parse", @@ -1027,14 +1040,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.10.0" +version = "0.10.1" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.10.0" +version = "0.10.1" dependencies = [ "num-bigint", "num-traits", @@ -1043,7 +1056,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.10.0" +version = "0.10.1" dependencies = [ "chain-map", "config", @@ -1065,7 +1078,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.10.0" +version = "0.10.1" dependencies = [ "chain-map", "code-h2-md-map", @@ -1082,7 +1095,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.10.0" +version = "0.10.1" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1090,7 +1103,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.10.0" +version = "0.10.1" dependencies = [ "char-name", "code-h2-md-map", @@ -1103,7 +1116,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.10.0" +version = "0.10.1" dependencies = [ "fast-hash", "sml-hir", @@ -1171,7 +1184,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.10.0" +version = "0.10.1" dependencies = [ "analysis", "cm-syntax", @@ -1505,7 +1518,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 662bdd93956d..f3942867b731 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-QAXvkSGC7IydFXcWdrVf9QlMBlJVFDLNgfXu+P6yWlE="; + hash = "sha256-f5vftRc/hI0erXZiU+0HbNHPqNUUz6Df2+uIGsRu2+M="; }; cargoLock = { From 063696f828b053d053f3add8417b96b76a5fc98f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 4 Jun 2023 04:20:00 +0000 Subject: [PATCH 21/38] python310Packages.pyopencl: use pyproject format --- .../python-modules/pyopencl/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index ed5d40843e0a..03549ea2977d 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -13,7 +13,9 @@ , platformdirs , pybind11 , pytest +, pytestCheckHook , pytools +, setuptools , six }: @@ -24,7 +26,15 @@ in buildPythonPackage rec { pname = "pyopencl"; version = "2023.1"; - nativeCheckInputs = [ pytest ]; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-2d5gcnKRmlB6nCTD3+7q/nLAX3zWyeN7IRno7jxTqJE="; + }; + + nativeBuildInputs = [ setuptools ]; + buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; propagatedBuildInputs = [ @@ -38,15 +48,7 @@ in buildPythonPackage rec { six ]; - src = fetchPypi { - inherit pname version; - hash = "sha256-2d5gcnKRmlB6nCTD3+7q/nLAX3zWyeN7IRno7jxTqJE="; - }; - - # py.test is not needed during runtime, so remove it from `install_requires` - postPatch = '' - substituteInPlace setup.py --replace "pytest>=2" "" - ''; + nativeCheckInputs = [ pytestCheckHook ]; preBuild = '' export HOME=$(mktemp -d) @@ -55,6 +57,8 @@ in buildPythonPackage rec { # gcc: error: pygpu_language_opencl.cpp: No such file or directory doCheck = false; + pythonImportsCheck = [ "pyopencl" ]; + meta = with lib; { description = "Python wrapper for OpenCL"; homepage = "https://github.com/pyopencl/pyopencl"; From 0f85ec3a2115bc74d6759ed201dc2a0a87490e86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 04:47:45 +0000 Subject: [PATCH 22/38] dbmate: 2.3.0 -> 2.4.0 --- pkgs/development/tools/database/dbmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 625b99271ad2..fcca97ff9e1a 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-bWmRdrULXXVIaO5f3rntsVURnyojYFbhbZ43WvGzoZk="; + hash = "sha256-EwGyRDgd9di1gjefq9G3u+lVD2XEfdCULuLhtDAFDkY="; }; - vendorHash = "sha256-m1Nbu1bE04iOXnxW5kJfI9W95FU87eRKkOzg+YVvRsg="; + vendorHash = "sha256-t5GPbDBwq92erEpbkfIc/RMWkDr6Mb4oQ4BWmhCLrSc="; doCheck = false; From 626bf2b598ff87d53343a701566baea688569495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sat, 3 Jun 2023 18:23:18 +0200 Subject: [PATCH 23/38] epilys-bb: init at unstable-2020-12-04 --- pkgs/tools/system/epilys-bb/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/system/epilys-bb/default.nix diff --git a/pkgs/tools/system/epilys-bb/default.nix b/pkgs/tools/system/epilys-bb/default.nix new file mode 100644 index 000000000000..169e10bc30c4 --- /dev/null +++ b/pkgs/tools/system/epilys-bb/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "epilys-bb"; + version = "unstable-2020-12-04"; + + src = fetchFromGitHub { + owner = "epilys"; + repo = "bb"; + rev = "c903d4c2975509299fd3d2600a0c4c2102f445d0"; + hash = "sha256-KOXK+1arUWtu/QU7dwXhojIM0faMtwNN3AqVbofq1lY="; + }; + + cargoHash = "sha256-+aCMwKOg+3HDntG14gjJLec8XD51wuTyYyzLjuW6lbY="; + + meta = with lib; { + description = "A clean, simple, and fast process viewer"; + homepage = "https://nessuent.xyz/bb.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ cafkafk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0662afea1753..cd7f05ade81a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26677,6 +26677,8 @@ with pkgs; b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; + epilys-bb = callPackage ../tools/system/epilys-bb { }; + below = callPackage ../os-specific/linux/below { }; bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { }; From adff278e5913079ac5c97d3b2adfa1e7b3d83b70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 06:50:25 +0000 Subject: [PATCH 24/38] mob: 4.4.2 -> 4.4.3 --- pkgs/applications/misc/mob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 3052384399c1..c54aa5e1dd7c 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = pname; rev = "v${version}"; - sha256 = "sha256-muKlzOrqtegy35QcGJvwYqIJ9XZsaAvyofsrWPqCi7k="; + sha256 = "sha256-XWXoY/e/xceO3sOGvA2hrdvbdb8nomMg7AGUW090I74="; }; vendorHash = null; From b6176bfba2eaf85b53e7b73dd1e1ea2b0dcb243a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 07:16:16 +0000 Subject: [PATCH 25/38] yoshimi: 2.2.3 -> 2.3.0 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 52e0b7f24c3e..bcf81c8c81ea 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; rev = version; - hash = "sha256-zVIOHm84wx6ZFK0seS9fWZfujDz259AXTv7zljbwrUk="; + hash = "sha256-rVlwOxp8C/A56JDd6Bzi2smblJVqQWZiFqIP4oRhElM="; }; sourceRoot = "source/src"; From f32e93944fff59680d361ffa1416e8480c226e15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 07:25:32 +0000 Subject: [PATCH 26/38] cista: 0.13 -> 0.14 --- pkgs/development/libraries/cista/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cista/default.nix b/pkgs/development/libraries/cista/default.nix index 770e13ff85c2..862a74c596a3 100644 --- a/pkgs/development/libraries/cista/default.nix +++ b/pkgs/development/libraries/cista/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cista"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "felixguendling"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dQOVmKRXfApN0QRx/PmLVzeCGppFJBnNWIOoLbDbrds="; + sha256 = "sha256-E2B+dNFk0ssKhT9dULNFzpa8auRQ9Q0czuUjX6hxWPw="; }; nativeBuildInputs = [ cmake ]; From 640627bae85de92f9fae5b30611b6b6120f045b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 09:02:35 +0000 Subject: [PATCH 27/38] dos2unix: 7.4.4 -> 7.5.0 --- pkgs/tools/text/dos2unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index c6c92b876ffa..a76432d76c05 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dos2unix"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; - sha256 = "sha256-KKhB2wvVgn1kXKup2AFeOnGYPcbjmAcLUofuE3rkQ24="; + sha256 = "sha256-ejsB0B4hTWLCs+BMOpLg3ccoo4VWbkwDVu+mb9brla8="; }; nativeBuildInputs = [ perl gettext ]; From be3252f3a06e67697f052303f6775897d88dfb16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 09:57:13 +0000 Subject: [PATCH 28/38] cobalt: 0.18.4 -> 0.18.5 --- pkgs/applications/misc/cobalt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 0be88332e7b0..cda685c971dc 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.18.4"; + version = "0.18.5"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-O7qFpp7Xr6K82o/KUMP0J5y2B32op+QBGUXo9Q5R5LQ="; + sha256 = "sha256-Y1rWKoh4cjLOvBJy4bXIHsvGtLmTu9n0aqf6PdflH6E="; }; - cargoHash = "sha256-ZBAF4BqQ+JMZ3Rpg2RxUhhVvPE5pN68qljVl0o2/VNA="; + cargoHash = "sha256-r0nxsDcdXNiZn9dVMTOAxlI/kd0nZFh7JvB2JYDR2aw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 4537beecf33f594d248728e3d5f71945652b75f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 12:11:38 +0000 Subject: [PATCH 29/38] python310Packages.plumbum: 1.8.1 -> 1.8.2 --- pkgs/development/python-modules/plumbum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 6bc5ec7da710..e6ffa43b3293 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.8.1"; + version = "1.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = "plumbum"; rev = "refs/tags/v${version}"; - hash = "sha256-5nRI9y2Y7itkqDdLRSX4qWfh96WmhqdP1Eo7HLoRHaQ="; + hash = "sha256-b8JcGRHiZSv/ViyEogpLgGXOMHHSC+cjWT0FqhkolcA="; }; postPatch = '' From 00b378b10beb4dc80b8dce17c3db01ef39a5d2cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jun 2023 14:16:54 +0200 Subject: [PATCH 30/38] python311Packages.pydelijn: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/pydelijn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydelijn/default.nix b/pkgs/development/python-modules/pydelijn/default.nix index 151a0c5a9669..728160fe8d1f 100644 --- a/pkgs/development/python-modules/pydelijn/default.nix +++ b/pkgs/development/python-modules/pydelijn/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pydelijn"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c5b6565c50d4f97d28baca9faf487281c2a5db635060b69f659e27c28a1a6e93"; + sha256 = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g="; }; propagatedBuildInputs = [ From fca9bc364ab130ddf72c0dd9ec2fbf0ef98a9f5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jun 2023 14:18:09 +0200 Subject: [PATCH 31/38] python311Packages.frigidaire: 0.18.12 -> 0.18.13 Diff: https://github.com/bm1549/frigidaire/compare/refs/tags/0.18.12...0.18.13 Changelog: https://github.com/bm1549/frigidaire/releases/tag/0.18.13 --- pkgs/development/python-modules/frigidaire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index a5a4c72451cb..1519347b8ba2 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.12"; + version = "0.18.13"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-U6ko6P5/ANGy84GQDuSQq+YArou0TrXH5SIc5x4euvU="; + hash = "sha256-FikBV4KjutQfupGPXcVT1h+BfQ099WRrmbrEJOaVCQI="; }; postPatch = '' From 5e777d5991260838691c2b5d148fd6bd6c9eb512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 12:41:17 +0000 Subject: [PATCH 32/38] realvnc-vnc-viewer: 7.1.0 -> 7.5.0 --- pkgs/tools/admin/realvnc-vnc-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index e6f60459bfbd..8c6b31919e9b 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "7.1.0"; + version = "7.5.0"; src = { "x86_64-linux" = fetchurl { url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "sha256-Mn4K2HICK7owHcXH85IJUncnpPZ56zNybkHZNiqYkHY="; + sha256 = "sha256-XemifIWeoi3Qdjv8HfEjtTYJvfi0eCXeQUXVld6aR9A="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From 4fdd015c769c72adf92f85df7b0db427e6b17f6d Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 2 Oct 2022 04:16:09 +0200 Subject: [PATCH 33/38] public-inbox: fix InlineC Co-authored-by: Alyssa Ross --- pkgs/servers/mail/public-inbox/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix index a70ef432fc49..c23f1c58354a 100644 --- a/pkgs/servers/mail/public-inbox/default.nix +++ b/pkgs/servers/mail/public-inbox/default.nix @@ -6,6 +6,7 @@ , gnumake , highlight , libgit2 +, libxcrypt , man , openssl , pkg-config @@ -137,12 +138,14 @@ buildPerlPackage rec { installTargets = [ "install" ]; postInstall = '' for prog in $out/bin/*; do - wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ - git - /* for InlineC */ - gnumake - stdenv.cc.cc - ]} + wrapProgram $prog \ + --set NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt} -I${lib.getDev libxcrypt}/include \ + --prefix PATH : ${lib.makeBinPath [ + git + /* for InlineC */ + gnumake + stdenv.cc + ]} done mv sa_config $sa_config From 50301d73e9250276693e19e96013bd25799331b9 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Wed, 2 Nov 2022 00:50:31 +0100 Subject: [PATCH 34/38] public-inbox: 1.8.0 -> 1.9.0 Co-authored-by: Alyssa Ross --- nixos/tests/public-inbox.nix | 6 ++-- pkgs/servers/mail/public-inbox/default.nix | 35 ++++++++++++++-------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/nixos/tests/public-inbox.nix b/nixos/tests/public-inbox.nix index 232a688e221d..784ef9e3dc28 100644 --- a/nixos/tests/public-inbox.nix +++ b/nixos/tests/public-inbox.nix @@ -14,7 +14,7 @@ in meta.maintainers = with pkgs.lib.maintainers; [ julm ]; - machine = { config, pkgs, nodes, ... }: let + nodes.machine = { config, pkgs, nodes, ... }: let inherit (config.services) gitolite public-inbox; # Git repositories paths in Gitolite. # Only their baseNameOf is used for configuring public-inbox. @@ -221,7 +221,7 @@ in # Delete a mail. # Note that the use of an extension not listed in the addresses # require to use --all - machine.succeed("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all") - machine.fail("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'") + machine.succeed("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all") + machine.fail("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'") ''; }) diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix index c23f1c58354a..02ab293c1af1 100644 --- a/pkgs/servers/mail/public-inbox/default.nix +++ b/pkgs/servers/mail/public-inbox/default.nix @@ -18,30 +18,33 @@ , EmailAddressXS , EmailMIME , IOSocketSSL +# FIXME: to be packaged +#, IOSocketSocks , IPCRun , Inline , InlineC , LinuxInotify2 , MailIMAPClient +# FIXME: to be packaged +#, NetNetrc +# FIXME: to be packaged +#, NetNNTP , ParseRecDescent , Plack , PlackMiddlewareReverseProxy +, PlackTestExternalServer , SearchXapian +, TestSimple13 , TimeDate , URI +, XMLTreePP }: let skippedTests = [ - # These tests would fail, and produce "Operation not permitted" - # errors from git, because they use git init --shared. This tries - # to set the setgid bit, which isn't permitted inside build - # sandboxes. - # - # These tests were indentified with - # grep -r shared t/ - "convert-compact" "search" "v2writable" "www_listing" + # fatal: Could not make /tmp/pi-search-9188-DGZM/a.git/branches/ writable by group + "search" # perl5.32.0-public-inbox> t/eml.t ...................... 1/? Cannot parse parameter '=?ISO-8859-1?Q?=20charset=3D=1BOF?=' at t/eml.t line 270. # perl5.32.0-public-inbox> # Failed test 'got wide character by assuming utf-8' # perl5.32.0-public-inbox> # at t/eml.t line 272. @@ -68,6 +71,8 @@ let # expected: anything else # waiting for child to reap grandchild... "spawn" + # Failed to connect to 127.0.0.1 + "v2mirror" ]; testConditions = with lib; @@ -77,11 +82,11 @@ in buildPerlPackage rec { pname = "public-inbox"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://public-inbox.org/public-inbox.git/snapshot/public-inbox-${version}.tar.gz"; - sha256 = "sha256-laJOOCk5NecIGWesv4D30cLGfijQHVkeo55eNqNKzew="; + sha256 = "sha256-ENnT2YK7rpODII9TqiEYSCp5mpWOnxskeSuAf8Ilqro="; }; outputs = [ "out" "devdoc" "sa_config" ]; @@ -100,12 +105,15 @@ buildPerlPackage rec { DBDSQLite DBI EmailAddressXS - EmailMIME highlight IOSocketSSL + #IOSocketSocks IPCRun Inline InlineC + MailIMAPClient + #NetNetrc + #NetNNTP ParseRecDescent Plack PlackMiddlewareReverseProxy @@ -118,13 +126,16 @@ buildPerlPackage rec { doCheck = !stdenv.isDarwin; nativeCheckInputs = [ - MailIMAPClient curl git openssl pkg-config sqlite xapian + EmailMIME + PlackTestExternalServer + TestSimple13 + XMLTreePP ] ++ lib.optionals stdenv.isLinux [ LinuxInotify2 ]; From b6ed3b8f402893df91a8e21ce993520301c2f076 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 26 Dec 2022 23:39:36 +0100 Subject: [PATCH 35/38] nixos/public-inbox: explicit a few more freeform settings --- nixos/modules/services/mail/public-inbox.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix index 9cd6726e6cb2..099997fa9fe9 100644 --- a/nixos/modules/services/mail/public-inbox.nix +++ b/nixos/modules/services/mail/public-inbox.nix @@ -275,9 +275,8 @@ in default = {}; description = lib.mdDoc "public inboxes"; type = types.submodule { - # Keeping in line with the tradition of unnecessarily specific types, allow users to set - # freeform settings either globally under the `publicinbox` section, or for specific - # inboxes through additional nesting. + # Support both global options like `services.public-inbox.settings.publicinbox.imapserver` + # and inbox specific options like `services.public-inbox.settings.publicinbox.foo.address`. freeformType = with types; attrsOf (oneOf [ iniAtom (attrsOf iniAtom) ]); options.css = mkOption { @@ -285,12 +284,24 @@ in default = []; description = lib.mdDoc "The local path name of a CSS file for the PSGI web interface."; }; + options.imapserver = mkOption { + type = with types; listOf str; + default = []; + example = [ "imap.public-inbox.org" ]; + description = lib.mdDoc "IMAP URLs to this public-inbox instance"; + }; options.nntpserver = mkOption { type = with types; listOf str; default = []; example = [ "nntp://news.public-inbox.org" "nntps://news.public-inbox.org" ]; description = lib.mdDoc "NNTP URLs to this public-inbox instance"; }; + options.pop3server = mkOption { + type = with types; listOf str; + default = []; + example = [ "pop.public-inbox.org" ]; + description = lib.mdDoc "POP3 URLs to this public-inbox instance"; + }; options.wwwlisting = mkOption { type = with types; enum [ "all" "404" "match=domain" ]; default = "404"; From 1b4bcd4d8abb4b58abfe67d4c376b44d9aae6c21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 13:20:44 +0000 Subject: [PATCH 36/38] jetty: 11.0.14 -> 11.0.15 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 876189343f23..0aa226e46658 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "11.0.14"; + version = "11.0.15"; src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - sha256 = "sha256-lmS9B5dXJAc9j/RVs2sqMRaj1C5CN2trTszUXfPfHI4="; + sha256 = "sha256-bDg3CYPAGryqRv/gcPdeZKucXx6YTkkNd0Cu1+zIjto="; }; dontBuild = true; From 6672ae61c1e054c679e9659f7cead4b56fa60b42 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 4 Jun 2023 09:41:38 -0400 Subject: [PATCH 37/38] hyperfine: 0.17.0 -> 1.17.0 Diff: https://github.com/sharkdp/hyperfine/compare/v0.17.0...v1.17.0 Changelog: https://github.com/sharkdp/hyperfine/blob/v1.17.0/CHANGELOG.md --- pkgs/tools/misc/hyperfine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 2acff9bb5ebd..e37033839c83 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "0.17.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "sharkdp"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IUjOklkEiy/U2HjjMt1X1uSpIkTAYOPiPQ+70xvvxKA="; }; - cargoHash = "sha256-cm6opZrdSEY4qsYQzgCJ8wx6iIIuytySWh3F3Roo/JQ="; + cargoHash = "sha256-VjkcQueBODEADHdWOts2f3Zjar43hi0UXzVhvkK4o8I="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin Security; From 21ed9b18f0021623ebb3eedc55a9a2972429ad1c Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 4 Jun 2023 22:42:37 +0800 Subject: [PATCH 38/38] gabutdm: 2.1.5 -> 2.1.6 --- pkgs/applications/networking/gabutdm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gabutdm/default.nix b/pkgs/applications/networking/gabutdm/default.nix index 11cde55344bf..6fbe0222112c 100644 --- a/pkgs/applications/networking/gabutdm/default.nix +++ b/pkgs/applications/networking/gabutdm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "gabutdm"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "gabutakut"; repo = pname; rev = version; - hash = "sha256-8fV7STYSpmNnLyoAjz+RuF/0nFeNiu8AIxkON1MbWr4="; + hash = "sha256-ai5LsoK21XwXqL4LRuKsOR1/JV6LnP+1ZJ9fMHpj178="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Simple and faster download manager"; + description = "Simple and fast download manager"; homepage = "https://github.com/gabutakut/gabutdm"; license = licenses.lgpl21Plus; mainProgram = "com.github.gabutakut.gabutdm";