From 935e329186b687e55549f8387967aecee1bc3940 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 08:18:35 +0000 Subject: [PATCH 01/47] freetds: 1.4.8 -> 1.4.10 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index c30f69f18fdf..df7328b2b043 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.8"; + version = "1.4.10"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-KzXaLxxmxUrE9uQD2zpKuYOhLpi4a7xMgiZxaf+Tq2k="; + hash = "sha256-x+ryJr3LHNwbIhaWUyzNJfTk53VCZaKXd6NAAIS95pg="; }; buildInputs = [ From 6fcb715fa384ea917fda04ae47ec70be7ec904c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 07:46:55 +0000 Subject: [PATCH 02/47] cntr: 1.5.1 -> 1.5.2 --- pkgs/applications/virtualization/cntr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 3cfd905bc560..becc0308c469 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "sha256-z+0bSxoLJTK4e5xS4CHZ2hNUI56Ci1gbWJsRcN6ZqZA="; + sha256 = "sha256-eDozoYN2iOFUY/w7Gjki4nnASyZo4V/YGPjdX2xjNGY="; }; - cargoSha256 = "sha256-3e5wDne6Idu+kDinHPcAKHfH/d4DrGg90GkiMbyF280="; + cargoHash = "sha256-UZrVZBdaiIrMajePKWXDZI+Z+nXTGadNKmoa3gdfzp4="; passthru.tests = nixosTests.cntr; From 69899afa52cf8bac0ba736347e50e8db3213e411 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 22 Dec 2023 22:53:18 +0100 Subject: [PATCH 03/47] home-assistant-custom-lovelace-modules.mini-media-player: 1.16.6 -> 1.16.8 https://github.com/kalkih/mini-media-player/releases/tag/v1.16.7 https://github.com/kalkih/mini-media-player/releases/tag/v1.16.8 --- .../custom-lovelace-modules/mini-media-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix index 749b15398f4b..96decc53eeb4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mini-media-player"; - version = "1.16.6"; + version = "1.16.8"; src = fetchFromGitHub { owner = "kalkih"; repo = "mini-media-player"; rev = "v${version}"; - hash = "sha256-1cC9dyZ9+7dXSL/dmFD0HV7SgsBW2zA7a+eOKVwbzg8="; + hash = "sha256-mBxK/Y+gesaJwPYHB4P8FCkyfoV9lwC8jAzPZJV+B+M="; }; - npmDepsHash = "sha256-/7roW1xkZmGuB/8nFaQz0Yeuai6yJ+cH7Uqa/zxfa5w="; + npmDepsHash = "sha256-kuEgX5PX7RKhaJPzx+GW37TiSISvz+51tKGacvAMlfg="; installPhase = '' runHook preInstall From 2431c94db91de36dc464276a4f12b798c75bc946 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 22 Dec 2023 23:21:42 +0100 Subject: [PATCH 04/47] evcc: 0.122.1 -> 0.123.0 https://github.com/evcc-io/evcc/releases/tag/0.123.0 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 650b0c0c6c53..c9ccd3b6ab20 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.122.1"; + version = "0.123.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-mD4D2DVai9KV7/RYFmcY7iOGVQGRpwg+rTfNsP8OpCY="; + hash = "sha256-jqlGjDwi+QGh5gmYVoSlxQjyKvNrE9nmSfh1cOlwnoM="; }; - vendorHash = "sha256-B4gR9sXpGuVv3x6sktFSPlbhq5n5aD5d7ksz67X5nY8="; + vendorHash = "sha256-rhGMN5v+JzNg1p2GptomDDtqS7M4EafROXXy185qtmU="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-KTMUZOW56vPGoJviKRJWM9UL28gXL0L3j4ZmUzSeavU="; + hash = "sha256-a3AyqQ8GYP3g9KGbjtLHjHBrJGHg2sNjAQlMUa26pOY="; }; nativeBuildInputs = [ From 953efa78c8e35a4060866bb9983e3cab77250812 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 00:29:38 +0000 Subject: [PATCH 05/47] python311Packages.trimesh: 4.0.6 -> 4.0.8 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 510956cb9c86..3199218ef659 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.0.6"; + version = "4.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wbcNtIErAOS2IHKNa+EfSEmxZulQ2TarBdO8SmtefU0="; + hash = "sha256-FvMFC1h3gu61jZPSPmxYHQmxnxYKmtYAecc/0IT9E8I="; }; nativeBuildInputs = [ setuptools ]; From 7e573feffadf341bf92820dcc930d6ff245984a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 21:53:14 +0000 Subject: [PATCH 06/47] freshrss: 1.22.1 -> 1.23.0 --- pkgs/servers/web-apps/freshrss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 8a8502ad823b..e7eee6515fb7 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU="; + hash = "sha256-X7MYPn1OFmzMWGGlZZ67EHEaRJRKGrdnw6nCzuUfbgU="; }; passthru.tests = { From 6fc02c6c6f1c45eccc3fc2a450fcc2e1e85f4748 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 25 Dec 2023 01:01:20 +0100 Subject: [PATCH 07/47] nixos/freshrss: fix test http-auth --- nixos/tests/all-tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0ef5c4d8d3cb..87a64990501d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -317,6 +317,7 @@ in { freetube = discoverTests (import ./freetube.nix); freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; + freshrss-http-auth = handleTest ./freshrss-http-auth.nix {}; frigate = handleTest ./frigate.nix {}; frp = handleTest ./frp.nix {}; frr = handleTest ./frr.nix {}; From 4c18de526b8b1c1d7411e6d6e14dd0a65f8ff348 Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Mon, 25 Dec 2023 16:09:07 +0530 Subject: [PATCH 08/47] kotlin{-native}: 1.9.20 -> 1.9.22 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- pkgs/development/compilers/kotlin/native.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 50b9d0fadee7..fee4889e1add 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.20"; + version = "1.9.22"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-Faiiglt0zPbETgTpdnLbgC0t91zi+7Y+8FOb865QBvA="; + sha256 = "1rn3rabwyqqhs6xgyfwl326hrzpfpc3qqd2nzwbchck5a09r5cw8"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 16599c9b96c8..bc2018665ca7 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.20"; + version = "1.9.22"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "sha256-Yw6IO8pj0C9XHfzVshcovkoFBUXJ3KixhGoybBRFL2U="; - "macos-x86_64" = "sha256-mnDi8dMCDzGsdPdD1dw4YMBxAfo5FvwDJVU/ew70z9U="; - "linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw="; + "macos-aarch64" = "1pf81rplikbp194pjrm2la101iz8vz3jv55109nipd26xghc15ca"; + "macos-x86_64" = "1r7dmk8cc7f3iwaxamlnlcjl4mbvx443nwvsp8141a21ibrvrmx9"; + "linux-x86_64" = "1m77qld44gbarjxm99gsdscncx4v0cf6ca3h9bdh2m7d3i4adc62"; }.${arch}; in fetchurl { From 0f7b4aee1b08e1de308073ed39cc6a286a96c5cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 17:27:00 +0000 Subject: [PATCH 09/47] droidcam: 2.1.1 -> 2.1.2 --- pkgs/applications/video/droidcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index aba2c45bb015..4909fe6fa786 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-NdVnls1DvcaI/bVrc5gN96+KQZDgt0M8zkNn93QJYG0="; + sha256 = "sha256-NZ6sKLE/Sq4VBJSf7iG0CgdVwmU8JXQH/utbobBEFi0="; }; nativeBuildInputs = [ From 0c1987100aeb36dc1bb5190200b2f5fe920a704b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 25 Dec 2023 13:03:17 -0500 Subject: [PATCH 10/47] python311Packages.remotezip: 0.12.1 -> 0.12.2 Diff: https://github.com/gtsystem/python-remotezip/compare/da62e115bdb2071ad08a8c91f7ae48f2c1827e0c...3723724d6d877d3166d52f4528ffa7bd5bf6627f --- pkgs/development/python-modules/remotezip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix index 5a79b68e6b85..6581fc6189be 100644 --- a/pkgs/development/python-modules/remotezip/default.nix +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -9,7 +9,7 @@ buildPythonPackage { pname = "remotezip"; - version = "0.12.1"; + version = "0.12.2"; format = "setuptools"; src = fetchFromGitHub { @@ -17,8 +17,8 @@ buildPythonPackage { repo = "python-remotezip"; # upstream does not tag releases, determined with git blame # pypi archive lacks files for tests - rev = "da62e115bdb2071ad08a8c91f7ae48f2c1827e0c"; - hash = "sha256-su4dlV8KZuewf/yGdTnGHK9hNLHwGe10ditmFcne4Us="; + rev = "3723724d6d877d3166d52f4528ffa7bd5bf6627f"; + hash = "sha256-iYxHW8RdLFrpjkcEvpfF/NWBnw7Dd5cx2ghpof2XFn4="; }; propagatedBuildInputs = [ From 8966a102909907d691b0c7a21bcf991580bfd596 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 19:32:23 +0000 Subject: [PATCH 11/47] cargo-workspaces: 0.2.44 -> 0.3.0 --- pkgs/development/tools/rust/cargo-workspaces/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index ccbddf3706c1..a4e796381cd9 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-workspaces"; - version = "0.2.44"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - hash = "sha256-5r5XRb/RWHv0Am58VPOxe+QSKn2QT4JZYp5LjTh20KM="; + hash = "sha256-1wNoMVfouuPRGFGB6XIhgeeWgknxMctrBl5Vfco6qug="; }; - cargoHash = "sha256-p+7CWvspYk1LRO2s8Sstlven/2edNe+JYFQHaDFlGkM="; + cargoHash = "sha256-OJGqIo6mYqXjmQb/2CVVTskecYZretw+K46Fvbu/PcQ="; nativeBuildInputs = [ pkg-config From 79f6fb1ff8a0376a51aacad3af4eacdd2b4d9633 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 19:52:09 +0000 Subject: [PATCH 12/47] flashprint: 5.8.1 -> 5.8.3 --- pkgs/applications/misc/flashprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index 893ae8aed005..affc8c5ad2be 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.8.1"; + version = "5.8.3"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-X5CsJmJa3qGQxdZ1xg3xoVnIaChzxZ/GaLZFqBE2dIk="; + hash = "sha256-6vBEthQD0HM2D+l+2dwWmdU+XPJpcvZQM+2GMuaf5Pw="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; From 0f993830f5f191eecdaf2a2a5db63cbfa1b2952a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 20:41:46 +0000 Subject: [PATCH 13/47] freedv: 1.9.5 -> 1.9.6 --- pkgs/applications/radio/freedv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index a337470664af..245e29fdb58a 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-uCWdDmHzNx1vkZFttQZLD4YfXoXz5VZQfir9sGOoDhw="; + hash = "sha256-2TqlBlbMhBqe8WqoyYLJ9B82sAy3MdoaYvvk+XB5CdQ="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 51bbafd6a7e1df7317d8df9d9d85d3bd6c482398 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 21:14:28 +0000 Subject: [PATCH 14/47] python311Packages.jaraco-logging: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/jaraco-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix index 5e5e60b39624..e87d01a869a6 100644 --- a/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/pkgs/development/python-modules/jaraco-logging/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "jaraco-logging"; - version = "3.2.0"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco.logging"; inherit version; - hash = "sha256-X8ssPxI1HU1QN1trYPOJnFg3sjLxotj/y6/17NK3M+c="; + hash = "sha256-9KfPusuGqDTCiGwBo7UrxM3icowdlxfEnU3OHWJI8Hs="; }; pythonNamespaces = [ From 7da4af6d7274e0c29b03ad1ad3622a65b4668ced Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 22:07:43 +0000 Subject: [PATCH 15/47] bacon: 2.13.0 -> 2.14.1 --- pkgs/development/tools/bacon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index b7f4f7c5d95c..92249df9eeca 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KFBb5poogtFnYePu9E5XBE0sKKev2Fuxaqj5ypscuqA="; + hash = "sha256-fhAKTZk+51KYjEnVWNLwpUWx+Quj3tmvmIvULQTbGf8="; }; - cargoHash = "sha256-OA8068ISy2WoC34Q0ANrWX27ESErntCfZ5IrO8Lvm10="; + cargoHash = "sha256-eBWmb6YaGZX31K3jKNKXgTGOOQm/WiSupckkpi49dWI="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 76cd213e1eadfb172be69b1bfd25ca21e766c8a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 22:38:49 +0000 Subject: [PATCH 16/47] ligolo-ng: 0.4.4 -> 0.4.5 --- pkgs/tools/networking/ligolo-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index d4b4dca3326f..63e2d450ad10 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "v${version}"; - hash = "sha256-bv611kvjyXvWVkWpymQn4NLtDAYuXnNi1c3yT3t3p+8="; + hash = "sha256-T+SBGAE+hzHzrYLTm6t7NGh78B1/84TMiT1odGSPtKo="; }; - vendorHash = "sha256-MEG1p8PJinFOPIU9+9cxtU9FweCgVMYX8KojQ3ZhKKs="; + vendorHash = "sha256-QEGF12yJ+CQjIHx6kOwsykVhelp5npnglk7mIbOeIpI="; postConfigure = '' export CGO_ENABLED=0 From c21d0c384484712202bb9f5a69858739f31742f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Dec 2023 01:06:27 +0100 Subject: [PATCH 17/47] anydesk: use desktopItems, move passthru before meta --- .../networking/remote/anydesk/default.nix | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 66b8f8d59bd8..1f60abbcf970 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,44 +1,22 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip -, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils +, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils, copyDesktopItems , pulseaudio }: let description = "Desktop sharing application, providing remote support and online meetings"; - - desktopItem = makeDesktopItem { - name = "AnyDesk"; - exec = "@out@/bin/anydesk %u"; - icon = "anydesk"; - desktopName = "AnyDesk"; - genericName = description; - categories = [ "Network" ]; - startupNotify = false; - }; - in stdenv.mkDerivation rec { pname = "anydesk"; version = "6.3.0"; src = fetchurl { urls = [ - "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" - "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz" ]; hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI="; }; - passthru = { - updateScript = genericUpdater { - versionLister = writeShellScript "anydesk-versionLister" '' - curl -s https://anydesk.com/en/downloads/linux \ - | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ - | uniq \ - | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' - ''; - }; - }; - buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango gnome2.gtkglext libGLU libGL minizip freetype @@ -48,7 +26,19 @@ in stdenv.mkDerivation rec { libXrandr libXtst libXt libICE libSM libXrender ]); - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + + desktopItems = [ + (makeDesktopItem { + name = "AnyDesk"; + exec = "${placeholder "out"}/bin/anydesk %u"; + icon = "anydesk"; + desktopName = "AnyDesk"; + genericName = description; + categories = [ "Network" ]; + startupNotify = false; + }) + ]; installPhase = '' runHook preInstall @@ -57,7 +47,6 @@ in stdenv.mkDerivation rec { install -m755 anydesk $out/bin/anydesk cp copyright README $out/share/doc/anydesk cp -r icons/hicolor/* $out/share/icons/hicolor/ - cp ${desktopItem}/share/applications/*.desktop $out/share/applications runHook postInstall ''; @@ -75,11 +64,19 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/anydesk \ --prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]} - - substituteInPlace $out/share/applications/*.desktop \ - --subst-var out ''; + passthru = { + updateScript = genericUpdater { + versionLister = writeShellScript "anydesk-versionLister" '' + curl -s https://anydesk.com/en/downloads/linux \ + | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ + | uniq \ + | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' + ''; + }; + }; + meta = with lib; { inherit description; homepage = "https://www.anydesk.com"; From 9d95ddfac4de893bf3b01d577e7622a4c5ef4a73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 01:48:39 +0000 Subject: [PATCH 18/47] spleen: 2.0.1 -> 2.0.2 --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 0c114b176abd..e97d8416610c 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "spleen"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - hash = "sha256-N9kJrWaQN9eeNoOVJu9UN2+jcEbHqRWxV+X0DXNJLuA="; + hash = "sha256-+TDrAolKoG61CuqqELAEICVNcjIPoow6QPFXqMKUN1U="; }; nativeBuildInputs = [ xorg.mkfontscale ]; From 9329efeadc238dc9c169751403611481086f2d10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 02:24:58 +0000 Subject: [PATCH 19/47] xdg-desktop-portal-hyprland: 1.2.5 -> 1.2.6 --- .../hyprwm/xdg-desktop-portal-hyprland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 6a067878f22f..9e17bbb61b9c 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "v${self.version}"; - hash = "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE="; + hash = "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4="; }; nativeBuildInputs = [ From 33f24ac84ad42f222cb29a58b860ca0136e321e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 03:49:56 +0000 Subject: [PATCH 20/47] fits-cloudctl: 0.12.11 -> 0.12.12 --- pkgs/tools/admin/fits-cloudctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index ad661b97c68d..3c2a524c004d 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.12.11"; + version = "0.12.12"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-rp5iMp6Ah2JESpY8mdwez25D9GghoIMUqMNst72z2fM="; + sha256 = "sha256-jNs1I6aVmyHbVghO30r6+gVg0vVLqHpddX1KVX1Xh+s="; }; - vendorHash = "sha256-3RowPOLtEDxXFcb2KizuVP3O0uTwkuUQ8UB2AFPaVVE="; + vendorHash = "sha256-NR5Jw4zCYRg6xc9priCVNH+9wOVWx3bmstc3nkQDmv8="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; From a08466f3b30d6f4c53ac5a541e2d6f5d17799368 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 26 Dec 2023 06:55:17 +0200 Subject: [PATCH 21/47] pacproxy: add meta.mainProgram, move to pkgs/by-name --- .../pacproxy/default.nix => by-name/pa/pacproxy/package.nix} | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{tools/networking/pacproxy/default.nix => by-name/pa/pacproxy/package.nix} (95%) diff --git a/pkgs/tools/networking/pacproxy/default.nix b/pkgs/by-name/pa/pacproxy/package.nix similarity index 95% rename from pkgs/tools/networking/pacproxy/default.nix rename to pkgs/by-name/pa/pacproxy/package.nix index f1fb107dd62c..9b6538b1c85c 100644 --- a/pkgs/tools/networking/pacproxy/default.nix +++ b/pkgs/by-name/pa/pacproxy/package.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ terlar ]; + mainProgram = "pacproxy"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a5a6f9df840..e2a0fe01d679 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1090,8 +1090,6 @@ with pkgs; packr = callPackage ../development/libraries/packr { }; - pacproxy = callPackage ../tools/networking/pacproxy { }; - pacup = callPackage ../tools/package-management/pacup { }; patcher9x = callPackage ../development/tools/patcher9x { }; From 7215f205cd6dd443a01b40cb14da04c57d930295 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 05:08:55 +0000 Subject: [PATCH 22/47] buttercup-desktop: 2.24.3 -> 2.24.4 --- pkgs/tools/security/buttercup-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 1692c246df70..a3eb00d3fe45 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.24.3"; + version = "2.24.4"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-ZSKsxlxP2jNUxEeF2Lfuj2yW0KqHozjPoioq4t0uzfo="; + sha256 = "sha256-c5MLj/1OSjGsySCENeJqEhubxl2y7uDhnOBAtLGy92I="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From 40d0de07e18f3e20199767d775d1770865bd41c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 05:40:29 +0000 Subject: [PATCH 23/47] codux: 15.16.1 -> 15.16.2 --- pkgs/applications/editors/codux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index ac81aea354d4..4f853593e3a8 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.16.1"; + version = "15.16.2"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-vc0lnYGOgb1uKAQlj6xc8mbSfJ6apGNSlyDRX3qHeTM="; + sha256 = "sha256-GKn8T3MEh+MnOqUnxruTqbnfxUcjGh6EAt+6LHTNCiY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From bfa30dc6e824521096d61bdb7c26cbc4d083fc25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 09:29:44 +0100 Subject: [PATCH 24/47] python311Packages.pyenphase: 1.15.1 -> 1.15.2 Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.15.1...v1.15.2 Changelog: https://github.com/pyenphase/pyenphase/blob/1.15.2/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 39916f060caa..55a23f8f8d03 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.15.1"; + version = "1.15.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-XhcCNp7iA7wTd5ldoCO9QC7o3kmL3jIlumjg8Y5mkVQ="; + hash = "sha256-4vKfgpCo28btFCTbj7xge7bDImafbOWsabhdMJK5p3Q="; }; postPatch = '' From 0d3c51e1f2714e381d6ae5ea9e7fab6c7d8c1132 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 09:46:11 +0100 Subject: [PATCH 25/47] python311Packages.pyatv: 0.14.4 -> 0.14.5 Diff: https://github.com/postlund/pyatv/compare/refs/tags/v0.14.4...v0.14.5 Changelog: https://github.com/postlund/pyatv/blob/v0.14.5/CHANGES.md --- pkgs/development/python-modules/pyatv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 73c843404565..d584b410d7cd 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.14.4"; + version = "0.14.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "postlund"; repo = "pyatv"; rev = "refs/tags/v${version}"; - hash = "sha256-w3WOlZFfuCmekUsr8msi2LXTm6j8/Bk49L3MiYF7lOM="; + hash = "sha256-Uykj9MIUFcZyTWOBjUhL9+qItbnpwtuTd2Cx5jI7Wtw="; }; postPatch = '' From ca6dbf534a0dc3aee0409df3fff67a4921eb58d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 08:54:26 +0000 Subject: [PATCH 26/47] granted: 0.20.3 -> 0.20.5 --- pkgs/tools/admin/granted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 0cffd8700ebb..f2ecbeeb3527 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "granted"; - version = "0.20.3"; + version = "0.20.5"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U8j1IxeBcm9aEJ8LtIxNPdz5mqkSGQ6Ldn7F3HomvGE="; + sha256 = "sha256-s1hPyvpk78MgEK+t5r9iFNHBXDnnNLNoAy0jUB9X8wU="; }; vendorHash = "sha256-HRZKvs3q79Q94TYvdIx2NQU49MmS2PD1lRndcV0Ys/o="; From 1bc797b6cf816ae47581e19d741bfe832574ac90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 09:57:25 +0100 Subject: [PATCH 27/47] python311Packages.sendgrid: 6.10.0 -> 6.11.0 Diff: https://github.com/sendgrid/sendgrid-python/compare/refs/tags/6.10.0...6.11.0 Changelog: https://github.com/sendgrid/sendgrid-python/blob/6.11.0/CHANGELOG.md --- pkgs/development/python-modules/sendgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 6f3e9914243c..82f336a7fd43 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.10.0"; + version = "6.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = "refs/tags/${version}"; - hash = "sha256-/un/m4Br0Ylk00fS/U+QKeXwM1Ix5TFedaPhCyScWvs="; + hash = "sha256-wcQLdU80pcyEplzL8lnehtToqYiTrX1n5TjmK5zturE="; }; propagatedBuildInputs = [ From 7ebd5b81b74e9f9ddb341473bb50059b4123f565 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 09:57:33 +0100 Subject: [PATCH 28/47] influxdb2-cli: remove unused buildGoPackage --- pkgs/servers/nosql/influxdb2/cli.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix index dc7395a7eb7f..10a3278c101b 100644 --- a/pkgs/servers/nosql/influxdb2/cli.nix +++ b/pkgs/servers/nosql/influxdb2/cli.nix @@ -1,5 +1,4 @@ { buildGoModule -, buildGoPackage , fetchFromGitHub , lib }: From 61b08e6536f06f99fe39789c0fcf9aa27253eda1 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 09:58:43 +0100 Subject: [PATCH 29/47] argo: remove unused buildGoPackage --- pkgs/applications/networking/cluster/argo/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 6417ebca951a..27b466f2f261 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildGoModule -, buildGoPackage , fetchFromGitHub , installShellFiles , pkgsBuildBuild From f4ad5cd16c6eff28e1e69ddd09b531641c30add8 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 09:59:56 +0100 Subject: [PATCH 30/47] gotify-server: remove unused buildGoPackage --- pkgs/servers/gotify/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 57004b66b03a..45311b60232e 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -1,5 +1,4 @@ { lib -, buildGoPackage , fetchFromGitHub , buildGoModule , sqlite From 86c73ad2221c85ee39b26052a4a0dfde962d6ace Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 10:00:19 +0100 Subject: [PATCH 31/47] python311Packages.stdlibs: 2023.11.2 -> 2023.12.15 Diff: https://github.com/omnilib/stdlibs/compare/refs/tags/v2023.11.2...v2023.12.15 Changelog: https://github.com/omnilib/stdlibs/blob/2023.12.15/CHANGELOG.md --- pkgs/development/python-modules/stdlibs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix index 1b2f80da245d..443dc56aee11 100644 --- a/pkgs/development/python-modules/stdlibs/default.nix +++ b/pkgs/development/python-modules/stdlibs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "stdlibs"; - version = "2023.11.2"; + version = "2023.12.15"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "omnilib"; repo = "stdlibs"; rev = "refs/tags/v${version}"; - hash = "sha256-084px8p+pOHonSiOvi/BklaccudSlw9URtCaalWlI0o="; + hash = "sha256-1Av10FNJkCC2XGNx1LDqd0GwiNPIDPXPFatW8+2XoaI="; }; nativeBuildInputs = [ From 9bbc992a7b0f1b2d9b79f3bc3302339958558666 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 10:05:56 +0100 Subject: [PATCH 32/47] python311Packages.ttls: 1.8.1 -> 1.8.2 Diff: https://github.com/jschlyter/ttls/compare/refs/tags/v1.8.1...v1.8.2 Changelog: https://github.com/jschlyter/ttls/blob/v1.8.2/CHANGES.md --- pkgs/development/python-modules/ttls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index b4e5dcc1ec2e..e2bfe61504af 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ttls"; - version = "1.8.1"; + version = "1.8.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jschlyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7w+VFxqv1htN5rKvMbcBV6uYqT3PT0ocv3S9Om2Ol3k="; + hash = "sha256-i9vJr7uTpkUZ9WiL0BGidIgCdG87k8JnmZuPqt6qLQE="; }; nativeBuildInputs = [ From a324818224fa385350fafc6fabf2d4b84d91cb95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 10:10:16 +0000 Subject: [PATCH 33/47] gtop: 1.1.3 -> 1.1.5 --- pkgs/tools/system/gtop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gtop/default.nix b/pkgs/tools/system/gtop/default.nix index 327f09a91fb3..5d882740e1a0 100644 --- a/pkgs/tools/system/gtop/default.nix +++ b/pkgs/tools/system/gtop/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "gtop"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "aksakalli"; repo = "gtop"; rev = "v${version}"; - hash = "sha256-7jcfJOdy3PKT6+07iaZnjWnlPLk9BhPn8LApk23E8l4="; + hash = "sha256-FKbaUV28d0JH9tmTSJBFYQrM5iensnIpcXUFFvXDMe4="; }; - npmDepsHash = "sha256-CUfoVkG74C7HpcO3T9HmwbxHsYAgW1vYBAgNvx2av0k="; + npmDepsHash = "sha256-QKMLFalaOQjhgVkv8lIDnKyH7+GOqOKIl3zoLwrHIF4="; dontNpmBuild = true; From 68c90094fcf0161f65b500f6b6cf826887873e4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 11:02:23 +0000 Subject: [PATCH 34/47] hsd: 6.0.0 -> 6.1.1 --- pkgs/tools/misc/hsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hsd/default.nix b/pkgs/tools/misc/hsd/default.nix index ebbba1de07d8..a1e82076cca4 100644 --- a/pkgs/tools/misc/hsd/default.nix +++ b/pkgs/tools/misc/hsd/default.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "hsd"; - version = "6.0.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "handshake-org"; repo = "hsd"; rev = "v${version}"; - hash = "sha256-4dWCCybhcdrkLFqUVTajRMnhzNgjpXUN2a+TNIi+Dqo="; + hash = "sha256-T57kDEQwHIyW7xVXrzjJdUcocST9ks4x3JR8yytH8P4="; }; - npmDepsHash = "sha256-ZbBu9hnRsC9LrHozny3OlHhgcDbp6ACjXRV4UHneHQc="; + npmDepsHash = "sha256-EBrCuRckBg42k6ZUoB25xObv3lULnSPNJ2nO9l/TWvA="; nativeBuildInputs = [ python3 From 17d827c75334fdf35ab9edab6aec3a8ef71649b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 11:13:21 +0000 Subject: [PATCH 35/47] httplib: 0.14.2 -> 0.14.3 --- pkgs/development/libraries/httplib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index 22c81d57e9df..a65440848bee 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-JfxeXHo34MKtAkMO3pNWiPorh3f8s4SVrdAaydVYdrY="; + hash = "sha256-53EBZTpz0INtjVSmjvg7XOQf0Bs2ADVe2//+nK6xRyE="; }; nativeBuildInputs = [ cmake ]; From 85ac3a4bc64fd1f3db41e3f4c2c32d98cfd7cad0 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 21 Jul 2023 20:34:39 +0400 Subject: [PATCH 36/47] =?UTF-8?q?nanomq:=200.18.2=20=E2=86=92=200.20.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/mqtt/nanomq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix index 902b5369df07..eb4bdf325e91 100644 --- a/pkgs/servers/mqtt/nanomq/default.nix +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.18.2"; + version = "0.20.8"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; rev = finalAttrs.version; - hash = "sha256-XGJBBuRSL3InXUMGxOttdbt0zmI1APFlc4IvwC2up8g="; + hash = "sha256-VCKlXQ7qvBab+wRDnJ6EUA5qaQ36gTFfuerN1GU6sW0="; fetchSubmodules = true; }; @@ -71,7 +71,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DNNG_ENABLE_TLS=ON" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-implicit-function-declaration -Wno-error=implicit-int"; # disabled by default - not 100% reliable and making nanomq depend on # mosquitto would annoy people From ced1438d5beebeeb2649978118e2b4f4e3c7c5f5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 27 Dec 2023 02:13:06 +1300 Subject: [PATCH 37/47] maintainers/teams: remove adisbladis from podman --- .github/CODEOWNERS | 7 ------- maintainers/team-list.nix | 1 - 2 files changed, 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 53bdca8dfbfd..8c25c757fca3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -268,13 +268,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/development/php-packages @aanderse @drupol @etu @globin @ma27 @talyz /pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz -# Podman, CRI-O modules and related -/nixos/modules/virtualisation/containers.nix @adisbladis -/nixos/modules/virtualisation/cri-o.nix @adisbladis -/nixos/modules/virtualisation/podman @adisbladis -/nixos/tests/cri-o.nix @adisbladis -/nixos/tests/podman @adisbladis - # Docker tools /pkgs/build-support/docker @roberth /nixos/tests/docker-tools* @roberth diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c80055f254fe..6bf83c6907d0 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -767,7 +767,6 @@ with lib.maintainers; { podman = { members = [ - adisbladis saschagrunert vdemeester ]; From 4db68fa4fdf0cd3d6b521f2562c681ebb91bec6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 14:04:10 +0000 Subject: [PATCH 38/47] kaniko: 1.19.1 -> 1.19.2 --- pkgs/applications/networking/cluster/kaniko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 832d98a589f8..2127ae5b3135 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-iSiVRbq6ohAXAWhHUUFUG/6rjlsmgYmy9VAzx76JIt0="; + hash = "sha256-YxOuZb1R9Orm3RTnZyzi54VzQbbmE+lO+4osvG97pwE="; }; vendorHash = null; From 3a22fbfdd26dd39702028d388d6da18b73fbd3ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 14:49:38 +0000 Subject: [PATCH 39/47] kubefirst: 2.3.6 -> 2.3.7 --- pkgs/applications/networking/cluster/kubefirst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 06d774c80bd4..c7c2b795179c 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-PFI7sBLcDIxes7fJnT1sgJbRITyoYptpupfOd6lisjs="; + hash = "sha256-oJWQ5u85uQrHnf3VxY0vJwgGePxB4pg+LD0gofYIB1g="; }; vendorHash = "sha256-blMKBgSBRCVlXu8n3wcd2iMkBTALe2gPxy0Z4uwxUWI="; From c6518b3b0b20b8b27427c1c964b38110eaadaa80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 14:55:46 +0000 Subject: [PATCH 40/47] kubevpn: 2.1.3 -> 2.2.0 --- pkgs/applications/networking/cluster/kubevpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index 643f5daf9a81..36c377b75c54 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-KHOqVVB1QjhhPUopeZd/A/htanmIoLCNhtnWrqyEN2A="; + sha256 = "sha256-n65z7L82qQE4Xao5W99zIkXGEx2BFM4n/6C1cuTJXsk="; }; vendorHash = null; From 0392a075113e55b636018f45d9c9e5e8981e5156 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Dec 2023 15:57:49 +0100 Subject: [PATCH 41/47] nixos/lib/make-disk-image: Create build products metadata For hydra to expose built images for direct download, listing the relevant files in nix-support/hydra-build-products is required. --- nixos/lib/make-disk-image.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index e5d82f4de7c9..1a33abd01ea1 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -522,11 +522,16 @@ let format' = format; in let chmod 0644 $efiVars ''; + createHydraBuildProducts = '' + mkdir -p $out/nix-support + echo "file ${format}-image $out/${filename}" >> $out/nix-support/hydra-build-products + ''; + buildImage = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name { preVM = prepareImage + lib.optionalString touchEFIVars createEFIVars; buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ]; - postVM = moveOrConvertImage + postVM; + postVM = moveOrConvertImage + createHydraBuildProducts + postVM; QEMU_OPTS = concatStringsSep " " (lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}" ++ lib.optionals touchEFIVars [ @@ -616,5 +621,5 @@ let format' = format; in let in if onlyNixStore then pkgs.runCommand name {} - (prepareImage + moveOrConvertImage + postVM) + (prepareImage + moveOrConvertImage + createHydraBuildProducts + postVM) else buildImage From 436509cb3113e3d2c73dcbe7ce8293d5e20a6131 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Tue, 26 Dec 2023 12:10:28 -0300 Subject: [PATCH 42/47] discord-stable: 0.0.38 -> 0.0.39 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 4eb13cb3b943..7d5b8aaa4e9d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { - stable = "0.0.38"; + stable = "0.0.39"; ptb = "0.0.61"; canary = "0.0.224"; development = "0.0.1"; @@ -17,7 +17,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-0i3xtArA/5LDyGiNQ/FjV3tU7Jzs8E6ZRuSUFNEJyDo="; + hash = "sha256-KZLKBzd9hdOQkp7mN0rUZ8TbMvH2G0/AfwHPLAlDpug="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From fc38d28b26904c294b33b64cdce0866e778b6bc8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Nov 2023 14:30:28 +0100 Subject: [PATCH 43/47] qemu: 8.1.3 -> 8.2.0 --- pkgs/applications/virtualization/qemu/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1dc000c3f41e..1cdd9f07337a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages , pixman, vde2, alsa-lib, texinfo, flex -, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool +, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson +, sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp , CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet @@ -53,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.1.3"; + version = "8.2.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs="; + hash = "sha256-vwDS+hIBDfiwrekzcd71jmMssypr/cX1oP+Oah+xvzI="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] @@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper removeReferencesTo - pkg-config flex bison meson ninja + pkg-config flex bison dtc meson ninja # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme From 98a73e1caf11c5c750cea73d9d42b25463dd70b9 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Tue, 26 Dec 2023 17:17:30 +0100 Subject: [PATCH 44/47] orca-slicer: init at 1.8.1 (#275638) * orca-slicer: init at 1.8.1 * Update pkgs/applications/misc/bambu-studio/orca-slicer.nix Co-authored-by: Sandro * Update pkgs/applications/misc/bambu-studio/orca-slicer.nix Co-authored-by: Sandro --------- Co-authored-by: Sandro --- .../misc/bambu-studio/default.nix | 1 + .../misc/bambu-studio/orca-slicer.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/bambu-studio/orca-slicer.nix diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 77a6375b1979..69a27c06d671 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -168,5 +168,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3; maintainers = with maintainers; [ zhaofengli ]; mainProgram = "bambu-studio"; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix new file mode 100644 index 000000000000..17896cf5fa20 --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: +let + orca-slicer = bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { + version = "1.8.1"; + pname = "orca-slicer"; + + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-3aIVi7Wsit4vpFrGdqe7DUEC6HieWAXCdAADVtB5HKc="; + }; + + meta = with lib; { + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + homepage = "https://github.com/SoftFever/OrcaSlicer"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; + mainProgram = "orca-slicer"; + platforms = platforms.linux; + }; + }); +in +orca-slicer diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40b3ef828de0..0dc617d58cf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35461,6 +35461,8 @@ with pkgs; }; }; + orca-slicer = callPackage ../applications/misc/bambu-studio/orca-slicer.nix {}; + snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; From fd41fdd34af55fe739863b233a2db94a0ebe14a4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 14:54:12 +0100 Subject: [PATCH 45/47] sox: fix build with enableOpusfile = false pkg-config seems to now always be required. --- pkgs/applications/misc/audio/sox/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 60e8a3fe029c..1b8e0541346a 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autoconf-archive - ] ++ lib.optionals enableOpusfile [ - # configure.ac uses pkg-config only to locate libopusfile pkg-config ]; From c31565f9b35e02d5f73300a4edeac9c9b2029bdf Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 14:57:55 +0100 Subject: [PATCH 46/47] pkgsStatic.libao: fix build --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dc617d58cf7..be69350565a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22429,7 +22429,7 @@ with pkgs; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; libao = callPackage ../development/libraries/libao { - usePulseAudio = config.pulseaudio or stdenv.isLinux; + usePulseAudio = config.pulseaudio or lib.meta.availableOn stdenv.hostPlatform libpulseaudio; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; From 7b7b4967d43eb281bc995f1debcc20911fa222e8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 00:16:39 +0100 Subject: [PATCH 47/47] lib/licenses: add missing spdxids --- lib/licenses.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index baf92007123d..8dc01e560746 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -104,6 +104,7 @@ in mkLicense lset) ({ }; arphicpl = { + spdxId = "Arphic-1999"; fullName = "Arphic Public License"; url = "https://www.freedesktop.org/wiki/Arphic_Public_License/"; }; @@ -236,6 +237,7 @@ in mkLicense lset) ({ }; cal10 = { + spdxId = "CAL-1.0"; fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)"; url = "https://opensource.org/licenses/CAL-1.0"; }; @@ -429,6 +431,7 @@ in mkLicense lset) ({ }; elastic20 = { + spdxId = "Elastic-2.0"; fullName = "Elastic License 2.0"; url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt"; free = false; @@ -598,6 +601,7 @@ in mkLicense lset) ({ # Intel's license, seems free iasl = { + spdxId = "Intel-ACPI"; fullName = "iASL"; url = "https://old.calculate-linux.org/packages/licenses/iASL"; }; @@ -609,7 +613,7 @@ in mkLicense lset) ({ imagemagick = { fullName = "ImageMagick License"; - spdxId = "imagemagick"; + spdxId = "ImageMagick"; }; imlib2 = { @@ -803,6 +807,7 @@ in mkLicense lset) ({ }; miros = { + spdxId = "MirOS"; fullName = "MirOS License"; url = "https://opensource.org/licenses/MirOS"; }; @@ -1138,6 +1143,7 @@ in mkLicense lset) ({ }; upl = { + spdxId = "UPL-1.0"; fullName = "Universal Permissive License"; url = "https://oss.oracle.com/licenses/upl/"; }; @@ -1194,6 +1200,7 @@ in mkLicense lset) ({ }; xfig = { + spdxId = "Xfig"; fullName = "xfig"; url = "https://mcj.sourceforge.net/authors.html#xfig"; };