From 6077061403503589d225fc0a51a514800517d813 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Thu, 15 Jun 2023 17:15:23 +0530 Subject: [PATCH 01/18] nixos/ruby-modules: proper treatment to ruby modules of type git/url --- .../ruby-modules/bundled-common/default.nix | 5 +++-- pkgs/development/ruby-modules/bundler-app/default.nix | 5 ++++- pkgs/development/ruby-modules/gem/default.nix | 11 ++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index aa903a5637c0..b18248c7d61b 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -56,9 +56,9 @@ let else let gem = gems.${pname}; - version = gem.version; + suffix = gem.suffix; in - "${pname}-${version}"; + "${pname}-${suffix}"; pname' = if pname != null then pname @@ -118,6 +118,7 @@ let passthru = rec { inherit ruby bundler gems confFiles envPaths; + inherit (gems.${pname}) gemType; wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 5bb9e47cf5a6..01e90ba53f1f 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -68,7 +68,10 @@ in ${lib.optionalString installManpages '' for section in {1..9}; do mandir="$out/share/man/man$section" - find -L ${basicEnv}/${ruby.gemPath}/gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; + + # See: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/ruby-modules/gem/default.nix#L184-L200 + # See: https://github.com/rubygems/rubygems/blob/7a7b234721c375874b7e22b1c5b14925b943f04e/bundler/lib/bundler.rb#L285-L291 + find -L ${basicEnv}/${ruby.gemPath}/${lib.optionalString (basicEnv.gemType == "git" || basicEnv.gemType == "url") "bundler/"}gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; done ''} '' diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 7105663413a2..b33758486eed 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -75,6 +75,14 @@ let else throw "buildRubyGem: don't know how to build a gem of type \"${type}\"" ); + + # See: https://github.com/rubygems/rubygems/blob/7a7b234721c375874b7e22b1c5b14925b943f04e/bundler/lib/bundler/source/git.rb#L103 + suffix = + if type == "git" then + builtins.substring 0 12 attrs.source.rev + else + version; + documentFlag = if document == [] then "-N" @@ -86,6 +94,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; inherit dontBuild; inherit dontStrip; + inherit suffix; gemType = type; nativeBuildInputs = [ @@ -100,7 +109,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { ++ buildInputs; #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; - name = attrs.name or "${namePrefix}${gemName}-${version}"; + name = attrs.name or "${namePrefix}${gemName}-${suffix}"; inherit src; From 11d22229ad01f17682b13ec98f95286ce0ff11e6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 3 Jul 2023 08:26:42 -0400 Subject: [PATCH 02/18] nix-plugins: 10.0.0 -> 11.0.0 --- pkgs/development/libraries/nix-plugins/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index e801a9c0ee55..23cac5f0cfe9 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "10.0.0"; + version = "11.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - hash = "sha256-7Lo+YxpiRz0+ZLFDvYMJWWK2j0CyPDRoP1wAc+OaPJY="; + hash = "sha256-sJL8g+UVFvJTqujS9F6gy8tairYUztHCSILkQlwDADU"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0da3f340ba5..6a30dc9157bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23577,7 +23577,9 @@ with pkgs; ngtcp2 = callPackage ../development/libraries/ngtcp2 { }; ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { }; - nix-plugins = callPackage ../development/libraries/nix-plugins { }; + nix-plugins = callPackage ../development/libraries/nix-plugins { + nix = nixVersions.nix_2_16; + }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; From feddaab9349eb6cddebafc469126f3acccbfdaee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Jul 2023 17:00:10 +0200 Subject: [PATCH 03/18] evcc: 0.118.2 -> 0.118.6 https://github.com/andig/evcc/releases/tag/0.118.3 https://github.com/andig/evcc/releases/tag/0.118.4 https://github.com/andig/evcc/releases/tag/0.118.5 https://github.com/andig/evcc/releases/tag/0.118.6 --- pkgs/servers/home-automation/evcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index d2d25006fa88..ed9bdf8999ae 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "evcc"; - version = "0.118.2"; + version = "0.118.6"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-4zbXNXNWrnsghbL2cvatCShuio7uIXbLtLmG0o4PGq0="; + hash = "sha256-4AJTXLH17D4AMmNus341VHu9bHAkosOaA7DIw9gbYOM="; }; vendorHash = "sha256-SFs7Bua3/bgTcdzvSisTn3Xx+7jD84LrMdaUhDXp9VI="; From 2d4e86acf1113294ec7167f0c448e926f1259b82 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 6 Jul 2023 04:20:00 +0000 Subject: [PATCH 04/18] millet: 0.12.2 -> 0.12.4 Diff: https://github.com/azdavis/millet/compare/v0.12.2...v0.12.4 Changelog: https://github.com/azdavis/millet/raw/v0.12.4/docs/CHANGELOG.md --- .../tools/language-servers/millet/Cargo.lock | 72 +++++++++---------- .../tools/language-servers/millet/default.nix | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index bffb17a54656..b4899f0c79d1 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "diagnostic", @@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "str-util", @@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "cm-syntax" -version = "0.12.2" +version = "0.12.4" dependencies = [ "lex-util", "paths", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "serde", @@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "once_cell", @@ -415,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.2" +version = "0.12.4" dependencies = [ "cm-syntax", "config", @@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.2" +version = "0.12.4" dependencies = [ "analysis", "anyhow", @@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.2" +version = "0.12.4" [[package]] name = "libc" @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.2" +version = "0.12.4" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.2" +version = "0.12.4" dependencies = [ "anyhow", "env_logger", @@ -622,7 +622,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "paths", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "diagnostic", @@ -657,7 +657,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.2" +version = "0.12.4" dependencies = [ "lex-util", "paths", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.12.2" +version = "0.12.4" dependencies = [ "better-panic", ] @@ -923,7 +923,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "str-util", @@ -931,14 +931,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.2" +version = "0.12.4" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "fmt-util", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "pretty_assertions", @@ -965,7 +965,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "elapsed", @@ -979,7 +979,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "once_cell", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.2" +version = "0.12.4" dependencies = [ "la-arena", "sml-lab", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "cov-mark", @@ -1014,14 +1014,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.2" +version = "0.12.4" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.2" +version = "0.12.4" dependencies = [ "cov-mark", "diagnostic", @@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "sml-comment", @@ -1045,11 +1045,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.2" +version = "0.12.4" [[package]] name = "sml-parse" -version = "0.12.2" +version = "0.12.4" dependencies = [ "diagnostic", "event-parse", @@ -1061,14 +1061,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.2" +version = "0.12.4" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.2" +version = "0.12.4" dependencies = [ "num-bigint", "num-traits", @@ -1077,7 +1077,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.2" +version = "0.12.4" dependencies = [ "chain-map", "config", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.2" +version = "0.12.4" dependencies = [ "chain-map", "code-h2-md-map", @@ -1119,7 +1119,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.2" +version = "0.12.4" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1127,7 +1127,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.2" +version = "0.12.4" dependencies = [ "char-name", "code-h2-md-map", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "sml-hir", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.2" +version = "0.12.4" dependencies = [ "analysis", "cm-syntax", @@ -1552,7 +1552,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.12.2" +version = "0.12.4" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index e35e8c69defb..59175f153e77 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.2"; + version = "0.12.4"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-qfBDwbAbj4XoZeH0hyS09iUfg0G1X1RjpVOSd+2twT0="; + hash = "sha256-RSi6rJL0RG1A1mKn4BznQjBfPlBvEC73vx0YevqvZ3E="; }; cargoLock = { From 45f4f704b2781ea1e1168bedca296199816cfc24 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 6 Jul 2023 09:05:07 +0100 Subject: [PATCH 05/18] mutt: avoid build-only references in 'mutt -v' The change removes `gcc` from runtime closure. This shrinks closure in half. Before the change: nix path-info -Sh $(nix-build -A mutt) |& unnix $ /<>/mutt-2.2.10 440.0M After the change: 218M $ nix path-info -Sh $(nix-build -A mutt) |& unnix /<>/mutt-2.2.10 218.7M --- .../networking/mailreaders/mutt/default.nix | 5 +++- .../mailreaders/mutt/no-build-only-refs.patch | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/mailreaders/mutt/no-build-only-refs.patch diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index d449ae7db817..cda1e368f349 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-TXc/IkIveQlve5S1e+5FZUrZolFl27NkY8WClbTNPYg="; }; - patches = lib.optional smimeSupport (fetchpatch { + patches = [ + # Avoid build-only references embedding into 'mutt -v' output. + ./no-build-only-refs.patch + ] ++ lib.optional smimeSupport (fetchpatch { url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch"; sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi"; }); diff --git a/pkgs/applications/networking/mailreaders/mutt/no-build-only-refs.patch b/pkgs/applications/networking/mailreaders/mutt/no-build-only-refs.patch new file mode 100644 index 000000000000..de969a8a889e --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mutt/no-build-only-refs.patch @@ -0,0 +1,24 @@ +Avoid build-only store references embedding into 'mutt -v'. +--- a/txt2c.sh ++++ b/txt2c.sh +@@ -21,8 +21,18 @@ txt2c_fallback () { + echo ";" + } + ++nix_store_mangle() { ++ # consume stdin ++ ++ # Avoid build-only references to nix store. These are usually ++ # 'gcc -v' output embedded into 'mutt -v'. But also might be ++ # ./configure-passed arguments. ++ sed \ ++ -e 's@'$NIX_STORE'/[a-z0-9]\{32\}-@/<>/@g' ++} ++ + if ./txt2c test /dev/null 2>&1; then +- ./txt2c "$1" ++ nix_store_mangle | ./txt2c "$1" + else +- txt2c_fallback "$1" ++ nix_store_mangle | txt2c_fallback "$1" + fi From 151b1854f6ba4c8386d5737ed7cef5da2112af35 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 6 Jul 2023 18:32:23 -0400 Subject: [PATCH 06/18] nix-init: 0.2.3 -> 0.2.4 Diff: https://github.com/nix-community/nix-init/compare/v0.2.3...v0.2.4 Changelog: https://github.com/nix-community/nix-init/blob/v0.2.4/CHANGELOG.md --- pkgs/tools/nix/nix-init/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index 503c83d4fe15..d6a5df6272f4 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -4,10 +4,9 @@ , fetchFromGitHub , curl , installShellFiles -, makeBinaryWrapper , pkg-config , bzip2 -, libgit2_1_5 +, libgit2 , openssl , zlib , zstd @@ -26,28 +25,27 @@ in rustPlatform.buildRustPackage rec { pname = "nix-init"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-init"; rev = "v${version}"; - hash = "sha256-QxGPBGCCjbQ1QbJNoW0dwQS/srwQ0hBR424zmcqdjI8="; + hash = "sha256-VP0UwJhiY6gDF3tBI1DOW0B4XAl9CzTHzgIP68iF4VM="; }; - cargoHash = "sha256-+Vj3TqNxMgaUmhzCgSEGl58Jh1PLsC6q/DfDbfg2mmo="; + cargoHash = "sha256-x1zRQGWN2NOvDDrQgkeObf6eNoCGMSw3DVgwVqfbI48="; nativeBuildInputs = [ curl installShellFiles - makeBinaryWrapper pkg-config ]; buildInputs = [ bzip2 curl - libgit2_1_5 + libgit2 openssl zlib zstd @@ -76,14 +74,14 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - wrapProgram $out/bin/nix-init \ - --prefix PATH : ${lib.makeBinPath [ nix nurl ]} installManPage artifacts/nix-init.1 installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init ''; env = { GEN_ARTIFACTS = "artifacts"; + NIX = lib.getExe nix; + NURL = lib.getExe nurl; ZSTD_SYS_USE_PKG_CONFIG = true; }; From 83cd2a961dd98b1147e72e4c8070e38386bca9b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Jul 2023 09:32:04 +0000 Subject: [PATCH 07/18] smplayer: 22.7.0 -> 23.6.0 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 9ed563a69038..a26a72c24234 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "smplayer"; - version = "22.7.0"; + version = "23.6.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-vU+M5aCCGSA+IwJXTLMYvno/Qei+5Hwck3Q/Ah7N09s="; + hash = "sha256-xGy6/9aUftBTSo9HJ3zyuRSagqimP9XvXKP/4oBQTo4="; }; nativeBuildInputs = [ From c7c340e5a8db6a0478fd001cc787fc0d7c524a8d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 6 Jul 2023 20:29:50 -0300 Subject: [PATCH 08/18] smplayer: refactor - New rec-less, overlay-style overridable recursive attributes (in effect since https://github.com/NixOS/nixpkgs/pull/119942); - remove `with lib;` - add `meta.changelog` - "update" TODO --- pkgs/applications/video/smplayer/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index a26a72c24234..ba7992b97468 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -6,14 +6,14 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; version = "23.6.0"; src = fetchFromGitHub { owner = "smplayer-dev"; - repo = pname; - rev = "v${version}"; + repo = "smplayer"; + rev = "v${finalAttrs.version}"; hash = "sha256-xGy6/9aUftBTSo9HJ3zyuRSagqimP9XvXKP/4oBQTo4="; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - meta = with lib; { + meta = { homepage = "https://www.smplayer.info"; description = "A complete front-end for MPlayer"; longDescription = '' @@ -53,9 +53,10 @@ stdenv.mkDerivation rec { options of MPlayer, SMPlayer adds other interesting features like the possibility to play Youtube videos or download subtitles. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; -} -# TODO [ AndersonTorres ]: some form of wrapping mplayer/mpv around it +}) +# TODO [ AndersonTorres ]: create a wrapper including mplayer/mpv From ce8ad30fb2baa8577e59c74b9592280563426dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 6 Jul 2023 18:00:25 +0200 Subject: [PATCH 09/18] fsuae-launcher: 3.0.5 -> 3.1.68 --- pkgs/applications/emulators/fs-uae/launcher.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index e3f390034038..1f79cad8fc8e 100644 --- a/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "fs-uae-launcher"; - version = "3.0.5"; + version = "3.1.68"; src = fetchurl { - url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; - sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97"; + url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA="; }; nativeBuildInputs = [ From b5cd0848bfe0abcaf7623923f7bf439356992950 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 6 Jul 2023 20:46:21 -0300 Subject: [PATCH 10/18] fsuae-launcher: refactor - New rec-less, overlay-style overridable recursive attributes (in effect since https://github.com/NixOS/nixpkgs/pull/119942); - remove `with lib;` --- .../emulators/fs-uae/launcher.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index 1f79cad8fc8e..570b439f4a1e 100644 --- a/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix @@ -7,13 +7,13 @@ , fsuae }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fs-uae-launcher"; version = "3.1.68"; src = fetchurl { - url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA="; + url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz"; + hash = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA="; }; nativeBuildInputs = [ @@ -33,16 +33,17 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; preFixup = '' - wrapQtApp "$out/bin/fs-uae-launcher" --set PYTHONPATH "$PYTHONPATH" \ - --prefix PATH : ${lib.makeBinPath [ fsuae ]} + wrapQtApp "$out/bin/fs-uae-launcher" \ + --set PYTHONPATH "$PYTHONPATH" \ + --prefix PATH : ${lib.makeBinPath [ fsuae ]} ''; - meta = with lib; { + meta = { homepage = "https://fs-uae.net"; description = "Graphical front-end for the FS-UAE emulator"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ sander AndersonTorres ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ sander AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; -} +}) From 1d7c3a49858a3f37087aa4d53707d78b0358a95a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 6 Jul 2023 20:47:34 -0300 Subject: [PATCH 11/18] fsuae: refactor - New rec-less, overlay-style overridable recursive attributes (in effect since https://github.com/NixOS/nixpkgs/pull/119942); - remove `with lib;` --- .../applications/emulators/fs-uae/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/emulators/fs-uae/default.nix b/pkgs/applications/emulators/fs-uae/default.nix index 4bd67908a787..8f22a86283ed 100644 --- a/pkgs/applications/emulators/fs-uae/default.nix +++ b/pkgs/applications/emulators/fs-uae/default.nix @@ -17,15 +17,14 @@ , zlib }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "fs-uae"; version = "3.1.66"; src = fetchFromGitHub { owner = "FrodeSolheim"; - repo = pname; - rev = "v${version}"; + repo = "fs-uae"; + rev = "v${finalAttrs.version}"; hash = "sha256-zPVRPazelmNaxcoCStB0j9b9qwQDTgv3O7Bg3VlW9ys="; }; @@ -49,17 +48,17 @@ stdenv.mkDerivation rec { zlib ]; - meta = with lib; { + meta = { homepage = "https://fs-uae.net"; description = "An accurate, customizable Amiga Emulator"; longDescription = '' - FS-UAE integrates the most accurate Amiga emulation code available - from WinUAE. FS-UAE emulates A500, A500+, A600, A1200, A1000, A3000 - and A4000 models, but you can tweak the hardware configuration and - create customized Amigas. + FS-UAE integrates the most accurate Amiga emulation code available from + WinUAE. FS-UAE emulates A500, A500+, A600, A1200, A1000, A3000 and A4000 + models, but you can tweak the hardware configuration and create customized + Amigas. ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; -} +}) From 70904d0cc04588b41c33cda09a0aa80eac44f8b5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 6 Jul 2023 20:54:58 -0300 Subject: [PATCH 12/18] ventoy: remove `with lib;` Because I have a strong disgust about `with` since https://nix.dev/recipes/best-practices#with-scopes --- pkgs/tools/cd-dvd/ventoy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/cd-dvd/ventoy/default.nix b/pkgs/tools/cd-dvd/ventoy/default.nix index 2edf7a5fdb71..f1902597acdf 100644 --- a/pkgs/tools/cd-dvd/ventoy/default.nix +++ b/pkgs/tools/cd-dvd/ventoy/default.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://www.ventoy.net"; description = "A New Bootable USB Solution"; longDescription = '' @@ -203,9 +203,9 @@ stdenv.mkDerivation (finalAttrs: { 800+ image files are tested. 90%+ distros in DistroWatch supported. ''; changelog = "https://www.ventoy.net/doc_news.html"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) From 05ae3f8aa58b4926ac41499f05f68cd1ea95ee61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 03:32:57 +0000 Subject: [PATCH 13/18] terraform-providers.azurerm: 3.63.0 -> 3.64.0 --- .../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 aa4d89dc3573..d55053f2613a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-iZg9iTmomNmk8K1gPfXZNiesJPuKyjfBdTyoeV7qBdo=", + "hash": "sha256-PwAwVpLoMq5DNIiY5wt+n9oqNGInJ+C0JfiFagtrAEA=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.63.0", + "rev": "v3.64.0", "spdx": "MPL-2.0", "vendorHash": null }, From 272b2df8c9893ff5a0dad9f5adbb6b833cbfd8bf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 03:42:58 +0000 Subject: [PATCH 14/18] terraform-providers.google: 4.72.0 -> 4.72.1 --- .../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 d55053f2613a..110f6f4a87e1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -445,12 +445,12 @@ "vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc=" }, "google": { - "hash": "sha256-Mg4pB5FaphdPYBqev+KvNp0gucL8Oj8NDCh4Dk4B/jY=", + "hash": "sha256-ZOouPBEymdpVaDe1zBwbbeffZ/48lpfLmll6kl1TnJM=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.72.0", + "rev": "v4.72.1", "spdx": "MPL-2.0", "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" }, From 22f55216c3178d42657ba4d3e0cdbb458742eee6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 03:49:17 +0000 Subject: [PATCH 15/18] terraform-providers.aws: 5.6.2 -> 5.7.0 --- .../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 110f6f4a87e1..4c224e612f1a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-ZKP0Y65GgOxF9IIPR9YIkpm7+fanNuvWPKNBk8XY0ec=", + "hash": "sha256-LFOlSmsnV7opt9Z3b15Lyi8sFYjx2WkvvB8vpJBjfWQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.6.2", + "rev": "v5.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ucMaOdELGc71QDlEa3lYJU3HkmE85XFHgWBUT+Ds3EM=" + "vendorHash": "sha256-x8f1sTVB1FaoPKgTGEoZaNVKCpNbTrQ7F0PVfwEWe/I=" }, "azuread": { "hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=", From b2ded905b25d23d1c7b4ffe5dad071c3b2dec9d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 03:50:05 +0000 Subject: [PATCH 16/18] terraform-providers.google-beta: 4.72.0 -> 4.72.1 --- .../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 4c224e612f1a..d8a6ac9cc594 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -455,12 +455,12 @@ "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" }, "google-beta": { - "hash": "sha256-OF/7WiSkXkBqDC9dd8aN0YrIyC2YxevkUPCT8ftZ0b8=", + "hash": "sha256-wXBSAsRY1RajMu5npceI9N/c+c2lwEWyqsGP7xgfVA0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.72.0", + "rev": "v4.72.1", "spdx": "MPL-2.0", "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" }, From c2f9c374995a394d66bc59fbd609ffc354cc88ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 03:53:33 +0000 Subject: [PATCH 17/18] terraform-providers.okta: 4.0.2 -> 4.1.0 --- .../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 d8a6ac9cc594..48dfe0983bf0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -827,13 +827,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-yWi3Bp/fBizvb3k9nT72N5AjvLTUK1szXetwWUrqqlw=", + "hash": "sha256-cNVHEZPUkpruM7EDrriKeefzsHhwC+vyadTztRyGCFA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.0.2", + "rev": "v4.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-34mm1OjdJRMmMvV8OX96BidzW20RSKnOWmZbSRfNFlQ=" + "vendorHash": "sha256-0KB2L7L6EWN2VMsTKXtWElzBRfmny+JjarhhzZtWxtA=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From 6968383d96d56ab8339b0dcbd6fc278db720a4d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 03:58:06 +0000 Subject: [PATCH 18/18] terraform-providers.oci: 5.2.1 -> 5.3.0 --- .../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 48dfe0983bf0..2c7c5fb9b46d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -818,11 +818,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-kIZrfTwni3l2x9/W6efESz+4raU8bERD33N9H3f6Zbc=", + "hash": "sha256-58B09Oo276Eu7Rf34T1iGcmK7jF3c1yvUegyP2rQtqg=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.2.1", + "rev": "v5.3.0", "spdx": "MPL-2.0", "vendorHash": null },