From 859ee774e1c302583321a9403798fde76dd8bf8d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 Jan 2024 18:00:03 +0100 Subject: [PATCH 01/21] displaylink: use `finalAttrs` pattern --- pkgs/os-specific/linux/displaylink/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 408dfa408e1d..6872fa55059e 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -4,10 +4,8 @@ , util-linux , libusb1 , evdi -, systemd , makeWrapper , requireFile -, substituteAll }: let @@ -17,9 +15,8 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64-linux-gnu" else throw "Unsupported architecture"; libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ]; - in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "displaylink"; version = "5.8.0-63.33"; @@ -45,8 +42,8 @@ stdenv.mkDerivation rec { unpackPhase = '' unzip $src - chmod +x displaylink-driver-${version}.run - ./displaylink-driver-${version}.run --target . --noexec --nodiskspace + chmod +x displaylink-driver-${finalAttrs.version}.run + ./displaylink-driver-${finalAttrs.version}.run --target . --noexec --nodiskspace ''; installPhase = '' @@ -77,4 +74,4 @@ stdenv.mkDerivation rec { hydraPlatforms = []; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; -} +}) From 1551a2e3e2b179620b959092ea8dc4642f035fa8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 Jan 2024 18:00:28 +0100 Subject: [PATCH 02/21] displaylink: add missing phase hooks --- pkgs/os-specific/linux/displaylink/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 6872fa55059e..d2b918d32901 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -41,12 +41,15 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ unzip makeWrapper ]; unpackPhase = '' + runHook preUnpack unzip $src chmod +x displaylink-driver-${finalAttrs.version}.run ./displaylink-driver-${finalAttrs.version}.run --target . --noexec --nodiskspace + runHook postUnpack ''; installPhase = '' + runHook preInstall install -Dt $out/lib/displaylink *.spkg install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager mkdir -p $out/lib/udev/rules.d $out/share @@ -60,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { # We introduce a dependency on the source file so that it need not be redownloaded everytime echo $src >> "$out/share/workspace_dependencies.pin" + runHook postInstall ''; dontStrip = true; From cacc44a576eafdf70001377d465fb52e776b0dff Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 Jan 2024 18:02:07 +0100 Subject: [PATCH 03/21] displaylink: switch to `makeBinaryWrapper` --- pkgs/os-specific/linux/displaylink/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index d2b918d32901..ddba18dfea48 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -4,7 +4,7 @@ , util-linux , libusb1 , evdi -, makeWrapper +, makeBinaryWrapper , requireFile }: @@ -38,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - nativeBuildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + unzip + ]; unpackPhase = '' runHook preUnpack From a4e9c088701dc31cd8223a06329a1c76ddcaabaa Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 Jan 2024 18:06:21 +0100 Subject: [PATCH 04/21] displaylink: sort `meta` attributes and add `meta.mainProgram` --- pkgs/os-specific/linux/displaylink/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index ddba18dfea48..476ea57d44ec 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -75,10 +75,11 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; homepage = "https://www.displaylink.com/"; + hydraPlatforms = []; license = licenses.unfree; + mainProgram = "DisplayLinkManager"; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - hydraPlatforms = []; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; }) From 25b075dffd70dc7da9aff90c38267b807093da6a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 Jan 2024 18:03:07 +0100 Subject: [PATCH 05/21] evdi: use `finalAttrs` pattern --- pkgs/os-specific/linux/evdi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index f4ad16523afb..eaf3b74156aa 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -5,13 +5,13 @@ let pybind11 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "evdi"; version = "1.14.1-unstable-2024-01-30"; src = fetchFromGitHub { owner = "DisplayLink"; - repo = pname; + repo = "evdi"; rev = "d21a6ea3c69ba180457966a04b6545d321cf46ca"; hash = "sha256-Txa9yX9h3GfmHRRNvhrfrsUoQhqRWbBt4gJYAZTNe0w="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { homepage = "https://www.displaylink.com/"; broken = kernel.kernelOlder "4.19"; }; -} +}) From 7ae4984c3091b26f5fa956d459a120273217bd9d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 Jan 2024 18:03:48 +0100 Subject: [PATCH 06/21] evdi: add missing phase hooks --- pkgs/os-specific/linux/evdi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index eaf3b74156aa..697e1611f1e3 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -34,8 +34,10 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" "pic" "fortify" ]; installPhase = '' + runHook preInstall install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko install -Dm755 library/libevdi.so $out/lib/libevdi.so + runHook postInstall ''; enableParallelBuilding = true; From 93d5d8dcde92127adecf3b46f01e158ed3d9bc70 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 Jan 2024 18:04:18 +0100 Subject: [PATCH 07/21] evdi: sort `meta` attributes --- pkgs/os-specific/linux/evdi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 697e1611f1e3..1472a58610fc 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = with lib; { + broken = kernel.kernelOlder "4.19"; changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${version}"; description = "Extensible Virtual Display Interface"; + homepage = "https://www.displaylink.com/"; + license = with licenses; [ lgpl21Only gpl2Only ]; maintainers = with maintainers; [ ]; platforms = platforms.linux; - license = with licenses; [ lgpl21Only gpl2Only ]; - homepage = "https://www.displaylink.com/"; - broken = kernel.kernelOlder "4.19"; }; }) From 12490c715146458a288cf48a8bb6035df22d4464 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 Jan 2024 18:05:00 +0100 Subject: [PATCH 08/21] evdi: update code style --- pkgs/os-specific/linux/evdi/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 1472a58610fc..059c7891a52b 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, kernel, libdrm, python3 }: +{ lib +, stdenv +, fetchFromGitHub +, kernel +, libdrm +, python3 +}: let python3WithLibs = python3.withPackages (ps: with ps; [ @@ -24,7 +30,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; - buildInputs = [ kernel libdrm python3WithLibs ]; + buildInputs = [ + kernel + libdrm + python3WithLibs + ]; makeFlags = kernel.makeFlags ++ [ "KVER=${kernel.modDirVersion}" From 33ed01ea05d8d79770a5fa9453c6bbae6b7c1ffc Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 4 Feb 2024 07:26:47 +0000 Subject: [PATCH 09/21] python311Packages.osqp: disable failing unit tests disable unit tests failing after upgrade to scipy 1.12 as they appear to just be issues with the test and not the underlying functionality. Can re-enable once https://github.com/osqp/osqp-python/issues/121 is closed. --- pkgs/development/python-modules/osqp/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 13797c4d17f8..f58a3fec14c8 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -5,6 +5,7 @@ , fetchPypi , future , numpy +, oldest-supported-numpy , pytestCheckHook , pythonOlder , qdldl @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "osqp"; version = "0.6.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,6 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake + oldest-supported-numpy setuptools-scm ]; @@ -50,6 +52,14 @@ buildPythonPackage rec { disabledTests = [ # Need an unfree license package - mkl "test_issue14" + ] + # disable tests failing after scipy 1.12 update + # https://github.com/osqp/osqp-python/issues/121 + # re-enable once unit tests fixed + ++ [ + "feasibility_tests" + "polish_tests" + "update_matrices_tests" ]; meta = with lib; { From b4781965cdb0112934482fe342043c111839d4eb Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 4 Feb 2024 07:51:36 +0000 Subject: [PATCH 10/21] python311Packages.cvxpy: apply upstream patch to fix unit test fixes unit test failure after scipy 1.12 upgrade --- pkgs/development/python-modules/cvxpy/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index a8e4b6dc9618..16a5adbf1594 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , clarabel , cvxopt , ecos @@ -29,6 +30,16 @@ buildPythonPackage rec { hash = "sha256-CjhqV4jb14t7IN0HFSTsY2yPpys2KOafGrxxTI+YEeU="; }; + patches = [ + # fix QP tests. remove on next update + # https://github.com/cvxpy/cvxpy/pull/2343 + (fetchpatch { + name = "fix-QP-tests.patch"; + url = "https://github.com/cvxpy/cvxpy/commit/4c8549b9820e64c1b06f5d71c5d3f36528dd4a76.patch"; + hash = "sha256-43zjS1STEBaGgj1jEOlX3XzMsE4wjoKAk8ApJo98AzY="; + }) + ]; + # we need to patch out numpy version caps from upstream postPatch = '' sed -i 's/\(numpy>=[0-9.]*\),<[0-9.]*;/\1;/g' pyproject.toml From edcd5ae003178531237af049a85b3e569cc8f341 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 4 Feb 2024 13:26:59 +0000 Subject: [PATCH 11/21] python311Packages.jaxopt: apply patch / disable failing tests after scipy 1.12 update add patch and disable failing aarch64 linux tests --- .../python-modules/jaxopt/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 0f0e396b906d..af924cea5ab2 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -1,7 +1,9 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , pytest-xdist , pytestCheckHook , absl-py @@ -29,6 +31,16 @@ buildPythonPackage rec { hash = "sha256-T/BHSnuk3IRuLkBj3Hvb/tFIb7Au25jjQtvwL28OU1U="; }; + patches = [ + # fix failing tests from scipy 1.12 update + # https://github.com/google/jaxopt/pull/574 + (fetchpatch { + name = "scipy-1.12-fix-tests.patch"; + url = "https://github.com/google/jaxopt/commit/48b09dc4cc93b6bc7e6764ed5d333f9b57f3493b.patch"; + hash = "sha256-v+617W7AhxA1Dzz+DBtljA4HHl89bRTuGi1QfatobNY="; + }) + ]; + propagatedBuildInputs = [ absl-py jax @@ -54,6 +66,13 @@ buildPythonPackage rec { "jaxopt.tree_util" ]; + disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # https://github.com/google/jaxopt/issues/577 + "test_binary_logit_log_likelihood" + "test_solve_sparse" + "test_logreg_with_intercept_manual_loop3" + ]; + meta = with lib; { homepage = "https://jaxopt.github.io"; description = "Hardware accelerated, batchable and differentiable optimizers in JAX"; From 5a6806875957cb774f8372cb83f9f5198cd82d8b Mon Sep 17 00:00:00 2001 From: Misaka13514 Date: Mon, 5 Feb 2024 20:06:16 +0800 Subject: [PATCH 12/21] subfinder: 2.6.4 -> 2.6.5 Diff: https://github.com/projectdiscovery/subfinder/compare/v2.6.4...v2.6.5 Changelog: https://github.com/projectdiscovery/subfinder/releases/tag/v2.6.5 --- pkgs/tools/networking/subfinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index eca5ee264631..73fe59095a0c 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-pCfTaxGScGg2pcQERfWYOwBI3dnfOuXcFZ9msncpPwE="; + hash = "sha256-+Xw4fom7lNfVxbGGoeWG7f37Gk1Dic+jzozh6HodplE="; }; - vendorHash = "sha256-3JlCXW5TfZT6zJ93V45XMDtfpuc31tHCLiJOscizG9M="; + vendorHash = "sha256-n+FKmgluRfzhufia5rPqLKt4owCyWO4bP6Zgi+4Ax9w="; modRoot = "./v2"; From c3632a3cdcabc2a2684801bc5744ff46a28fbbe2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Feb 2024 13:12:51 +0000 Subject: [PATCH 13/21] pet: 0.5.0 -> 0.6.0 --- pkgs/development/tools/pet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index 9437db2ffc37..3b149f2e0577 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pet"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; rev = "v${version}"; - sha256 = "sha256-+ng4+wrJW/fl1DJMbycLymFgiviTwjlxNApE2Q8PesQ="; + sha256 = "sha256-+SjeQJXWoyNVb9AUB0BlXUJpHYRLhvVjteZypjV0FtE="; }; - vendorHash = "sha256-JOP7hcCOwVZ0hb2UXHHdxpKxpZqs6a8AjOFbrs711ps="; + vendorHash = "sha256-A3VHpSJc6NJz8ojg6iSnQlIXbf9m1JCzg9Vnoie0ffU="; ldflags = [ "-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}" From bcf0d4b0fc51627d3c8c51db5eb6429da652914f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 19:45:14 +0000 Subject: [PATCH 14/21] php81Extensions.datadog_trace: 0.96.0 -> 0.97.0 --- pkgs/development/php-packages/datadog_trace/Cargo.lock | 2 +- pkgs/development/php-packages/datadog_trace/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/datadog_trace/Cargo.lock b/pkgs/development/php-packages/datadog_trace/Cargo.lock index 09b79fb174fe..22375053bd33 100644 --- a/pkgs/development/php-packages/datadog_trace/Cargo.lock +++ b/pkgs/development/php-packages/datadog_trace/Cargo.lock @@ -678,7 +678,7 @@ dependencies = [ [[package]] name = "datadog-php-profiling" -version = "0.96.0" +version = "0.97.0" dependencies = [ "ahash 0.8.3", "anyhow", diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 79db3712c999..2b8b7ea4fb7f 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -13,14 +13,14 @@ buildPecl rec { pname = "ddtrace"; - version = "0.96.0"; + version = "0.97.0"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-trace-php"; rev = version; fetchSubmodules = true; - hash = "sha256-SXhva2acXIOuru8tTdRt5OU3Pce5eHm6SOn/y7N3ZIs="; + hash = "sha256-Kx2HaWvRT+mFIs0LAAptx6nm9DQ83QEuyHNcEPEr7A4="; }; cargoDeps = rustPlatform.importCargoLock { From d8e4fd4b7ecfddf1a36033e61590489de5390429 Mon Sep 17 00:00:00 2001 From: Kamilla Ova Date: Mon, 5 Feb 2024 17:09:51 +0300 Subject: [PATCH 15/21] ookla-speedtest: add mainProgram --- pkgs/tools/networking/ookla-speedtest/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix index b08769b6ca1d..e36d5f7f1777 100644 --- a/pkgs/tools/networking/ookla-speedtest/default.nix +++ b/pkgs/tools/networking/ookla-speedtest/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: let + stdenv = stdenvNoCC; + pname = "ookla-speedtest"; version = "1.2.0"; @@ -51,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ kranzes ]; platforms = lib.attrNames srcs; + mainProgram = "speedtest"; }; } From 8c75884e0ef1365973c785467e7a88269215c031 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 4 Feb 2024 13:55:19 +0000 Subject: [PATCH 16/21] python311Packages.qutip: 4.7.4 -> 4.7.5 --- pkgs/development/python-modules/qutip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index ddd3b18adbf0..6c57c8f3c076 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qutip"; - version = "4.7.4"; + version = "4.7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gfWYlQoGESE+EryLVfsnmBq9xFf3d92xOmEz4A32iqU="; + hash = "sha256-4nXZPZFu9L+Okha3qvPil1KvLGO1EbrzotQjqQ8r9l8="; }; nativeBuildInputs = [ From f63ae38014c9e31c4e0e1e3a41e0987e56a8f67b Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 5 Feb 2024 18:54:48 -0500 Subject: [PATCH 17/21] python311Packages.litellm: use pyproject = true --- pkgs/development/python-modules/litellm/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index f3ec6b82d9ca..6d2905206a7a 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -12,15 +12,14 @@ , certifi , appdirs , aiohttp -, httpx }: let version = "1.22.3"; in -buildPythonPackage rec { +buildPythonPackage { pname = "litellm"; - format = "pyproject"; inherit version; + pyproject = true; src = fetchFromGitHub { owner = "BerriAI"; From 4494fcaab7abb0f9eb63371c243826afcc0fb9c1 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 6 Feb 2024 01:51:09 +0100 Subject: [PATCH 18/21] nixos/acme: default to lets encrypt production URL instead of null, mention lets encrypt staging URI (#270221) --- nixos/modules/security/acme/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 40d9c487996b..19297d267851 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -545,12 +545,14 @@ let }; server = mkOption { - type = types.nullOr types.str; - inherit (defaultAndText "server" null) default defaultText; + type = types.str; + inherit (defaultAndText "server" "https://acme-v02.api.letsencrypt.org/directory") default defaultText; + example = "https://acme-staging-v02.api.letsencrypt.org/directory"; description = lib.mdDoc '' - ACME Directory Resource URI. Defaults to Let's Encrypt's - production endpoint, - , if unset. + ACME Directory Resource URI. + Defaults to Let's Encrypt's production endpoint. + For testing Let's Encrypt's [staging endpoint](https://letsencrypt.org/docs/staging-environment/) + should be used to avoid the rather tight rate limit on the production endpoint. ''; }; From 978d053ec4400726ab5da4394c81245bbc1d85a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Feb 2024 01:08:42 +0000 Subject: [PATCH 19/21] monophony: 2.5.2 -> 2.6.0 --- pkgs/by-name/mo/monophony/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index c0ddfee356b5..1aede92ae5bd 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -12,7 +12,7 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "2.5.2"; + version = "2.6.0"; format = "other"; sourceRoot = "source/source"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-DIAvRxUC1JIK4Tyc+REqgO6kZRokPcmLCKwI/+YRGx8="; + hash = "sha256-dLv1zdhWXOimxhoyf0T8oM5dF4fKepcIED+DG6D1MH0="; }; pythonPath = with python3Packages; [ From c097f4ad57643c1ffd15c4a74c15741e2315762a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 30 Jan 2024 06:03:43 +0100 Subject: [PATCH 20/21] =?UTF-8?q?ocamlPackages.uuseg:=2015.0.0=20=E2=86=92?= =?UTF-8?q?=2015.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/uuseg/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 6a97c5bbc33a..a277bffd85f3 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uucp, uutf, cmdliner +, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0" , cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1" }: @@ -10,11 +11,14 @@ in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "15.0.0"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM="; + hash = { + "15.1.0" = "sha256-IPI3Wd51HzX4n+uGcgc04us29jMjnKbGgVEAdp0CVMU="; + "15.0.0" = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM="; + }."${version}"; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; From 4625c5b5e59c49d263168d02539d1d19018caec6 Mon Sep 17 00:00:00 2001 From: John Hui <11800204+j-hui@users.noreply.github.com> Date: Mon, 5 Feb 2024 20:45:25 -0500 Subject: [PATCH 21/21] obs-webkitgtk: init at unstable-2023-11-10 (#284887) --- .../video/obs-studio/plugins/default.nix | 2 + .../obs-studio/plugins/obs-webkitgtk.nix | 51 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 7c92feb1cb20..1ae2ddc9724f 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -78,6 +78,8 @@ obs-websocket = qt6Packages.callPackage ./obs-websocket.nix { }; # Websocket 4.x compatibility for OBS Studio 28+ + obs-webkitgtk = callPackage ./obs-webkitgtk.nix { }; + wlrobs = callPackage ./wlrobs.nix { }; waveform = callPackage ./waveform { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix new file mode 100644 index 000000000000..fcf426bde635 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, obs-studio +, webkitgtk +, glib-networking +, meson +, cmake +, pkg-config +, ninja +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "obs-webkitgtk"; + version = "unstable-2023-11-10"; + + src = fetchFromGitHub { + owner = "fzwoch"; + repo = "obs-webkitgtk"; + rev = "ddf230852c3c338e69b248bdf453a0630f1298a7"; + hash = "sha256-DU2w9dRgqWniTE76KTAtFdxIN82VKa/CS6ZdfNcTMto="; + }; + + buildInputs = [ + obs-studio + webkitgtk + glib-networking + ]; + + nativeBuildInputs = [ + meson + cmake + pkg-config + ninja + wrapGAppsHook + ]; + + postPatch = '' + substituteInPlace ./obs-webkitgtk.c \ + --replace 'g_file_read_link("/proc/self/exe", NULL)' "g_strdup(\"$out/lib/obs-plugins\")" + ''; + + meta = with lib; { + description = "Yet another OBS Studio browser source"; + homepage = "https://github.com/fzwoch/obs-webkitgtk"; + maintainers = with maintainers; [ j-hui ]; + license = licenses.gpl2Only; + platforms = platforms.linux; + }; +}