From 87aa24b63759c08158170e301fe43a69a0c12073 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 3 Jan 2022 20:08:11 -0800 Subject: [PATCH 01/16] obsPlugins.looking-glass-obs: fix src name usage (cherry picked from commit 281f28d93d06c6516bf6faefb6bddb1d04e29bf4) --- .../applications/video/obs-studio/plugins/looking-glass-obs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix index 1dbfef2a864..28e72d96daa 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = looking-glass-client.src; - sourceRoot = "source/obs"; + sourceRoot = "${looking-glass-client.src.name}/obs"; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio libbfd SDL2 ]; From 087182d5e3a2f7a5752e9dc155b7c4c40ad58f5d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 6 Jan 2023 17:36:57 +0800 Subject: [PATCH 02/16] pantheon.elementary-feedback: 6.1.2 -> 7.0.0 --- pkgs/desktops/pantheon/apps/elementary-feedback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 9f97fd94e53..d24778ffe57 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "6.1.2"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "feedback"; rev = version; - sha256 = "sha256-vZTc6n7SHtHTCmC/RsCibVHcj67ksbghDosHBZfOIHM="; + sha256 = "sha256-QvqyaI9szZuYuE3D6o4zjr5J6mvEzNHqTBWii+gjyMc="; }; patches = [ From 23ba1ad05398ef2d3c2c0e03be6e6444bcdd2953 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 6 Jan 2023 18:07:06 +0100 Subject: [PATCH 03/16] yosys: 0.24 -> 0.25 https://github.com/YosysHQ/yosys/releases/tag/yosys-0.25 --- pkgs/development/compilers/yosys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 7594d748765..122de5ac100 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.24"; + version = "0.25"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-rso08/b0ukrh6KYFpn4bFn0pP83URfeJGw28iLIjlPw="; + hash = "sha256-hOuuKvT6ZM7G0HTGtVeEHHfJWqwUinD+DxT3r0CQZH0="; }; enableParallelBuilding = true; From 913ac1f243afcb902515cd4f556a916499b38b09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 22:22:42 +0000 Subject: [PATCH 04/16] jpegoptim: 1.5.0 -> 1.5.1 --- pkgs/applications/graphics/jpegoptim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index d4582280079..951bb9d7d89 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.5.0"; + version = "1.5.1"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fTtNDjswxHv2kHU55RCzz9tdlXw+RUCSoe3qF4hQ7u4="; + sha256 = "sha256-QPipwBk+BS/u3YxB8ACeFXQSuoW1aynEyG3tEMrhcaE="; }; # There are no checks, it seems. From 361dd1f0d8678ed2e3f149aff04b15ee7a7f08c2 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Sat, 7 Jan 2023 00:28:42 +0000 Subject: [PATCH 05/16] smiley-sans: 1.0.0 -> 1.1.0 --- pkgs/data/fonts/smiley-sans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/data/fonts/smiley-sans/default.nix index 3bef9608b46..234dcd0bfcb 100644 --- a/pkgs/data/fonts/smiley-sans/default.nix +++ b/pkgs/data/fonts/smiley-sans/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "smiley-sans"; - version = "1.0.0"; + version = "1.1.0"; src = fetchzip { url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip"; - sha256 = "sha256-LE0CZkWiXjyuiEk316ABCNQL9n5GID8CipjBIu2o6uk="; + sha256 = "sha256-ufx/n3c7XoTZAxmdUMD4fc25z6By3/H4TOn0RtHOwyQ="; stripRoot = false; }; From 64454713981e59cdf755fcf178539866493c3538 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Sat, 7 Jan 2023 00:34:34 +0000 Subject: [PATCH 06/16] smiley-sans: add update script --- pkgs/data/fonts/smiley-sans/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/data/fonts/smiley-sans/default.nix index 234dcd0bfcb..f90ae32d35c 100644 --- a/pkgs/data/fonts/smiley-sans/default.nix +++ b/pkgs/data/fonts/smiley-sans/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchzip }: +{ lib, stdenvNoCC, fetchzip, nix-update-script }: stdenvNoCC.mkDerivation rec { pname = "smiley-sans"; @@ -18,6 +18,10 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "A condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric"; homepage = "https://atelier-anchor.com/typefaces/smiley-sans/"; From d74e0d32bd1d97854844e3245bf7554fb07fede0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 7 Jan 2022 09:04:27 -0800 Subject: [PATCH 07/16] python3Packages.charset-normalizer: add downstream tests --- .../python-modules/charset-normalizer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index 9661700a285..b40ef02fd6d 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -3,6 +3,10 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder + + # popular downstream dependencies +, aiohttp +, requests }: buildPythonPackage rec { @@ -32,6 +36,8 @@ buildPythonPackage rec { "charset_normalizer" ]; + passthru.tests = { inherit aiohttp requests; }; + meta = with lib; { description = "Python module for encoding and language detection"; homepage = "https://charset-normalizer.readthedocs.io/"; From 4bddc2da0831cc41db5aa878de0e3e3610c4f93b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 03:07:21 +0000 Subject: [PATCH 08/16] =?UTF-8?q?terraform-providers.baiducloud:=201.19.2?= =?UTF-8?q?=20=E2=86=92=201.19.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 24bfad51912..c149df942b1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -149,11 +149,11 @@ }, "baiducloud": { "deleteVendor": true, - "hash": "sha256-g3+n0Q0Hl4yRaYK0snl4um5B5FS54Y6aMM7LeluPik4=", + "hash": "sha256-tEvD70BbN/4376HjE2Yez2qHOM2o3/Uu925HRnmJNwg=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.2", + "rev": "v1.19.3", "spdx": "MPL-2.0", "vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY=" }, From a466f2e45091ca683f315cfd23f8174232b3abaf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 03:09:11 +0000 Subject: [PATCH 09/16] =?UTF-8?q?terraform-providers.bitbucket:=202.29.0?= =?UTF-8?q?=20=E2=86=92=202.29.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c149df942b1..0a37bc3c2c2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -167,11 +167,11 @@ "vendorHash": null }, "bitbucket": { - "hash": "sha256-xDUL9W6lQGMZPQBe4eghW9JcQeTUgm+3ND6erikVFMM=", + "hash": "sha256-i9Ka0RoHWcrctgJIusQyySirLSXVbD9MFJ6gljzgSl4=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.29.0", + "rev": "v2.29.1", "spdx": "MPL-2.0", "vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0=" }, From e1e086a69b421e0db8678f981e7b2b0e9251a946 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 03:15:18 +0000 Subject: [PATCH 10/16] =?UTF-8?q?terraform-providers.scaleway:=202.8.0=20?= =?UTF-8?q?=E2=86=92=202.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0a37bc3c2c2..54191469e1d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -969,13 +969,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-2991jDjOlyJuVcgzTmfKfMt4NfLc1QP7TY9mw+5Z5aM=", + "hash": "sha256-dxXEGAkmemTHmGvKOwe3+xVE+nP4CAr82JmL3Nh+BQA=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.8.0", + "rev": "v2.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YlZSM3duS2QEZo5j+WvCw5KFPbY+NadYonylpB8Zw+o=" + "vendorHash": "sha256-bzx/Hl2JobtIa+ndvu1ssKg+faxt+JmJe4BL/go/0WY=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From d37c0bcaeb5def02dbda0902e6b57e9e4646a98a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 03:16:13 +0000 Subject: [PATCH 11/16] =?UTF-8?q?terraform-providers.azurerm:=203.37.0=20?= =?UTF-8?q?=E2=86=92=203.38.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 54191469e1d..752f934b70d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -130,11 +130,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-xrP3znKMbS4jwtKxIobo8IIeiDp+clFboPrJY6aVYlA=", + "hash": "sha256-ZLQV8hHh5U+qvBQovPxisPZ1BDUBH5YoKEt240bzQ0Y=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.37.0", + "rev": "v3.38.0", "spdx": "MPL-2.0", "vendorHash": null }, From c27ddaaf2ecc4db8b8c530632d54ba2701452d84 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 03:17:00 +0000 Subject: [PATCH 12/16] =?UTF-8?q?terraform-providers.signalfx:=206.18.0=20?= =?UTF-8?q?=E2=86=92=206.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 752f934b70d..92d5b65facb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1014,13 +1014,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-alLC61bEaFiVtoH0Fczj7G0m70ie1RNvTBR+MgYZGkQ=", + "hash": "sha256-qzLP+IGZU5bms8zjtcUg9rApZW2+TCF7KrtqSQvr3lw=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.18.0", + "rev": "v6.20.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=" + "vendorHash": "sha256-zIF5NA5kHXEr3aUleWrCYg8PZTKnrFubaRlALnbTLHQ=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", From 0166341b2c8bffdfa7c6aff252c887c7fb834124 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 03:59:42 +0000 Subject: [PATCH 13/16] babashka: 1.0.168 -> 1.0.169 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index be9ddd9d0b6..0934e73a19a 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.0.168"; + version = "1.0.169"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-K56SEfSq0mjltUwR2VZxGiGn9nnEdDBoZrkaBOIIl7k="; + sha256 = "sha256-R4oGMN/2oVPKe0JBXXQ1mzw0F66Wn+WiP0kVs53zdoI="; }; executable = "bb"; From 52519fd12e639abdc4dbc8e054f73d68c923a505 Mon Sep 17 00:00:00 2001 From: 360ied <19516527+360ied@users.noreply.github.com> Date: Thu, 22 Dec 2022 10:18:26 -0500 Subject: [PATCH 14/16] classicube: add .desktop file --- pkgs/games/classicube/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index 05a5fa11931..a616a37ced0 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { postBuild = "cd -"; installPhase = '' + runHook preInstall mkdir -p "$out/bin" cp 'src/ClassiCube' "$out/bin" # ClassiCube puts downloaded resources @@ -75,6 +76,21 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/ClassiCube" \ --run 'mkdir -p "$HOME/.local/share/ClassiCube"' \ --run 'cd "$HOME/.local/share/ClassiCube"' + runHook postInstall + ''; + + postInstall = '' + mkdir -p "$out/share/applications" "$out/share/resources" + cp 'misc/CCicon.png' "$out/share/resources" + cat >"$out/share/applications/ClassiCube.desktop" < Date: Tue, 27 Dec 2022 16:49:58 -0500 Subject: [PATCH 15/16] classicube: use makeDesktopItem --- pkgs/games/classicube/default.nix | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index a616a37ced0..07eded71e7b 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , dos2unix , makeWrapper +, makeDesktopItem +, copyDesktopItems , SDL2 , libGL , curl @@ -21,7 +23,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI="; }; - nativeBuildInputs = [ dos2unix makeWrapper ]; + nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = pname; + genericName = "Sandbox Block Game"; + exec = "ClassiCube"; + icon = "CCicon"; + comment = "Minecraft Classic inspired sandbox game"; + categories = [ "Game" ]; + }) + ]; prePatch = '' # The ClassiCube sources have DOS-style newlines @@ -77,20 +91,9 @@ stdenv.mkDerivation rec { --run 'mkdir -p "$HOME/.local/share/ClassiCube"' \ --run 'cd "$HOME/.local/share/ClassiCube"' runHook postInstall - ''; - postInstall = '' - mkdir -p "$out/share/applications" "$out/share/resources" - cp 'misc/CCicon.png' "$out/share/resources" - cat >"$out/share/applications/ClassiCube.desktop" < Date: Fri, 6 Jan 2023 22:02:28 -0500 Subject: [PATCH 16/16] classicube: move runHook postInstall --- pkgs/games/classicube/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index 07eded71e7b..06c914e56f1 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mkdir -p "$out/bin" cp 'src/ClassiCube' "$out/bin" # ClassiCube puts downloaded resources @@ -90,10 +91,11 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/ClassiCube" \ --run 'mkdir -p "$HOME/.local/share/ClassiCube"' \ --run 'cd "$HOME/.local/share/ClassiCube"' - runHook postInstall mkdir -p "$out/share/icons/hicolor/256x256/apps" cp misc/CCicon.png "$out/share/icons/hicolor/256x256/apps" + + runHook postInstall ''; meta = with lib; {