From 930addba50d1f5447499c4eb9af9a1b938fa7dff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Mar 2024 13:40:21 +0000 Subject: [PATCH 01/58] python312Packages.textual-universal-directorytree: 1.1.0 -> 1.5.0 --- .../textual-universal-directorytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix index 0e9e3e6d002c..1c911d0795d1 100644 --- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix +++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "textual-universal-directorytree"; - version = "1.1.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "juftin"; repo = "textual-universal-directorytree"; rev = "refs/tags/v${version}"; - hash = "sha256-ncQ3IRaZaCv1rMUWT9dkUKo6OAEC5pziMCM7adIBGWo="; + hash = "sha256-hUig0aJWSS0FsgRIrs74/uVaQgH6tczJWO5rj6TVOvQ="; }; nativeBuildInputs = [ From 356aab4ceba7cafa5d374837b790573e822fcebd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jul 2024 02:11:53 +0000 Subject: [PATCH 02/58] php82Extensions.phalcon: 5.7.0 -> 5.8.0 --- pkgs/development/php-packages/phalcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index 86252ec028e0..b5d89ee6a0d2 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -9,13 +9,13 @@ buildPecl rec { pname = "phalcon"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-nckc7LPhXuUBJJvsqWEhH37K8fKdm9hIdkmVdiM3vcc="; + hash = "sha256-Jgl/sBWgP4N4rYloaGn78T6XWF/yTYYCsSC9Q6gD6Wg="; }; internalDeps = [ From 6266094e825c95395368331aa76d857909505a42 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 2 Aug 2024 16:15:03 -0700 Subject: [PATCH 03/58] pythonPackages.mako: disable broken tests in llvm --- pkgs/development/python-modules/jedi/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index a47398cb9ca3..ddc0caea5555 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -61,6 +61,14 @@ buildPythonPackage rec { ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" + ] + ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [ + # InvalidPythonEnvironment: The python binary is potentially unsafe. + "test_create_environment_executable" + # AssertionError: assert ['', '.1000000000000001'] == ['', '.1'] + "test_dict_keys_completions" + # AssertionError: assert ['', '.1000000000000001'] == ['', '.1'] + "test_dict_completion" ]; meta = with lib; { From 403ddc3beee04ed0230413b36173690553c84f36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 04:56:53 +0000 Subject: [PATCH 04/58] rain: 1.12.0 -> 1.15.0 --- pkgs/development/tools/rain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 91f5c0f6ab85..11e143dfda23 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.12.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oj9/xVbb8+J4g/ul2CEs5LH7OKJdEqTTZonCHVlDc7M="; + sha256 = "sha256-B+LSwZ1AugYhMlt1XcG8i8SIORO0vFMUxJrF6z3Crus="; }; - vendorHash = "sha256-NcM+SdIgqtSRg7Fcwml/V73qYHcowBdOtmuF7EMSBB8="; + vendorHash = "sha256-JTKoEuO3D+/MO7FeSu1tiVqERkQiu2nG/KiEth1ylG0="; subPackages = [ "cmd/rain" ]; From a0bda77e6a849d393fb8765bd2b95f57f4cf1000 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 26 Aug 2024 09:12:49 +0100 Subject: [PATCH 05/58] socat: 1.8.0.0 -> 1.8.0.1 Changes: http://www.dest-unreach.org/socat/CHANGES --- pkgs/tools/networking/socat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 58d33bc886f5..653f4b6e39a5 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.8.0.0"; + version = "1.8.0.1"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; - hash = "sha256-4d5oPdIu4OOmxrv/Jpq+GKsMnX62UCBPElFVuQBfrKc="; + hash = "sha256-aig1Zdt8+GKSxvcFBMWKuwPimIit7tWmxfNFfoA8G4E="; }; postPatch = '' From ab8a1f839c6ae8f06d8ff9b6d756b4e159471a75 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 23:06:55 +0200 Subject: [PATCH 06/58] scotch: 7.0.4 -> 7.0.5 Diff: https://gitlab.inria.fr/scotch/scotch/-/compare/v7.0.4...v7.0.5 --- pkgs/by-name/sc/scotch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 8455b4d22648..c06276883090 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "scotch"; repo = "scotch"; rev = "v${finalAttrs.version}"; - hash = "sha256-uaox4Q9pTF1r2BZjvnU2LE6XkZw3x9mGSKLdRVUobGU="; + hash = "sha256-XXkVwTr8cbYfzXWWkPERTmjfE86JHUUuU6yxjp9k6II="; }; nativeBuildInputs = [ From 84defedf7edec6803d632481cd9e0e2cd362350e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 23:17:21 +0200 Subject: [PATCH 07/58] scotch: split outputs --- pkgs/by-name/sc/scotch/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index c06276883090..62b4d917fa1f 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-XXkVwTr8cbYfzXWWkPERTmjfE86JHUUuU6yxjp9k6II="; }; + outputs = [ + "bin" + "dev" + "out" + ]; + nativeBuildInputs = [ cmake gfortran From 229f3bb6d7f2688adc6295fd18fc1b522167c592 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 23:18:48 +0200 Subject: [PATCH 08/58] scotch: shared libs --- pkgs/by-name/sc/scotch/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 62b4d917fa1f..e089a0666072 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + nativeBuildInputs = [ cmake gfortran From 981629a05b844bbfc775ac141c692e95fd6a61f7 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 27 Aug 2024 11:15:25 +0200 Subject: [PATCH 09/58] mumps: update scotch include dir --- pkgs/by-name/mu/mumps/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index a02d7901617e..17c005946f57 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ "LSCOTCHDIR=${scotch}/lib" - "ISCOTCH=-I${scotch}/include" + "ISCOTCH=-I${scotch.dev}/include" "LMETISDIR=${metis}/lib" "IMETIS=-I${metis}/include" "allshared" From 6bea9fece4985067988abd589b9f6f9a2ead6e7e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 29 Aug 2024 21:10:46 +0200 Subject: [PATCH 10/58] dart: 3.5.1 -> 3.5.2 --- pkgs/development/compilers/dart/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index c169f32f221f..9246628d0199 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.5.1"; in +let version = "3.5.2"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "18v73dr61033g0x27vb0fdjwyzc1d04fifmwwnv4157nfpb68ijc"; + sha256 = "0k1h7kbcagm7s0n8696lzws814rabz3491khd7z78mb3ivahxw35"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1vjsnwlkvsb0xvap45fdd81vdsjkpl2yxr8xh39v77dxbpybi0qh"; + sha256 = "036jw4qq3wicyfpamy7v6qsbrj0m7dyny45yzdgil4snvfagvfsv"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "0lwnvky3p37d81ib6qwxra7lxn19l5x30c7aycixd9yaslq1bc0v"; + sha256 = "1wm1157hbsms872pp1fkn0i3khz3h4r909bdvpk2rhag2l928f0a"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0zn2mw8awii0hrvyh146hb5604li0jgxxgavpi19zcdpnzdg6z7c"; + sha256 = "160dk1dpdzdh0pphmvdw7agavpyxniw8zf5w30yamkdi7r9g0l0b"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "11x7yyif51hyn8yi2lqbkfm3lfalkvh54v5pi851mfdnf14hsjpw"; + sha256 = "0nrgjdzc2skqc2b52pzw78056jqrqmiwzwwd9wh699dwwfnrjcf4"; }; } From dfa73af57d60a40fc1dc7e65513e2928f811e819 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 26 Aug 2024 23:27:37 -0400 Subject: [PATCH 11/58] temurin-bin: support riscv64-linux --- .../compilers/temurin-bin/generate-sources.py | 1 + .../compilers/temurin-bin/sources.json | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index f9e53e197c97..adeca0b73326 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -16,6 +16,7 @@ arch_to_nixos = { "aarch64": ("aarch64",), "arm": ("armv6l", "armv7l"), "ppc64le": ("powerpc64le",), + "riscv64": ("riscv64",), } def generate_sources(assets, feature_version, out): diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index fe24b9f5199c..23d7305ea774 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -302,6 +302,12 @@ "sha256": "aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz", "version": "17.0.11" + }, + "riscv64": { + "build": "7", + "sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk18": { @@ -414,6 +420,12 @@ "sha256": "fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340", "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz", "version": "21.0.3" + }, + "riscv64": { + "build": "7", + "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, "openjdk22": { @@ -436,6 +448,12 @@ "sha256": "e59c6bf801cc023a1ea78eceb5e6756277f1564cd0a421ea984efe6cb96cfcf8", "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz", "version": "22.0.1" + }, + "riscv64": { + "build": "9", + "sha256": "830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz", + "version": "22.0.2" } }, "openjdk8": { @@ -540,6 +558,12 @@ "sha256": "bcb1b7b8ad68c93093f09b591b7cb17161d39891f7d29d33a586f5a328603707", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz", "version": "17.0.11" + }, + "riscv64": { + "build": "7", + "sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk18": { @@ -652,6 +676,12 @@ "sha256": "f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d", "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz", "version": "21.0.3" + }, + "riscv64": { + "build": "7", + "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, "openjdk22": { @@ -674,6 +704,12 @@ "sha256": "154dbc7975cf765c59bdaa1e693d6c8b009635c9a182d6d6d9f0cfbec5317b4c", "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_linux_hotspot_22.0.1_8.tar.gz", "version": "22.0.1" + }, + "riscv64": { + "build": "9", + "sha256": "81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz", + "version": "22.0.2" } }, "openjdk8": { From 361379d6fa741e3ab64a905d9ff8127476446954 Mon Sep 17 00:00:00 2001 From: brokenpip3 Date: Fri, 6 Sep 2024 15:36:53 +0200 Subject: [PATCH 12/58] bats.libraries.bats-detik: fix 1.3.2 hash --- pkgs/development/interpreters/bats/libraries.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix index 3e17a931270e..b780bce13fd0 100644 --- a/pkgs/development/interpreters/bats/libraries.nix +++ b/pkgs/development/interpreters/bats/libraries.nix @@ -58,7 +58,7 @@ owner = "bats-core"; repo = "bats-detik"; rev = "v${finalAttrs.version}"; - hash = "sha256-Lz5BPKHtgdakKRALPZFFgz91d07Ubk5rUgA+Ep2aoG8="; + hash = "sha256-f8PN+VsUdUXrR9JiQgVuYDy2QgOtaxE8tkkxOUF0uC4="; }; dontBuild = true; installPhase = '' From 1e768b6903ead463ced282b436cfb7355987d2a5 Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sat, 7 Sep 2024 01:37:40 +0200 Subject: [PATCH 13/58] git-igitt: fix on Mac --- pkgs/by-name/gi/git-igitt/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix index f44d33f4f4ea..a8c281991686 100644 --- a/pkgs/by-name/gi/git-igitt/package.nix +++ b/pkgs/by-name/gi/git-igitt/package.nix @@ -6,6 +6,8 @@ libgit2, oniguruma, zlib, + stdenv, + darwin, nix-update-script, }: @@ -31,7 +33,7 @@ rustPlatform.buildRustPackage { libgit2 oniguruma zlib - ]; + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; From 9428f1ebee82e3c82e2403d224722d93577820e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 03:07:24 +0000 Subject: [PATCH 14/58] gemmi: 0.6.6 -> 0.6.7 --- pkgs/by-name/ge/gemmi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix index f574f30a9c85..d48e9b6ea9ac 100644 --- a/pkgs/by-name/ge/gemmi/package.nix +++ b/pkgs/by-name/ge/gemmi/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gemmi"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "project-gemmi"; repo = "gemmi"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-S31oCp6kLSYgmRaW7Q9/dMhjJ5Y0sK3WPpg2/ZMPyMg="; + hash = "sha256-Y7gQSh9C7smoXuGWgpJI3hPIg06Jns+1dBpmMxuCrKE="; }; nativeBuildInputs = From 558e682820a8a2439efe3cb2d61f389fec9d2482 Mon Sep 17 00:00:00 2001 From: Jack Foltz Date: Sat, 7 Sep 2024 03:15:36 -0400 Subject: [PATCH 15/58] factorio: 1.1.109 -> 1.1.110 https://wiki.factorio.com/Version_history/1.1.0#1.1.110 --- pkgs/games/factorio/versions.json | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 0e436ed4a741..60e88c026f9d 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.109.tar.xz", + "name": "factorio_alpha_x64-1.1.110.tar.xz", "needsAuth": true, - "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", + "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", + "version": "1.1.110" }, "stable": { - "name": "factorio_alpha_x64-1.1.109.tar.xz", + "name": "factorio_alpha_x64-1.1.110.tar.xz", "needsAuth": true, - "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", + "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", + "version": "1.1.110" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.109.tar.xz", + "name": "factorio_demo_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", + "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/demo/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" }, "stable": { - "name": "factorio_demo_x64-1.1.109.tar.xz", + "name": "factorio_demo_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", + "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/demo/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.109.tar.xz", + "name": "factorio_headless_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", + "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/headless/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/headless/linux64", + "version": "1.1.110" }, "stable": { - "name": "factorio_headless_x64-1.1.109.tar.xz", + "name": "factorio_headless_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", + "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/headless/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/headless/linux64", + "version": "1.1.110" } } } From 37cf9cbb22e43e3cc851c6a70033f2a6c39e544b Mon Sep 17 00:00:00 2001 From: phaer Date: Tue, 14 May 2024 00:41:32 +0200 Subject: [PATCH 16/58] security/dhparams: shellcheck fixes --- nixos/modules/security/dhparams.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 738062c95c47..c501ea70d05c 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -157,7 +157,7 @@ in { continue fi '') cfg.params)} - rm $file + rm "$file" done # TODO: Ideally this would be removing the *former* cfg.path, though From f6564dde2f9cf262c9ea7c8aef7ec31973252a40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 18:54:54 +0000 Subject: [PATCH 17/58] microsoft-edge: 128.0.2739.54 -> 128.0.2739.67 --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 2dee22ef74fe..3946aff88551 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "129.0.2792.12"; + version = "129.0.2792.21"; revision = "1"; - hash = "sha256-LWu5DKCoGSFqUZqgvKx3aoZRzAf6FR3hJnk/agAV9sI="; + hash = "sha256-NrDRroKyjY9zC9KoMWaEPAPnu+JNNDZwLVbuDvoUG1M="; }; dev = import ./browser.nix { channel = "dev"; - version = "129.0.2792.10"; + version = "130.0.2808.0"; revision = "1"; - hash = "sha256-jw/muaunLlrtZADrD7asVH+o/u3cp3NyvjRXqPWyHJI="; + hash = "sha256-6mqStxS9HJvfKbrGqQGlqQKXc2SnvOycirPihfnkaLI="; }; stable = import ./browser.nix { channel = "stable"; - version = "128.0.2739.54"; + version = "128.0.2739.67"; revision = "1"; - hash = "sha256-qiLZExLU3f6l+qPEGiqOuDgjqOtSyhPwSt7kQfBBSyg="; + hash = "sha256-Y8PxyAibuEhwKJpqnhtBy1F2Kn+ONw6NVtC25R+fFVo="; }; } From d27ff4322a6c365986a89a16e31011de811a350b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 10:29:51 +0000 Subject: [PATCH 18/58] morgen: 3.5.5 -> 3.5.6 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 5454eea2fd07..797a1ca2ea67 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-xT/mV54L2tXiQnUR7K/h61FsHtF16siEExM/I0mSy+8="; + hash = "sha256-knguIcvGCwlI83DIaX/EYt/15azMoxEWNtFIXYqLops="; }; nativeBuildInputs = [ From 4019f1156bec733cb2285a7fe768877d2450e440 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Fri, 6 Sep 2024 20:33:30 +0200 Subject: [PATCH 19/58] xdg-utils: remove mimi reasons for this change: - mimi is old and unmaintained - enabling mimiSupport currently does not build - if we really want this, we should probably add mimi in nixpkgs first and then use it as an input --- pkgs/tools/X11/xdg-utils/default.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 9d3274195977..5b3a1a5367c0 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -5,17 +5,9 @@ , resholve, bash, coreutils, dbus, file, gawk, glib, gnugrep, gnused, jq, nettools, procmail, procps, which, xdg-user-dirs , shared-mime-info , perl, perlPackages -, mimiSupport ? false , withXdgOpenUsePortalPatch ? true }: let - # A much better xdg-open - mimisrc = fetchFromGitHub { - owner = "march-linux"; - repo = "mimi"; - rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d"; - sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj"; - }; # Required by the common desktop detection code commonDeps = [ dbus coreutils gnugrep gnused ]; @@ -268,10 +260,6 @@ stdenv.mkDerivation (self: { # explicitly provide a runtime shell so patchShebangs is consistent across build platforms buildInputs = [ bash ]; - postInstall = lib.optionalString mimiSupport '' - cp ${mimisrc}/xdg-open $out/bin/xdg-open - ''; - preFixup = lib.concatStringsSep "\n" (map (resholve.phraseSolution "xdg-utils-resholved") solutions); passthru.tests.xdg-mime = runCommand "xdg-mime-test" { @@ -305,7 +293,7 @@ stdenv.mkDerivation (self: { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "Set of command line tools that assist applications with a variety of desktop integration tasks"; - license = if mimiSupport then licenses.gpl2Only else licenses.mit; + license = licenses.mit; maintainers = [ ]; platforms = platforms.all; }; From c4043f3ad5b0b64445f1cebc61de8524992698bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:43:20 +0000 Subject: [PATCH 20/58] typescript: 5.5.4 -> 5.6.2 --- pkgs/development/compilers/typescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index 9cf8cb530cda..513f8a99180f 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.5.4"; + version = "5.6.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-U4lFR2SJQYqJYptVf3/QMD7ufa3r7Zm704gcwFKM/7s="; + hash = "sha256-aomoO/1E7zdhRNTCKqbA7ktor03zjg5HZXPxhH8iris="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-JYNFAOTN0WvYkr20J6tFM1KSIDTm1LlFw7w1bLkdg6k="; + npmDepsHash = "sha256-I44XhQzUsbf6Q4r2o40l9qBU8FMRZuYhb7dLVvFDyJc="; passthru.tests = { version = testers.testVersion { From 1ba931d6e74482bf51b74a073e7702b465380acc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 17:58:59 +0000 Subject: [PATCH 21/58] netpbm: 11.7.0 -> 11.7.1 --- pkgs/tools/graphics/netpbm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 8ad43c0326c0..bbd24d056bdb 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.7.0"; + version = "11.7.1"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4925"; - sha256 = "Y6o/9nq9ICqlKCDh59eiT38CZ+cfB1ezb8arF0uBYsk="; + rev = "4932"; + sha256 = "bmPqUPOlkQ0vKim+t8ct2ErFU4uWw6L5foODGWrrExs="; }; nativeBuildInputs = [ From ae1c373082b167ddae9e93b3392952b39ac7089e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 10 Sep 2024 21:39:52 +0100 Subject: [PATCH 22/58] nano: 8.1 -> 8.2 Changes: https://lists.gnu.org/archive/html/info-gnu/2024-09/msg00001.html --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index e2defc9f8325..432d297aea5e 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "8.1"; + version = "8.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - hash = "sha256-k7Pj6RVa44n+nM+ct6s4DqwpYCg1ujB3si9k0PDL6Ms="; + hash = "sha256-1a0H3YYvrK4DBRxUxlNeVMftdAcxh4P8rRrS1wdv/+s="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; From 77b1adaa62635608635c229420bdc8e9876c949f Mon Sep 17 00:00:00 2001 From: Josh Heinrichs Date: Tue, 10 Sep 2024 14:55:41 -0600 Subject: [PATCH 23/58] libgee, libgda, zile: fix compiling with clang -Wno-incompatible-function-pointer-types was removed from vala's setup hook in b2d88d4. Without it, we're unable to compile libgee[1], libgda, and zile on Darwin. The libgda and zile failures were masked by libgee failing. [1]: https://hydra.nixos.org/build/271035513 --- pkgs/applications/editors/zile/default.nix | 2 ++ pkgs/development/libraries/libgda/6.x.nix | 2 ++ pkgs/development/libraries/libgda/default.nix | 2 ++ pkgs/development/libraries/libgee/default.nix | 1 + 4 files changed, 7 insertions(+) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index bafb1aa30385..b7d7099a3472 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # fiddle with the terminal. doCheck = false; + env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. gl_cv_func_fstatat_zero_flag="yes"; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index 1f551ec9b4b1..af05b23080eb 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -85,6 +85,8 @@ stdenv.mkDerivation rec { postgresql ]; + env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + postPatch = '' patchShebangs \ providers/raw_spec.py \ diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 1ef0a397c8e7..aa136ed0adbd 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -82,6 +82,8 @@ stdenv.mkDerivation rec { "--enable-system-sqlite=${if stdenv.isDarwin then "no" else "yes"}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + enableParallelBuilding = true; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 0ae1886ebb62..4cbaf916897c 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; env = { + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; }; From 6665ee1b5031e2568266300ae28f86d60c4877f9 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 10 Sep 2024 15:07:32 +0800 Subject: [PATCH 24/58] jogger: init at 1.2.4-unstable-2024-04-05 --- pkgs/by-name/jo/jogger/package.nix | 72 ++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 pkgs/by-name/jo/jogger/package.nix diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix new file mode 100644 index 000000000000..465e5478ff2c --- /dev/null +++ b/pkgs/by-name/jo/jogger/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitea, + rustPlatform, + meson, + ninja, + pkg-config, + cargo, + rustc, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + libshumate, + alsa-lib, + espeak, + sqlite, + glib-networking, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jogger"; + version = "1.2.4-unstable-2024-04-05"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "baarkerlounger"; + repo = "jogger"; + rev = "09386b9503a9b996b86ea4638268403868b24d6a"; + hash = "sha256-oGjqYRHkYk22/RzDc5c0066SlOPGRGC6z/BTn1DM03o="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname version src; + hash = "sha256-+8mMJgLHLUdFLOwjhXolHcVUP+s/j6PlWeRh8sGRYTc="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + cargo + rustc + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + libshumate + alsa-lib + espeak + sqlite + glib-networking + ]; + + meta = { + description = "App for Gnome Mobile to Track running and other workouts"; + homepage = "https://codeberg.org/baarkerlounger/jogger"; + license = with lib.licenses; [ + gpl3Plus + cc0 + ]; + mainProgram = "jogger"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) From aeaf865ea991a0ee4c1699d7b65ae47f8cbe29c8 Mon Sep 17 00:00:00 2001 From: Hentioe Date: Wed, 11 Sep 2024 21:58:05 +0800 Subject: [PATCH 25/58] graphicsmagick: add heif support --- pkgs/by-name/gr/graphicsmagick/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index 1bed406de757..5a449d959f75 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -14,6 +14,7 @@ , libtool , libwebp , libxml2 +, libheifSupport ? true, libheif , nukeReferences , pkg-config , quantumdepth ? 8 @@ -47,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { libwebp libxml2 zlib - ]; + ] ++ lib.optionals libheifSupport [ libheif ]; nativeBuildInputs = [ nukeReferences From 0b85766161e1c245c23f10a32bed17e1a3499dae Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 10 Sep 2024 12:29:37 +0200 Subject: [PATCH 26/58] yosys: 0.44 -> 0.45 https://github.com/YosysHQ/yosys/releases/tag/0.45 --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index a312114e6abd..43e941824fa7 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -75,13 +75,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.44"; + version = "0.45"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "refs/tags/yosys-${finalAttrs.version}"; - hash = "sha256-aMVWmryMbVlEm1RNj1ENpLHOpuKRQTJMFZCn+WuaR04="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-NF4NQ7mCfARuMsMTJVBbJk39puJ8+D41woYEPgthfUI="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' From dd32ffd55c629def8bb4d013b4f3779d0418fcd1 Mon Sep 17 00:00:00 2001 From: Spencer Heywood Date: Wed, 11 Sep 2024 14:24:17 -0600 Subject: [PATCH 27/58] beeper-bridge-manager: fix styling and typo --- pkgs/by-name/be/beeper-bridge-manager/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index d138e5de0e2e..3beaa9cfc512 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -17,11 +17,11 @@ buildGoModule rec { vendorHash = "sha256-uz4pao8Y/Sb3fffi9d0lbWQEUMohbthA6t6k6PfQz2M="; meta = { - description = "Tool for running self-hosted bridges with the Beeper Matrix server. "; + description = "Tool for running self-hosted bridges with the Beeper Matrix server."; homepage = "https://github.com/beeper/bridge-manager"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.heywoodlh ]; mainProgram = "bbctl"; - changelog = "https://github.com/beeper/bridge-manager/releases/tag/v{version}"; + changelog = "https://github.com/beeper/bridge-manager/releases/tag/v${version}"; }; } From 62b76687631bd3052bd7f06a2ad08179d87d9f60 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 25 Aug 2024 11:25:18 +0200 Subject: [PATCH 28/58] python311Packages.tensorflow-probability: 0.21.0 -> 0.24.0 Diff: https://github.com/tensorflow/probability/compare/v0.21.0...v0.24.0 Changelog: https://github.com/tensorflow/probability/releases/tag/v0.24.0 --- .../tensorflow-probability/default.nix | 72 +++++++++++-------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 587f6b683a7d..dd80ee581ee6 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,34 +1,45 @@ { lib, stdenv, - fetchFromGitHub, - bazel_6, + + # bazel wheel buildBazelPackage, - buildPythonPackage, - cctools, + fetchFromGitHub, + + # nativeBuildInputs python, setuptools, wheel, absl-py, - tensorflow, - six, - numpy, - dm-tree, - keras, - decorator, + + bazel_6, + cctools, + + # python package + buildPythonPackage, + + # dependencies cloudpickle, + decorator, + dm-tree, gast, + keras, + numpy, + six, + tensorflow, + + # tests hypothesis, - scipy, - pandas, - mpmath, matplotlib, mock, + mpmath, + pandas, pytest, + scipy, }: let - version = "0.21.0"; + version = "0.24.0"; pname = "tensorflow-probability"; # first build all binaries and generate setup.py using bazel @@ -38,15 +49,15 @@ let owner = "tensorflow"; repo = "probability"; rev = "refs/tags/v${version}"; - hash = "sha256-DsJd1E5n86xNS7Ci0DXxoUxQ9jH8OwTZq2UuLlQtMUU="; + hash = "sha256-V6aw4NtGOHlvcbgLWMH29x81eck1PyzV93ANelvpL4c="; }; nativeBuildInputs = [ + absl-py # needed to create the output wheel in installPhase python setuptools - wheel - absl-py tensorflow + wheel ]; bazel = bazel_6; @@ -83,27 +94,27 @@ buildPythonPackage { src = bazel-wheel; - propagatedBuildInputs = [ - tensorflow - six - numpy - decorator + dependencies = [ cloudpickle - gast + decorator dm-tree + gast keras + numpy + six + tensorflow ]; # Listed here: # https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83 nativeCheckInputs = [ hypothesis - pytest - scipy - pandas - mpmath matplotlib mock + mpmath + pandas + pytest + scipy ]; # Ideally, we run unit tests with pytest, but in checkPhase, only the Bazel-build wheel is available. @@ -114,10 +125,11 @@ buildPythonPackage { # sanity check pythonImportsCheck = [ "tensorflow_probability" ]; - meta = with lib; { + meta = { description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/tensorflow/probability/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 6a65627a05be25ff0091b38d845b32f92a4b83d6 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:02:44 +0530 Subject: [PATCH 29/58] louvre: 2.2.0-1 -> 2.9.0-1 --- pkgs/by-name/lo/louvre/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 668e1e2d1a25..28e0c17d2d23 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -22,16 +22,22 @@ }: stdenv.mkDerivation (self: { pname = "louvre"; - version = "2.2.0-1"; - rev = "v${self.version}"; - hash = "sha256-Ds1TTxHFq0Z88djdpAunhtKAipOCTodKIKOh5oxF568="; + version = "2.9.0-1"; src = fetchFromGitHub { - inherit (self) rev hash; owner = "CuarzoSoftware"; repo = "Louvre"; + rev = "v${self.version}"; + hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U="; }; + sourceRoot = "${self.src.name}/src"; + + postPatch = '' + substituteInPlace examples/meson.build \ + --replace-fail "/usr/local/share/wayland-sessions" "${placeholder "out"}/share/wayland-sessions" + ''; + nativeBuildInputs = [ meson ninja @@ -58,11 +64,6 @@ stdenv.mkDerivation (self: { outputs = [ "out" "dev" ]; - preConfigure = '' - # The root meson.build file is in src/ - cd src - ''; - meta = { description = "C++ library for building Wayland compositors"; homepage = "https://github.com/CuarzoSoftware/Louvre"; From dce85e24f87730c6400486bd5c78f435634e04e9 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:04:46 +0530 Subject: [PATCH 30/58] louvre: add update script cleanup --- pkgs/by-name/lo/louvre/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 28e0c17d2d23..1852a7dc3990 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -19,19 +19,20 @@ , udev , wayland , xorgproto +, nix-update-script }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "louvre"; version = "2.9.0-1"; src = fetchFromGitHub { owner = "CuarzoSoftware"; repo = "Louvre"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U="; }; - sourceRoot = "${self.src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' substituteInPlace examples/meson.build \ @@ -64,6 +65,10 @@ stdenv.mkDerivation (self: { outputs = [ "out" "dev" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "C++ library for building Wayland compositors"; homepage = "https://github.com/CuarzoSoftware/Louvre"; From 007bae199446601f1828adac0e580bdca100a1b1 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 12 Sep 2024 11:17:26 +0530 Subject: [PATCH 31/58] flyctl: 0.2.125 -> 0.3.1 Changes: https://github.com/superfly/flyctl/releases/tag/v0.3.1 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index ba55fc5bda7f..90351bc317b5 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.125"; + version = "0.3.1"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-7jMti/NShvo6T3JLzRM9FKqRXkgS8jeUitZq5SU4sHE="; + hash = "sha256-5P6B52ekrAupoQh2K3LhC4ydwuKOTPfpjOVlGiDxQb0="; }; - vendorHash = "sha256-uYGOXXeNfe2rYtJh2ggNv2TbVJul4RbiBQ1KSbEjqW8="; + vendorHash = "sha256-QfequNmKLbZqMKcwhRXKaTflQYWKu8ucjaGcBM7Jn6g="; subPackages = [ "." ]; From 0eb5526b69c0bad0a3795308cd7d4ba7c93284ae Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 11 Sep 2024 07:39:52 +0000 Subject: [PATCH 32/58] ollama: don't build llama.cpp twice buildGoModules runs preBuild hooks in the module download fixed-output derivation, so llama.cpp got built and immediately discarded, to then immediately be built again for the actual Go build. --- pkgs/by-name/ol/ollama/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index cb00def2cbfd..c8bc1cf0d2f9 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -181,6 +181,14 @@ goBuild ( # replace inaccurate version number with actual release version substituteInPlace version/version.go --replace-fail 0.0.0 '${version}' ''; + + overrideModAttrs = ( + finalAttrs: prevAttrs: { + # don't run llama.cpp build in the module fetch phase + preBuild = ""; + } + ); + preBuild = '' # disable uses of `git`, since nix removes the git directory export OLLAMA_SKIP_PATCHING=true From ee0753f986855808d69bda58452c335599eff6a9 Mon Sep 17 00:00:00 2001 From: casaca24 Date: Thu, 12 Sep 2024 01:12:17 -0600 Subject: [PATCH 33/58] got: 0.102 -> 0.103 --- pkgs/by-name/go/got/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 942e758972ff..29931498ccaf 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -27,11 +27,11 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "got"; - version = "0.102"; + version = "0.103"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-qstQ6mZLCdYL5uQauMt7nGlEdPkPneGfu36RbaboN3c="; + hash = "sha256-MkBek/NTpU+rylSS5abFQl8Vm3phRFCQkpnI3INJKHg="; }; nativeBuildInputs = [ pkg-config bison ] From 5db909d4272322eb6ca056f703913f390f674675 Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 12 Sep 2024 06:29:20 +0000 Subject: [PATCH 34/58] ollama: apply llama.cpp patches in postPatch This removes the absurd mechanism introduced to jam them into the patches attribute, along with the pointless busywork of updating the list of patches and their hashes on every release. --- pkgs/by-name/ol/ollama/package.nix | 31 ++++++------------------------ 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index c8bc1cf0d2f9..8519d7cd1287 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -2,7 +2,6 @@ lib, buildGoModule, fetchFromGitHub, - fetchpatch, buildEnv, linkFarm, overrideCC, @@ -52,28 +51,6 @@ let vendorHash = "sha256-hSxcREAujhvzHVNwnRTfhi0MKI3s8HNavER2VLz6SYk="; - # ollama's patches of llama.cpp's example server - # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" - # each update, these patches should be synchronized with the contents of `ollama/llm/patches/` - llamacppPatches = [ - (preparePatch "01-load-progress.diff" "sha256-UTmnBS5hQjIL3eXDZc8RBDNJunLlkqJWH20LpXNiGRQ=") - (preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=") - (preparePatch "03-load_exception.diff" "sha256-NJkT/k8Mf8HcEMb0XkaLmyUNKV3T+384JRPnmwDI/sk=") - (preparePatch "04-metal.diff" "sha256-bPBCfoT3EjZPjWKfCzh0pnCUbM/fGTj37yOaQr+QxQ4=") - (preparePatch "05-default-pretokenizer.diff" "sha256-mxqHnDbiy8yfKFUYryNTj/xay/lx9KDiZAiekFSkxr8=") - (preparePatch "06-embeddings.diff" "sha256-+4yAEAX1JJenOksG2OxDCwiLEoLj1glJQLIgV08BI5Q=") - (preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=") - ]; - - preparePatch = - patch: hash: - fetchpatch { - url = "file://${src}/llm/patches/${patch}"; - inherit hash; - stripLen = 1; - extraPrefix = "llm/llama.cpp/"; - }; - validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [ "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, " "but they are mutually exclusive; falling back to cpu" @@ -174,12 +151,16 @@ goBuild ( # disable uses of `git` in the `go generate` script # ollama's build script assumes the source is a git repo, but nix removes the git directory # this also disables necessary patches contained in `ollama/llm/patches/` - # those patches are added to `llamacppPatches`, and reapplied here in the patch phase + # those patches are applied in `postPatch` ./disable-git.patch - ] ++ llamacppPatches; + ]; + postPatch = '' # replace inaccurate version number with actual release version substituteInPlace version/version.go --replace-fail 0.0.0 '${version}' + + # apply llama.cpp patches + for cur in llm/patches/*; do patch -p1 -d llm/llama.cpp < $cur; done ''; overrideModAttrs = ( From 5c6429c20e7eee3f1c6dfd46df0653858df950c7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 Sep 2024 13:17:57 +0200 Subject: [PATCH 35/58] qt6Packages.waylib: Fix build --- pkgs/development/libraries/waylib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix index 1cc5332cf777..15ece6b3b01b 100644 --- a/pkgs/development/libraries/waylib/default.nix +++ b/pkgs/development/libraries/waylib/default.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation (finalAttrs: { "${nixos-artwork.wallpapers.simple-blue}/share/backgrounds/nixos/nix-wallpaper-simple-blue.png" ''; + depsBuildBuild = [ + # To find wayland-scanner + pkg-config + ]; + nativeBuildInputs = [ cmake pkg-config From 651e55cbe0d069c23e825036a4368a28391b7294 Mon Sep 17 00:00:00 2001 From: Connor Meehan Date: Mon, 20 May 2024 13:11:36 +1000 Subject: [PATCH 36/58] zinit: Fixes missing man pages --- pkgs/shells/zsh/zinit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix index c226b5565451..b94619bff7ce 100644 --- a/pkgs/shells/zsh/zinit/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -24,6 +24,8 @@ stdenvNoCC.mkDerivation rec { install -m0644 zinit{,-side,-install,-autoload}.zsh "$outdir" install -m0755 share/git-process-output.zsh "$outdir" + installManPage doc/zinit.1 + # Zplugin autocompletion installShellCompletion --zsh _zinit From fd693b3fd2541b2a2f0eb6d9579ab5f63d4e6212 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Sep 2024 09:05:28 +0200 Subject: [PATCH 37/58] python3Packages.desktop-notifier: 5.0.1 -> 6.0.0 --- .../python-modules/desktop-notifier/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index fd502d99eef9..a6260c35ad5f 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -4,31 +4,35 @@ fetchFromGitHub, pythonOlder, stdenv, + bidict, packaging, setuptools, - dbus-next, + dbus-fast, rubicon-objc, }: buildPythonPackage rec { pname = "desktop-notifier"; - version = "5.0.1"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; - repo = pname; + repo = "desktop-notifier"; rev = "refs/tags/v${version}"; - hash = "sha256-A+25T0xgUcE1NaOKNZgeP80VlEmqa137YGn3g/pwpxM="; + hash = "sha256-HynREkiPxv/1y1/ICVwqANIe9tAkIvdpDy4oXxQarec="; }; build-system = [ setuptools ]; dependencies = - [ packaging ] - ++ lib.optionals stdenv.isLinux [ dbus-next ] + [ + bidict + packaging + ] + ++ lib.optionals stdenv.isLinux [ dbus-fast ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ]; # no tests available, do the imports check instead From 6ed3573417ae66774e614bd4f414d8da04f4cea4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Sep 2024 16:48:28 +0200 Subject: [PATCH 38/58] python312Packages.noise: refactor --- .../python-modules/noise/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix index 940447c711a8..fc00d09f8033 100644 --- a/pkgs/development/python-modules/noise/default.nix +++ b/pkgs/development/python-modules/noise/default.nix @@ -2,22 +2,33 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "noise"; version = "1.2.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; + hash = "sha256-V6J5dDZXQ5H/Y6ER6FLlOkFk7Nga0jY5ZBdDzRogm2U="; }; + build-system = [ setuptools ]; + + # PyPI release don't contain tests + doCheck = false; + + pythonImportsCheck = [ "noise" ]; + meta = with lib; { - homepage = "https://github.com/caseman/noise"; description = "Native-code and shader implementations of Perlin noise"; + homepage = "https://github.com/caseman/noise"; license = licenses.mit; - platforms = platforms.all; + maintainers = [ ]; }; } From c23a4e8fd03a723f9e55f13d5ca444fd969232fb Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 12 Sep 2024 23:18:24 +0800 Subject: [PATCH 39/58] cozy: fix build --- pkgs/applications/audio/cozy/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index 677789346087..22ebd11c7725 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -24,6 +24,14 @@ python3Packages.buildPythonApplication rec { hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw"; }; + # FIX: The "Support Debian non-standard python paths" resolves to store path of python + postPatch = '' + substituteInPlace meson.build \ + --replace-fail \ + 'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=""))' \ + "print(\"$out/${python3Packages.python.sitePackages}\")" + ''; + nativeBuildInputs = [ meson ninja From ee9a447348c43ae2eb54eda3decdc6fe4ff9ebdf Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:16:30 +0200 Subject: [PATCH 40/58] python311Packages.python-octaviaclient: 3.7.0 -> 3.8.0 https://github.com/openstack/python-octaviaclient/compare/3.7.0...3.8.0 --- .../python-modules/python-octaviaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix index 7b9017618e8f..5c671398eed5 100644 --- a/pkgs/development/python-modules/python-octaviaclient/default.nix +++ b/pkgs/development/python-modules/python-octaviaclient/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "python-octaviaclient"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wAGxByeRBOwdWZg2DwVpt1yGi5er3KQ/qhyRVAwaKe4="; + hash = "sha256-wrYhCY3gqcklSK8lapsgFq25Yi3awEGgarW2a7W1kO4="; }; build-system = [ From 085f08d4f2692f40aa69a7cb56166ee09d66dc68 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:17:35 +0200 Subject: [PATCH 41/58] python311Packages.tempest: 39.0.0 -> 4.0.0 https://github.com/openstack/tempest/compare/39.0.0...40.0.0 --- pkgs/development/python-modules/tempest/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 77326c7152c1..4f9e0190256f 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -28,25 +28,26 @@ bash, python, setuptools, + testscenarios, }: buildPythonPackage rec { pname = "tempest"; - version = "39.0.0"; + version = "40.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-l4qKbTfQRWiRsoHN9fiAAiGMGP+q3gwRH1pMSXV/eSU="; + hash = "sha256-s2EvD1TDoRoKrvpRc6h3P7xRyT941nW1hveucXDLB4w="; }; pythonRelaxDeps = [ "defusedxml" ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pbr cliff defusedxml @@ -67,6 +68,7 @@ buildPythonPackage rec { prettytable urllib3 debtcollector + testscenarios ]; nativeCheckInputs = [ From 846b1292a4854e718bbffb6f1c2174837e5ae7f5 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:20:05 +0200 Subject: [PATCH 42/58] python311Packages.tempest: add meta.mainProgram --- pkgs/development/python-modules/tempest/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 4f9e0190256f..deca557f448e 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { description = "OpenStack integration test suite that runs against live OpenStack cluster and validates an OpenStack deployment"; homepage = "https://github.com/openstack/tempest"; license = licenses.asl20; + mainProgram = "tempest"; maintainers = teams.openstack.members; }; } From 3d218ab359393e3b03b3732191ef3658d3451842 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:20:43 +0200 Subject: [PATCH 43/58] python311Packages.tempest: reorder inputs --- .../python-modules/tempest/default.nix | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index deca557f448e..fcae826816fb 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -1,34 +1,34 @@ { lib, + bash, buildPythonPackage, + cliff, + debtcollector, defusedxml, fetchPypi, - pbr, - cliff, + fixtures, + hacking, jsonschema, - testtools, - paramiko, netaddr, oslo-concurrency, oslo-config, oslo-log, - stestr, oslo-serialization, oslo-utils, - fixtures, + oslotest, + paramiko, + pbr, + prettytable, + python, pythonOlder, pyyaml, - subunit, - stevedore, - prettytable, - urllib3, - debtcollector, - hacking, - oslotest, - bash, - python, setuptools, + stestr, + stevedore, + subunit, testscenarios, + testtools, + urllib3, }: buildPythonPackage rec { @@ -48,33 +48,33 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - pbr cliff + debtcollector defusedxml + fixtures jsonschema - testtools - paramiko netaddr oslo-concurrency oslo-config oslo-log - stestr oslo-serialization oslo-utils - fixtures - pyyaml - subunit - stevedore + paramiko + pbr prettytable - urllib3 - debtcollector + pyyaml + stestr + stevedore + subunit testscenarios + testtools + urllib3 ]; nativeCheckInputs = [ - stestr hacking oslotest + stestr ]; checkPhase = '' From aba2d9e6ee6e9407f70243004ae931f95e01ddd6 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:25:47 +0200 Subject: [PATCH 44/58] python311Packages.osprofiler: 4.1.0 -> 4.2.0 https://github.com/openstack/osprofiler/compare/4.1.0...4.2.0 --- pkgs/development/python-modules/osprofiler/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix index 546d7e5fedf6..efcf777fd8a0 100644 --- a/pkgs/development/python-modules/osprofiler/default.nix +++ b/pkgs/development/python-modules/osprofiler/default.nix @@ -4,6 +4,7 @@ fetchPypi, netaddr, oslo-concurrency, + oslo-config, oslo-serialization, oslo-utils, prettytable, @@ -14,12 +15,12 @@ buildPythonPackage rec { pname = "osprofiler"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-V4N7YgWBsTREouIFZHddT8c+/2fHiIr5mUftWC/lFLA="; + hash = "sha256-bdHEviZFqPJBIQVdpbtGFojcr8fmtNS6vA7xumaQJ4E="; }; build-system = [ setuptools ]; @@ -27,6 +28,7 @@ buildPythonPackage rec { dependencies = [ netaddr oslo-concurrency + oslo-config oslo-serialization oslo-utils prettytable From 008e8512579bd1e5b2b86b8d9d61ef2d0866f8c3 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:27:06 +0200 Subject: [PATCH 45/58] python311Packages.osprofiler: add meta.mainProgram --- pkgs/development/python-modules/osprofiler/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix index efcf777fd8a0..01c8c09f1c15 100644 --- a/pkgs/development/python-modules/osprofiler/default.nix +++ b/pkgs/development/python-modules/osprofiler/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { description = "OpenStack Library to profile request between all involved services"; homepage = "https://opendev.org/openstack/osprofiler/"; license = licenses.asl20; + mainProgram = "osprofiler"; maintainers = teams.openstack.members; }; } From 64f6ecc725d0369579294906e333af82c2d13f59 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:27:41 +0200 Subject: [PATCH 46/58] python311Packages.python-openstackclient: 7.0.0 -> 7.1.0 https://github.com/openstack/python-openstackclient/compare/7.0.0...7.1.0 --- .../python-modules/python-openstackclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index dcc7464297e8..3a1a3a56ae95 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "7.0.0"; + version = "7.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1HDjWYySnZI/12j9+Gb1G9NKkb+xfrcMoTY/q7aL0uA="; + hash = "sha256-nv/CmcVpQiC65Fd3jmzZsjrqG8O/zQTjoE+NhjhaBVQ="; }; build-system = [ From 68bf1f1208b0e793f1770111a48dad35b7735634 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:28:52 +0200 Subject: [PATCH 47/58] python311Packages.swift: 2.33.0 -> 2.34.0 https://github.com/openstack/swift/compare/2.33.0...2.34.0 --- .../python-modules/swift/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index ddcecdb3e6b3..26806dea71a8 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "swift"; - version = "2.33.0"; - format = "setuptools"; + version = "2.34.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4TlJcquK8MC9zQfLKmb88B5xHje1kbPD2jSLiR+N8hs="; + hash = "sha256-ZvdWWvPUdZIEadxV0nhqgTXhgJJu+hD1LnYCAP+9gpM="; }; postPatch = '' @@ -38,9 +38,11 @@ buildPythonPackage rec { rm test/functional/s3api/{__init__.py,s3_test_client.py} ''; - nativeBuildInputs = [ - installShellFiles + nativeBuildInputs = [ installShellFiles ]; + + build-system = [ pbr + setuptools ]; propagatedBuildInputs = [ @@ -57,17 +59,17 @@ buildPythonPackage rec { xattr ]; - postInstall = '' - installManPage doc/manpages/* - ''; - - nativeCheckInputs = [ + dependencies = [ boto3 mock stestr swiftclient ]; + postInstall = '' + installManPage doc/manpages/* + ''; + # a lot of tests currently fail while establishing a connection doCheck = false; From 06fc8aa4dc99aa1387566ffee212f2b27bb5c6bf Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 23 Aug 2024 14:17:17 -0400 Subject: [PATCH 48/58] python312Packages.itk: init at 5.4.0 --- pkgs/development/libraries/itk/generic.nix | 124 ++++++++++++++------ pkgs/development/libraries/itk/itk.egg-info | 5 + pkgs/top-level/python-packages.nix | 8 +- 3 files changed, 103 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/libraries/itk/itk.egg-info diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index b7ff7292dc23..7ac9d6d8fbfe 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -10,6 +10,8 @@ fetchFromGitHub, fetchpatch, cmake, + castxml, + swig, expat, fftw, gdcm, @@ -20,13 +22,21 @@ libpng, libX11, libuuid, + patchelf, + python ? null, + numpy ? null, xz, vtk, + which, zlib, Cocoa, + enablePython ? false, }: let + # Python wrapper contains its own VTK support incompatible with MODULE_ITKVtkGlue + withVtk = !enablePython; + itkGenericLabelInterpolatorSrc = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITKGenericLabelInterpolator"; @@ -47,6 +57,19 @@ let rev = "bb896868fc6480835495d0da4356d5db009592a6"; hash = "sha256-MfaIA0xxA/pzUBSwnAevr17iR23Bo5iQO2cSyknS3o4="; }; + + # remove after next swig update: + swigUnstable = swig.overrideAttrs ({ + version = "4.2.1-unstable-2024-08-19"; + + src = fetchFromGitHub { + owner = "swig"; + repo = "swig"; + rev = "5ac5d90f970759fbe705fae551d0743a7c63c67e"; + hash = "sha256-32EFLHpP4l04nqrc8dt4Qsr8deTBqLt8lUlhnNnaIGU="; + }; + + }); in stdenv.mkDerivation { @@ -77,39 +100,56 @@ stdenv.mkDerivation { ln -sr ${itkSimpleITKFiltersSrc} Modules/External/ITKSimpleITKFilters ''; - cmakeFlags = [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_SHARED_LIBS=ON" - "-DITK_FORBID_DOWNLOADS=ON" - "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc. - # note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES, - # causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory" - # when compiling c3d, but maybe an ITK 5.2/eigen version issue: - "-DITK_USE_SYSTEM_EIGEN=OFF" - "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489 - "-DITK_USE_SYSTEM_GDCM=ON" - "-DITK_USE_SYSTEM_MINC=ON" - "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DModule_ITKMINC=ON" - "-DModule_ITKIOMINC=ON" - "-DModule_ITKIOTransformMINC=ON" - "-DModule_SimpleITKFilters=ON" - "-DModule_ITKVtkGlue=ON" - "-DModule_ITKReview=ON" - "-DModule_MGHIO=ON" - "-DModule_AdaptiveDenoising=ON" - "-DModule_GenericLabelInterpolator=ON" - ]; + cmakeFlags = + [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DITK_FORBID_DOWNLOADS=ON" + "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc. + # note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES, + # causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory" + # when compiling c3d, but maybe an ITK 5.2/eigen version issue: + "-DITK_USE_SYSTEM_EIGEN=OFF" + "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489 + "-DITK_USE_SYSTEM_GDCM=ON" + "-DITK_USE_SYSTEM_MINC=ON" + "-DLIBMINC_DIR=${libminc}/lib/cmake" + "-DModule_ITKMINC=ON" + "-DModule_ITKIOMINC=ON" + "-DModule_ITKIOTransformMINC=ON" + "-DModule_SimpleITKFilters=ON" + "-DModule_ITKReview=ON" + "-DModule_MGHIO=ON" + "-DModule_AdaptiveDenoising=ON" + "-DModule_GenericLabelInterpolator=ON" + ] + ++ lib.optionals enablePython [ + "-DITK_WRAP_PYTHON=ON" + "-DITK_USE_SYSTEM_CASTXML=ON" + "-DITK_USE_SYSTEM_SWIG=ON" + "-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}" + ] + ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ]; - nativeBuildInputs = [ - cmake - xz - ]; - buildInputs = [ - libX11 - libuuid - vtk - ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = + [ + cmake + xz + ] + ++ lib.optionals enablePython [ + castxml + swigUnstable + which + ]; + + buildInputs = + [ + libX11 + libuuid + ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ] + ++ lib.optionals enablePython [ python ] + ++ lib.optionals withVtk [ vtk ]; # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 # (specifically libGL and libX11 on Linux), # it's now seemingly necessary for packages that configure ITK to @@ -130,12 +170,30 @@ stdenv.mkDerivation { libpng libtiff zlib - ] ++ vtk.propagatedBuildInputs; + ] ++ lib.optionals withVtk vtk.propagatedBuildInputs ++ lib.optionals enablePython [ numpy ]; + + postInstall = lib.optionalString enablePython '' + substitute \ + ${./itk.egg-info} \ + $out/${python.sitePackages}/itk-${version}.egg-info \ + --subst-var-by ITK_VER "${version}" + ''; + + # remove forbidden reference to /build which occur when building the Python wrapping + # (also remove a copy of itkTestDriver with incorrect permissions/RPATH): + preFixup = lib.optionals enablePython '' + rm $out/${python.sitePackages}/itk/itkTestDriver + find $out/${python.sitePackages}/itk -type f -name '*.so*' -exec \ + patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \; + ''; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = "https://www.itk.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; + # aarch64-linux Python wrapping fails with "error: unknown type name '_Float128'" and similar; + # compilation runs slowly and times out on Darwin + platforms = with lib.platforms; if enablePython then [ "x86_64-linux" ] else unix; }; } diff --git a/pkgs/development/libraries/itk/itk.egg-info b/pkgs/development/libraries/itk/itk.egg-info new file mode 100644 index 000000000000..2c523ec27848 --- /dev/null +++ b/pkgs/development/libraries/itk/itk.egg-info @@ -0,0 +1,5 @@ +Metadata-Version: 2.1 +Name: itk +Version: @ITK_VER@ +Summary: Insight Segmentation and Registration Toolkit +Platform: UNKNOWN diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a826cd6129c6..69513645108e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6206,6 +6206,12 @@ self: super: with self; { itanium-demangler = callPackage ../development/python-modules/itanium-demangler { }; + itk = toPythonModule (pkgs.itk.override { + inherit python numpy; + enablePython = true; + }); + + item-synchronizer = callPackage ../development/python-modules/item-synchronizer { }; itemadapter = callPackage ../development/python-modules/itemadapter { }; @@ -14477,7 +14483,7 @@ self: super: with self; { simplehound = callPackage ../development/python-modules/simplehound { }; simpleitk = callPackage ../development/python-modules/simpleitk { - inherit (pkgs) simpleitk; + inherit (pkgs) itk simpleitk; }; simplejson = callPackage ../development/python-modules/simplejson { }; From 1ef3f0b371b7e47afc07001ecef328cc2faebc54 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Sep 2024 23:55:57 +0200 Subject: [PATCH 49/58] nextcloud28: 28.0.9 -> 28.0.10 ChangeLog: https://github.com/nextcloud/server/releases/tag/v28.0.10 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index ddd8e79b5e80..c974f6899a9e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -42,8 +42,8 @@ let }; in { nextcloud28 = generic { - version = "28.0.9"; - hash = "sha256-DZd3NkDn+A6gqTP7+L0pe/JB2ghy+hzFQ1D/F5Nmmxs="; + version = "28.0.10"; + hash = "sha256-LoAVJtKJHBhf6sWYXL084pLOcKQl9Tb5GfkBuftMwhA="; packages = nextcloud28Packages; }; From 09fe7f8690ef16c5f4cd6a2849a161d7d00e40bc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Sep 2024 23:56:15 +0200 Subject: [PATCH 50/58] nextcloud29: 29.0.6 -> 29.0.7 ChangeLog: https://github.com/nextcloud/server/releases/tag/v29.0.7 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index c974f6899a9e..677359abdb09 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -48,8 +48,8 @@ in { }; nextcloud29 = generic { - version = "29.0.6"; - hash = "sha256-3GC+A/0X4wuv7ypNT+stCWqnekxrTyHJhXYOU3+EAeM="; + version = "29.0.7"; + hash = "sha256-9TL/wxvlqDdLXgcrhv/4dl7Bn9oMhQnO45hzCB2yxUQ="; packages = nextcloud29Packages; }; From 8cef266dc723368ad77c527fb7b7b854dc09322a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Sep 2024 23:56:34 +0200 Subject: [PATCH 51/58] nextcloudPackages: update all --- pkgs/servers/nextcloud/packages/28.json | 34 ++++++++-------- pkgs/servers/nextcloud/packages/29.json | 54 +++++++++++++++---------- 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index a37e59e8d813..99905d159711 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz", - "version": "14.2.4", + "hash": "sha256-ZWdz7Hl3wrTEHrXdOsPKRcE5GAnHYHjudbY5F0VjG4Y=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.5/bookmarks-14.2.5.tar.gz", + "version": "14.2.5", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -90,10 +90,10 @@ ] }, "groupfolders": { - "hash": "sha256-AMhhpzznCMW6vHc5vHkP4/wWY+NcqSvB/ZTVj2U6peM=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.8/groupfolders-v16.0.8.tar.gz", - "version": "16.0.8", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-PtxAidIono2roSVA/VLQZ13TVcqWZL069eXpY+npFB8=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.9/groupfolders-v16.0.9.tar.gz", + "version": "16.0.9", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -160,10 +160,10 @@ ] }, "music": { - "hash": "sha256-RnTyQYCbmkHDZhtonpvbKLUM3n93u53IhknyTrNGh9Y=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz", - "version": "2.0.0", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\r\n\r\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\r\n- Playlist support with import from m3u, m3u8, and pls files\r\n- Browse by artists, albums, genres, or folders\r\n- Gapless play\r\n- Filter the shown content with the search function\r\n- Play internet radio and podcast channels\r\n- Setup Last.fm connection to see background information on artists, albums, and songs\r\n- Control with media control keys on the keyboard or OS\r\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\r\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", + "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", + "version": "2.0.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" @@ -210,9 +210,9 @@ ] }, "polls": { - "hash": "sha256-tSnR5O+OCYjoPoh2/WX3ntCagw9xanmxCR+DaMnAhJA=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.1/polls-v7.2.1.tar.gz", - "version": "7.2.1", + "hash": "sha256-TBCNr57MKEe8OSXEqWohZH9zuCwFTMDnwnZ1nFZ+FWY=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.2/polls-v7.2.2.tar.gz", + "version": "7.2.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -310,9 +310,9 @@ ] }, "unsplash": { - "hash": "sha256-xfu5m5VOZZ9ATnRg44sw/MTEXitrDFCuAcm+siNilsY=", - "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.0/unsplash.tar.gz", - "version": "3.0.0", + "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "version": "3.0.1", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index e453178b33f4..a5601194ab07 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz", - "version": "14.2.4", + "hash": "sha256-ZWdz7Hl3wrTEHrXdOsPKRcE5GAnHYHjudbY5F0VjG4Y=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.5/bookmarks-14.2.5.tar.gz", + "version": "14.2.5", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -90,10 +90,10 @@ ] }, "groupfolders": { - "hash": "sha256-cWWlvuUTO4B89CDZzfJLN8MRmQwPMwj0OwFqhIUxAsQ=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.2/groupfolders-v17.0.2.tar.gz", - "version": "17.0.2", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-fdFxsUwXM8nqb7m4pWtQVGq0SLf0zWBuyxFrzppevYI=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.3/groupfolders-v17.0.3.tar.gz", + "version": "17.0.3", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -140,8 +140,8 @@ ] }, "maps": { - "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", + "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -160,10 +160,10 @@ ] }, "music": { - "hash": "sha256-RnTyQYCbmkHDZhtonpvbKLUM3n93u53IhknyTrNGh9Y=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz", - "version": "2.0.0", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\r\n\r\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\r\n- Playlist support with import from m3u, m3u8, and pls files\r\n- Browse by artists, albums, genres, or folders\r\n- Gapless play\r\n- Filter the shown content with the search function\r\n- Play internet radio and podcast channels\r\n- Setup Last.fm connection to see background information on artists, albums, and songs\r\n- Control with media control keys on the keyboard or OS\r\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\r\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", + "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", + "version": "2.0.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" @@ -210,9 +210,9 @@ ] }, "polls": { - "hash": "sha256-tSnR5O+OCYjoPoh2/WX3ntCagw9xanmxCR+DaMnAhJA=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.1/polls-v7.2.1.tar.gz", - "version": "7.2.1", + "hash": "sha256-TBCNr57MKEe8OSXEqWohZH9zuCwFTMDnwnZ1nFZ+FWY=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.2/polls-v7.2.2.tar.gz", + "version": "7.2.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-kAY1Y4PB7AIFWNx+Yi1ovZopGEER/r5RveIlS/y6Veo=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.5/richdocuments-v8.4.5.tar.gz", - "version": "8.4.5", + "hash": "sha256-S1ORUIx+rcA4UUFmPX4KiLakzPPIqvVmcABDuNX0tys=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.6/richdocuments-v8.4.6.tar.gz", + "version": "8.4.6", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-/WD/UAtuLYdtZjBNIur2qRaPNXGTG1lfPTOlJpZfyCI=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.8/spreed-v19.0.8.tar.gz", - "version": "19.0.8", + "hash": "sha256-cZYE528jSNnPFgJSnqosoPyo/7V3zdUAIxnFpcOuvh4=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz", + "version": "19.0.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -309,6 +309,16 @@ "agpl" ] }, + "unsplash": { + "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "version": "3.0.1", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] + }, "user_oidc": { "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", From cd1ac62f13253ad8da5c5bf94fed802e50c60331 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 00:31:47 +0200 Subject: [PATCH 52/58] python312Packages.tencentcloud-sdk-python: 3.0.1230 -> 3.0.1231 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1230...3.0.1231 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1231/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a0a79b7083be..3de63ae5ecb4 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1230"; + version = "3.0.1231"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-wuEbocPbQL/oG6b78Q92+kfWP3ZkIIf8k97tSBZg9nc="; + hash = "sha256-XDFAUIP/oA71dK+QMUrh9ZmusJFzrpuI+0ExW+A6FIU="; }; build-system = [ setuptools ]; From 3dbab8acbb9c5a94a722adefe0d6b910f2867949 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 12 Sep 2024 18:21:37 -0500 Subject: [PATCH 53/58] netdata: format --- pkgs/tools/system/netdata/default.nix | 229 +++++++++++++++++--------- 1 file changed, 149 insertions(+), 80 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 84050ab400dc..c5dd4a9c016c 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,24 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper -, CoreFoundation, IOKit, libossp_uuid -, nixosTests -, bash, curl, jemalloc, json_c, libuv, zlib, libyaml, libelf, libbpf -, libcap, libuuid, lm_sensors, protobuf -, go, buildGoModule, ninja -, withCups ? false, cups -, withDBengine ? true, lz4 -, withIpmi ? (!stdenv.isDarwin), freeipmi -, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct -, withCloud ? false -, withCloudUi ? false -, withConnPubSub ? false, google-cloud-cpp, grpc -, withConnPrometheus ? false, snappy -, withSsl ? true, openssl -, withSystemdJournal ? (!stdenv.isDarwin), systemd -, withDebug ? false -, withEbpf ? false -, withNetworkViewer ? (!stdenv.isDarwin) +{ + lib, + stdenv, + fetchFromGitHub, + CoreFoundation, + IOKit, + bash, + buildGoModule, + cmake, + cups, + curl, + freeipmi, + go, + google-cloud-cpp, + grpc, + jemalloc, + json_c, + libbpf, + libcap, + libelf, + libmnl, + libnetfilter_acct, + libossp_uuid, + libuuid, + libuv, + libyaml, + lm_sensors, + lz4, + makeWrapper, + ninja, + nixosTests, + openssl, + pkg-config, + protobuf, + snappy, + systemd, + withCloud ? false, + withCloudUi ? false, + withConnPrometheus ? false, + withConnPubSub ? false, + withCups ? false, + withDBengine ? true, + withDebug ? false, + withEbpf ? false, + withIpmi ? (!stdenv.isDarwin), + withNetfilter ? (!stdenv.isDarwin), + withNetworkViewer ? (!stdenv.isDarwin), + withSsl ? true, + withSystemdJournal ? (!stdenv.isDarwin), + zlib, }: - stdenv.mkDerivation rec { version = "1.47.0"; pname = "netdata"; @@ -27,10 +57,12 @@ stdenv.mkDerivation rec { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - hash = if withCloudUi - then "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I=" + hash = + if withCloudUi then + "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I=" # we delete the v2 GUI after fetching - else "sha256-Gx7u3Owh/fVAnSw91xfdcmyx4m+bvQAvDaUxzXQ36/0="; + else + "sha256-Gx7u3Owh/fVAnSw91xfdcmyx4m+bvQAvDaUxzXQ36/0="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty @@ -43,19 +75,50 @@ stdenv.mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ cmake pkg-config makeWrapper go ninja ] - ++ lib.optionals withCups [ cups.dev ]; + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + go + ninja + ] ++ lib.optionals withCups [ cups.dev ]; # bash is only used to rewrite shebangs - buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml lm_sensors ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] - ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ] + buildInputs = + [ + bash + curl + jemalloc + json_c + libuv + zlib + libyaml + lm_sensors + ] + ++ lib.optionals stdenv.isDarwin [ + CoreFoundation + IOKit + libossp_uuid + ] + ++ lib.optionals (!stdenv.isDarwin) [ + libcap + libuuid + ] ++ lib.optionals withCups [ cups ] ++ lib.optionals withDBengine [ lz4 ] ++ lib.optionals withIpmi [ freeipmi ] - ++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ] - ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ] + ++ lib.optionals withNetfilter [ + libmnl + libnetfilter_acct + ] + ++ lib.optionals withConnPubSub [ + google-cloud-cpp + grpc + ] ++ lib.optionals withConnPrometheus [ snappy ] - ++ lib.optionals withEbpf [ libelf libbpf ] + ++ lib.optionals withEbpf [ + libelf + libbpf + ] ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ] ++ lib.optionals withSystemdJournal [ systemd ] ++ lib.optionals withSsl [ openssl ]; @@ -79,38 +142,40 @@ stdenv.mkDerivation rec { donStrip = withDebug; env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; - postInstall = '' - # Relocate one folder above. - mv $out/usr/* $out/ - '' + lib.optionalString (!stdenv.isDarwin) '' - # rename this plugin so netdata will look for setuid wrapper - mv $out/libexec/netdata/plugins.d/apps.plugin \ - $out/libexec/netdata/plugins.d/apps.plugin.org - mv $out/libexec/netdata/plugins.d/cgroup-network \ - $out/libexec/netdata/plugins.d/cgroup-network.org - mv $out/libexec/netdata/plugins.d/perf.plugin \ - $out/libexec/netdata/plugins.d/perf.plugin.org - mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ - $out/libexec/netdata/plugins.d/slabinfo.plugin.org - mv $out/libexec/netdata/plugins.d/debugfs.plugin \ - $out/libexec/netdata/plugins.d/debugfs.plugin.org - ${lib.optionalString withSystemdJournal '' - mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ - $out/libexec/netdata/plugins.d/systemd-journal.plugin.org - ''} - ${lib.optionalString withIpmi '' - mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ - $out/libexec/netdata/plugins.d/freeipmi.plugin.org - ''} - ${lib.optionalString withNetworkViewer '' - mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ - $out/libexec/netdata/plugins.d/network-viewer.plugin.org - ''} - ${lib.optionalString (!withCloudUi) '' - rm -rf $out/share/netdata/web/index.html - cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html - ''} - ''; + postInstall = + '' + # Relocate one folder above. + mv $out/usr/* $out/ + '' + + lib.optionalString (!stdenv.isDarwin) '' + # rename this plugin so netdata will look for setuid wrapper + mv $out/libexec/netdata/plugins.d/apps.plugin \ + $out/libexec/netdata/plugins.d/apps.plugin.org + mv $out/libexec/netdata/plugins.d/cgroup-network \ + $out/libexec/netdata/plugins.d/cgroup-network.org + mv $out/libexec/netdata/plugins.d/perf.plugin \ + $out/libexec/netdata/plugins.d/perf.plugin.org + mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ + $out/libexec/netdata/plugins.d/slabinfo.plugin.org + mv $out/libexec/netdata/plugins.d/debugfs.plugin \ + $out/libexec/netdata/plugins.d/debugfs.plugin.org + ${lib.optionalString withSystemdJournal '' + mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ + $out/libexec/netdata/plugins.d/systemd-journal.plugin.org + ''} + ${lib.optionalString withIpmi '' + mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ + $out/libexec/netdata/plugins.d/freeipmi.plugin.org + ''} + ${lib.optionalString withNetworkViewer '' + mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ + $out/libexec/netdata/plugins.d/network-viewer.plugin.org + ''} + ${lib.optionalString (!withCloudUi) '' + rm -rf $out/share/netdata/web/index.html + cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html + ''} + ''; preConfigure = lib.optionalString (!stdenv.isDarwin) '' export GOCACHE=$TMPDIR/go-cache @@ -174,25 +239,30 @@ stdenv.mkDerivation rec { enableParallelBuild = true; passthru = rec { - netdata-go-modules = (buildGoModule { - pname = "netdata-go-plugins"; - inherit version src; + netdata-go-modules = + (buildGoModule { + pname = "netdata-go-plugins"; + inherit version src; - sourceRoot = "${src.name}/src/go/plugin/go.d"; + sourceRoot = "${src.name}/src/go/plugin/go.d"; - vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0="; - doCheck = false; - proxyVendor = true; + vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0="; + doCheck = false; + proxyVendor = true; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; - passthru.tests = tests; - meta = meta // { - description = "Netdata orchestrator for data collection modules written in Go"; - mainProgram = "godplugin"; - license = lib.licenses.gpl3Only; - }; - }).goModules; + passthru.tests = tests; + meta = meta // { + description = "Netdata orchestrator for data collection modules written in Go"; + mainProgram = "godplugin"; + license = lib.licenses.gpl3Only; + }; + }).goModules; inherit withIpmi withNetworkViewer; tests.netdata = nixosTests.netdata; }; @@ -202,8 +272,7 @@ stdenv.mkDerivation rec { description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; - license = [ licenses.gpl3Plus ] - ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; + license = [ licenses.gpl3Plus ] ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; platforms = platforms.unix; maintainers = [ ]; }; From 3b6197558a267cd6860c68db2e1742286cd2edb5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 12 Sep 2024 18:23:53 -0500 Subject: [PATCH 54/58] netdata: cleanup rec --- pkgs/tools/system/netdata/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index c5dd4a9c016c..1af6c4d9cb8a 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -49,14 +49,14 @@ withSystemdJournal ? (!stdenv.isDarwin), zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.47.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = if withCloudUi then "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I=" @@ -185,7 +185,7 @@ stdenv.mkDerivation rec { substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \ --replace-fail \ 'GOPROXY=https://proxy.golang.org' \ - 'GOPROXY=file://${passthru.netdata-go-modules}' + 'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules}' # Prevent the path to be caught into the Nix store path. substituteInPlace CMakeLists.txt \ @@ -242,9 +242,9 @@ stdenv.mkDerivation rec { netdata-go-modules = (buildGoModule { pname = "netdata-go-plugins"; - inherit version src; + inherit (finalAttrs) version src; - sourceRoot = "${src.name}/src/go/plugin/go.d"; + sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d"; vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0="; doCheck = false; @@ -253,11 +253,11 @@ stdenv.mkDerivation rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; passthru.tests = tests; - meta = meta // { + meta = finalAttrs.meta // { description = "Netdata orchestrator for data collection modules written in Go"; mainProgram = "godplugin"; license = lib.licenses.gpl3Only; @@ -276,4 +276,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ ]; }; -} +}) From da31ab50f3ad9ed653423890137a7b453aa2dd01 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 12 Sep 2024 18:37:55 -0500 Subject: [PATCH 55/58] netdata: fix darwin --- pkgs/tools/system/netdata/default.nix | 40 +++++++++++++++------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 1af6c4d9cb8a..9db4e7756858 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -2,13 +2,12 @@ lib, stdenv, fetchFromGitHub, - CoreFoundation, - IOKit, bash, buildGoModule, cmake, cups, curl, + darwin, freeipmi, go, google-cloud-cpp, @@ -30,6 +29,7 @@ ninja, nixosTests, openssl, + overrideSDK, pkg-config, protobuf, snappy, @@ -42,14 +42,17 @@ withDBengine ? true, withDebug ? false, withEbpf ? false, - withIpmi ? (!stdenv.isDarwin), - withNetfilter ? (!stdenv.isDarwin), - withNetworkViewer ? (!stdenv.isDarwin), + withIpmi ? (stdenv.isLinux), + withNetfilter ? (stdenv.isLinux), + withNetworkViewer ? (stdenv.isLinux), withSsl ? true, - withSystemdJournal ? (!stdenv.isDarwin), + withSystemdJournal ? (stdenv.isLinux), zlib, }: -stdenv.mkDerivation (finalAttrs: { +let + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { version = "1.47.0"; pname = "netdata"; @@ -92,16 +95,19 @@ stdenv.mkDerivation (finalAttrs: { libuv zlib libyaml - lm_sensors ] - ++ lib.optionals stdenv.isDarwin [ - CoreFoundation - IOKit - libossp_uuid - ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreFoundation + IOKit + libossp_uuid + ] + ) + ++ lib.optionals (stdenv.isLinux) [ libcap libuuid + lm_sensors ] ++ lib.optionals withCups [ cups ] ++ lib.optionals withDBengine [ lz4 ] @@ -147,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: { # Relocate one folder above. mv $out/usr/* $out/ '' - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (stdenv.isLinux) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ $out/libexec/netdata/plugins.d/apps.plugin.org @@ -177,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { ''} ''; - preConfigure = lib.optionalString (!stdenv.isDarwin) '' + preConfigure = '' export GOCACHE=$TMPDIR/go-cache export GOPATH=$TMPDIR/go export GOSUMDB=off @@ -268,7 +274,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; + broken = stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b931075d156..e662a84d170d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9664,7 +9664,6 @@ with pkgs; nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; netdata = callPackage ../tools/system/netdata { - inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; protobuf = protobuf_21; }; netdataCloud = netdata.override { From f8726f98ae2d06b8b95705f447e30ce6d4819acd Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 12 Sep 2024 20:09:46 -0500 Subject: [PATCH 56/58] netdata: 1.47.0 -> 1.47.1 --- pkgs/tools/system/netdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 9db4e7756858..c7c7554914c7 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -53,7 +53,7 @@ let stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { - version = "1.47.0"; + version = "1.47.1"; pname = "netdata"; src = fetchFromGitHub { @@ -62,10 +62,10 @@ stdenv'.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = if withCloudUi then - "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I=" + "sha256-/iXmIjWpZ0s/LELZM7rYYQ9cjLNdfdisyOvDyLddSY4=" # we delete the v2 GUI after fetching else - "sha256-Gx7u3Owh/fVAnSw91xfdcmyx4m+bvQAvDaUxzXQ36/0="; + "sha256-pAqxxsWYgqbmF6wFBfTCYYc3x/Ufyz2Xs4bwB1ToHjo="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty From f63ce293385cc9641977c2805814843724384128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 06:11:59 +0000 Subject: [PATCH 57/58] python311Packages.tcolorpy: 0.1.4 -> 0.1.6 --- pkgs/development/python-modules/tcolorpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix index ab7b6bc198de..28b66c2dd51b 100644 --- a/pkgs/development/python-modules/tcolorpy/default.nix +++ b/pkgs/development/python-modules/tcolorpy/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "tcolorpy"; - version = "0.1.4"; + version = "0.1.6"; format = "setuptools"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cCdKeixRfXkvEGBqozMWw2RjliLdzhlMv8GE2Q40LZQ="; + hash = "sha256-esucU+So1YKzkuMt6ICCrQ5SzQVv24lh12SE1Jl5Y/w="; }; nativeCheckInputs = [ pytestCheckHook ]; From 591e7cca4fed5e44414e09d394027cd0a9256fa6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 11:40:15 +0900 Subject: [PATCH 58/58] python312Packages.tcolorpy: refactor --- pkgs/development/python-modules/tcolorpy/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix index 28b66c2dd51b..f807ca1bf08a 100644 --- a/pkgs/development/python-modules/tcolorpy/default.nix +++ b/pkgs/development/python-modules/tcolorpy/default.nix @@ -3,12 +3,14 @@ fetchFromGitHub, lib, pytestCheckHook, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "tcolorpy"; version = "0.1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "thombashi"; @@ -17,6 +19,13 @@ buildPythonPackage rec { hash = "sha256-esucU+So1YKzkuMt6ICCrQ5SzQVv24lh12SE1Jl5Y/w="; }; + build-system = [ + setuptools + setuptools-scm + ]; + + pythonImportsCheck = [ "tcolorpy" ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; {