From 65a512daf3e755852a8138fed6ee0fa4a984d19b Mon Sep 17 00:00:00 2001 From: Levi Gross Date: Fri, 28 Apr 2023 17:50:49 -0400 Subject: [PATCH 1/9] remmina: Use the system's cert store --- pkgs/applications/networking/remote/remmina/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index a76bad22c9e2..67882e992cee 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( + --set SSL_CERT_DIR : "/etc/ssl/certs/" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ) ''; From 9f805a40876f52643fd0543fe3bbe5b93b257dba Mon Sep 17 00:00:00 2001 From: Levi Gross Date: Sun, 7 May 2023 13:13:33 -0400 Subject: [PATCH 2/9] Set doesn't take a colon --- pkgs/applications/networking/remote/remmina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 67882e992cee..96585b9fa127 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --set SSL_CERT_DIR : "/etc/ssl/certs/" + --set SSL_CERT_DIR "/etc/ssl/certs/" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ) ''; From fdfe19932f5b92662b9d2c8c6a6902cb06b3debd Mon Sep 17 00:00:00 2001 From: Levi Gross Date: Wed, 10 May 2023 10:08:51 -0400 Subject: [PATCH 3/9] Use `set-default` so that we don't override the exisiting environment variable --- pkgs/applications/networking/remote/remmina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 96585b9fa127..6653e1ac3512 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --set SSL_CERT_DIR "/etc/ssl/certs/" + --set-default SSL_CERT_DIR "/etc/ssl/certs/" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ) ''; From 7f588939355d41902aa6949e0d1bb734505a40e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 8 Aug 2023 19:58:59 +0200 Subject: [PATCH 4/9] mpvScripts.visualizer: init at unstable-2021-07-10 --- .../video/mpv/scripts/default.nix | 1 + .../video/mpv/scripts/visualizer.nix | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/visualizer.nix diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 1a2bb9260840..62c4e8bf9aa0 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -20,6 +20,7 @@ lib.recurseIntoAttrs thumbfast = callPackage ./thumbfast.nix { }; thumbnail = callPackage ./thumbnail.nix { }; uosc = callPackage ./uosc.nix { }; + visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; cutter = callPackage ./cutter.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix new file mode 100644 index 000000000000..a248b63d503a --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "visualizer"; + version = "unstable-2021-07-10"; + + src = fetchFromGitHub { + owner = "mfcc64"; + repo = "mpv-scripts"; + rev = "a0cd87eeb974a4602c5d8086b4051b5ab72f42e1"; + sha256 = "1xgd1nd117lpj3ppynhgaa5sbkfm7l8n6c9a2fy8p07is2dkndrq"; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/mpv/scripts + cp visualizer.lua $out/share/mpv/scripts + runHook postInstall + ''; + + passthru.scriptName = "visualizer.lua"; + + meta = with lib; { + description = "various audio visualization"; + homepage = "https://github.com/mfcc64/mpv-scripts"; + platforms = platforms.all; + maintainers = with maintainers; [kmein]; + }; +} From 784b4a8b70ec5f2809e7be0b058c943349b64ac1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 12:07:55 -0400 Subject: [PATCH 5/9] nil: 2023-05-09 -> 2023-08-09 Diff: https://github.com/oxalica/nil/compare/2023-05-09...2023-08-09 Changelog: https://github.com/oxalica/nil/releases/tag/2023-08-09 --- .../tools/language-servers/nil/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix index 6b3976dfa16b..19822d2977fc 100644 --- a/pkgs/development/tools/language-servers/nil/default.nix +++ b/pkgs/development/tools/language-servers/nil/default.nix @@ -1,24 +1,24 @@ -{ lib, rustPlatform, fetchFromGitHub, nix, nix-update-script }: +{ lib, rustPlatform, fetchFromGitHub, nixVersions, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2023-05-09"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-Xg3Cux5wQDatXRvQWsVD0YPfmxfijjG8+gxYqgoT6JE="; + hash = "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068="; }; - cargoHash = "sha256-N7flQRIc0CXTuKjy9tVZapu+CXUT4rg66VLLT/vMUoc="; - - CFG_RELEASE = version; + cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo="; nativeBuildInputs = [ - (lib.getBin nix) + (lib.getBin nixVersions.unstable) ]; + env.CFG_RELEASE = version; + # might be related to https://github.com/NixOS/nix/issues/5884 preBuild = '' export NIX_STATE_DIR=$(mktemp -d) From 960c4e36bdd119b207bdf9912789f2618a00b16c Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 9 Aug 2023 14:34:01 -0300 Subject: [PATCH 6/9] openra: drop rardiol maintainership --- pkgs/games/openra_2019/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/openra_2019/common.nix b/pkgs/games/openra_2019/common.nix index 4445cc53ba6a..5932eeb6e6d0 100644 --- a/pkgs/games/openra_2019/common.nix +++ b/pkgs/games/openra_2019/common.nix @@ -61,7 +61,7 @@ in { dontStrip = true; meta = { - maintainers = with maintainers; [ fusion809 msteen rardiol ]; + maintainers = with maintainers; [ fusion809 msteen ]; license = licenses.gpl3; platforms = platforms.linux; }; From cf78a8c3e76bfab552d4853a0c7f67f2ceda431e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 9 Aug 2023 19:54:13 +0200 Subject: [PATCH 7/9] CODEOWNERS: Add myself to the contributing documentation I want to take ownership of this part of the documentation, especially with the cleanup in https://github.com/NixOS/nixpkgs/pull/245243. Doing so before that PR is merged also allows me to get notified about any potential future merge conflicts before they happen. --- .github/CODEOWNERS | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4c5ac8ab0556..c41cb02ba0a5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -59,8 +59,12 @@ /maintainers/scripts/doc @jtojnar @ryantm /doc/build-aux/pandoc-filters @jtojnar -/doc/contributing/ @fricklerhandwerk -/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @fricklerhandwerk + +# Contributor documentation +/CONTRIBUTING.md @infinisil +/.github/PULL_REQUEST_TEMPLATE.md +/doc/contributing/ @fricklerhandwerk @infinisil +/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @fricklerhandwerk @infinisil # NixOS Internals /nixos/default.nix @infinisil From 0d4e8459aea27861560b5055ad08c706f4ee1d97 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 9 Aug 2023 20:00:48 +0200 Subject: [PATCH 8/9] CODEOWNERS: Remove non-existent file Was removed in f397309f4e6c7a219a7703b629f6a4e8d4e7a58b --- .github/CODEOWNERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c41cb02ba0a5..a5723c25be03 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -58,8 +58,6 @@ /maintainers/scripts/db-to-md.sh @jtojnar @ryantm /maintainers/scripts/doc @jtojnar @ryantm -/doc/build-aux/pandoc-filters @jtojnar - # Contributor documentation /CONTRIBUTING.md @infinisil /.github/PULL_REQUEST_TEMPLATE.md From 69bbcbb06110c9d95a2c5fc2bc636cc8a444ab7b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 9 Aug 2023 20:23:07 +0200 Subject: [PATCH 9/9] CODEOWNERS: Add myself to PULL_REQUEST_TEMPLATE Forgot about that in https://github.com/NixOS/nixpkgs/pull/248166 --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a5723c25be03..45bc58a9def7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -60,7 +60,7 @@ # Contributor documentation /CONTRIBUTING.md @infinisil -/.github/PULL_REQUEST_TEMPLATE.md +/.github/PULL_REQUEST_TEMPLATE.md @infinisil /doc/contributing/ @fricklerhandwerk @infinisil /doc/contributing/contributing-to-documentation.chapter.md @jtojnar @fricklerhandwerk @infinisil