From 98d32545dcc680dfd90797ac4f3e4ed0f0b9db27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Sun, 30 Jan 2022 17:06:06 +0100 Subject: [PATCH 001/122] weechat: 3.3 -> 3.4 https://github.com/weechat/weechat/releases/tag/v3.4 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 80f15eeff3c..bfde86a366a 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,14 +28,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-GnSi7uMxiyWSQau75q07NlX1ikaBeWOdrzOf9f0jnBM="; + sha256 = "sha256-+JhIVcGA2wcvTr4O5eTn5vNszHpCuEt6D90a743PfQU="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; From 04a1e43685e3e3aad93b7fc6589a3d2577213cfc Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 22 Feb 2022 03:52:09 +0100 Subject: [PATCH 002/122] pypy27_prebuilt: 7.3.6 -> 7.3.8 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 6bee51f6423..608486c3aa1 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -282,9 +282,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "6"; + patch = "8"; }; - sha256 = "sha256-ghJ/Q/rmznXUfWxFOfjB6jcunC2/pA+ui1g1HVInk6Q="; # linux64 + sha256 = "0h493q0lhpz035afi4g09f4mz5a72vqx4sa7qcry5z4zagxq8bhz"; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; From fd9c3674b94e68a8f2039472d21f6762d9387d4b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 22 Feb 2022 03:53:44 +0100 Subject: [PATCH 003/122] pypy27_prebuilt: remove unneeded openssl_1_0_2 dependency they ship their own openssl as of this commit, that is actually openssl 1.1.1m, the same version we have in openssl_1_1 maybe the package should still be marked as vulnerable, because they ship their own openssl --- pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 460af1cc67b..877a00efa48 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -7,7 +7,6 @@ # Dependencies , bzip2 , zlib -, openssl_1_0_2 , expat , ncurses6 , tcl-8_5 @@ -50,7 +49,6 @@ let deps = [ bzip2 zlib - openssl_1_0_2 expat ncurses6 tcl-8_5 From 3e7e6ab84a5a4facdbeea8941af9df471d66c839 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 25 Feb 2022 01:08:47 +0200 Subject: [PATCH 004/122] buildFHSUserEnv{Chroot,Bubblewrap}: link gsettings-schemas to the FHS location We shouldn't need to use wrapGAppsHook in expressions that use this builder. --- .../special/fhs-environments.section.md | 2 ++ .../build-fhs-userenv-bubblewrap/env.nix | 26 +++++++++++++++++++ pkgs/build-support/build-fhs-userenv/env.nix | 26 +++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/doc/builders/special/fhs-environments.section.md b/doc/builders/special/fhs-environments.section.md index 43dc99b7c18..cacad261e28 100644 --- a/doc/builders/special/fhs-environments.section.md +++ b/doc/builders/special/fhs-environments.section.md @@ -45,3 +45,5 @@ One can create a simple environment using a `shell.nix` like that: ``` Running `nix-shell` would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change `runScript` to the application path, e.g. `./bin/start.sh` -- relative paths are supported. + +Additionally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to `share/gsettings-schemas/${name}/glib-2.0/schemas`) to their standard FHS location. This means you don't need to wrap binaries with `wrapGAppsHook`. diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 0051961d9f1..c2f3ade6457 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -93,6 +93,32 @@ let paths = [ etcPkg ldconfig ] ++ basePkgs ++ targetPaths; extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; ignoreCollisions = true; + postBuild = '' + if [[ -d $out/share/gsettings-schemas/ ]]; then + # Recreate the standard schemas directory if its a symlink to make it writable + if [[ -L $out/share/glib-2.0 ]]; then + ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old + rm -rf $out/share/glib-2.0 + fi + + mkdir -p $out/share/glib-2.0/schemas + + # symlink any schema files or overrides to the standard schema directory + if [[ -e $out/share/glib-2.0.old/schemas ]]; then + ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas + fi + + for d in $out/share/gsettings-schemas/*; do + # Force symlink, in case there are duplicates + ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas + done + + # and compile them + ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + fi + ''; }; staticUsrProfileMulti = buildEnv { diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 44c8adb06e1..bd3a2d5e12d 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -134,6 +134,32 @@ let paths = [ etcPkg ] ++ basePkgs ++ targetPaths; extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; ignoreCollisions = true; + postBuild = '' + if [[ -d $out/share/gsettings-schemas/ ]]; then + # Recreate the standard schemas directory if its a symlink to make it writable + if [[ -L $out/share/glib-2.0 ]]; then + ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old + rm -rf $out/share/glib-2.0 + fi + + mkdir -p $out/share/glib-2.0/schemas + + # symlink any schema files or overrides to the standard schema directory + if [[ -e $out/share/glib-2.0.old/schemas ]]; then + ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas + fi + + for d in $out/share/gsettings-schemas/*; do + # Force symlink, in case there are duplicates + ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas + done + + # and compile them + ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + fi + ''; }; staticUsrProfileMulti = buildEnv { From 4330797dfb095d59f57bb65f04d4054a53089892 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 3 Mar 2022 01:23:11 +0200 Subject: [PATCH 005/122] appimage: add gsettings-desktop-schemas, hicolor-icon-theme to the fhs --- pkgs/build-support/appimage/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 9ceaab88946..cc2b2f3ed3d 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -68,6 +68,8 @@ rec { xdg-utils iana-etc krb5 + gsettings-desktop-schemas + hicolor-icon-theme # dont show a gtk warning about hicolor not being installed ]; # list of libraries expected in an appimage environment: From 5f69cf07020e24da5d8a6057a2f865e50a02a527 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 2 Mar 2022 17:07:36 +0100 Subject: [PATCH 006/122] timeline: 2.4.0 -> 2.6.0 --- pkgs/applications/office/timeline/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index b8b98c19bbf..7cf777ae13f 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -8,22 +8,20 @@ python3.pkgs.buildPythonApplication rec { pname = "timeline"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; - sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23"; + sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E="; }; nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; pythonPath = with python3.pkgs; [ - wxPython_4_1 + wxPython_4_0 humblewx icalendar markdown - pysvg-py3 - pillow ]; checkInputs = [ From df751f5488857fa458ac404d9959bc8b193a1a65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Mar 2022 04:08:14 +0000 Subject: [PATCH 007/122] dictu: 0.23.0 -> 0.24.0 --- pkgs/development/compilers/dictu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/development/compilers/dictu/default.nix index 8ff6a5120f7..94871fd7d7c 100644 --- a/pkgs/development/compilers/dictu/default.nix +++ b/pkgs/development/compilers/dictu/default.nix @@ -13,13 +13,13 @@ assert enableLTO -> stdenv.cc.isGNU; stdenv.mkDerivation rec { pname = "dictu"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "dictu-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K/RbkRK8nCkmaNwWplWe2nWtULhn/GCNPXYStfMeUPg="; + sha256 = "sha256-EYoLEyK8jh4z3/9aMuUBt0pCwks7NIevsK2mOh8x6bQ="; }; nativeBuildInputs = [ cmake ]; From 1d76c5b6696e4202852310c84d3c35675ebc9113 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 12:33:04 +0000 Subject: [PATCH 008/122] wget: 1.21.2 -> 1.21.3 --- pkgs/tools/networking/wget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 423363b56c2..e0fdbdff0b3 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "wget"; - version = "1.21.2"; + version = "1.21.3"; src = fetchurl { url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; - sha256 = "sha256-FyejMKhqyss+V2Fc4mj18pl4v3rexKvmow03Age8kbM="; + sha256 = "sha256-29L7XkcUnUdS0Oqg2saMxJzyDUbfT44yb/yPGLKvTqU="; }; patches = [ From ef18b4f863409a4deac34bfb2fb787fc2796b508 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 7 Mar 2022 04:14:52 +0000 Subject: [PATCH 009/122] discordchatexporter-cli: 2.32 -> 2.33.2 --- .../discordchatexporter-cli/default.nix | 23 +++++++++++++------ .../backup/discordchatexporter-cli/deps.nix | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 3c16fb1e0ed..d2a9bd2563e 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -1,20 +1,20 @@ { lib -, stdenv , buildDotnetModule , fetchFromGitHub -, autoPatchelfHook , dotnetCorePackages +, testVersion +, discordchatexporter-cli }: buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.32"; + version = "2.33.2"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "xRoF/HJ4ekHL/Uk6ISQP+65nChRT+n9xLTYcZMJxyvo="; + sha256 = "wOSa6O3O4QlGL5ecnR14ldXPYV5mDoPDlJjcwN5Lrek="; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; @@ -23,15 +23,24 @@ buildDotnetModule rec { projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; nugetDeps = ./deps.nix; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + postFixup = '' + ln -s $out/bin/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli + ''; + + passthru = { + updateScript = ./updater.sh; + tests.version = testVersion { + package = discordchatexporter-cli; + version = "v${version}"; + }; + }; meta = with lib; { description = "A tool to export Discord chat logs to a file"; homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; license = licenses.gpl3Plus; + changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; maintainers = [ maintainers.ivar ]; platforms = [ "x86_64-linux" ]; }; - passthru.updateScript = ./updater.sh; } diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index a360d0099fd..92bf39b58ef 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,6 +1,6 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "CliFx"; version = "2.2.1"; sha256 = "1yxxl3jgl6sadar1g9175s62fag5f30lqpgrf58djll3509rbgw5"; }) - (fetchNuGet { pname = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) + (fetchNuGet { pname = "CliFx"; version = "2.2.2"; sha256 = "13g5xlrbyhnbwkyzic5jlhxl0kpvkfrdmb5h2rdf9yp4gp5p9mwg"; }) + (fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.0"; sha256 = "1rbgkm1hsamqhviw2c62g6iafiwkxcnz66qbybpd32qgz1124cx4"; }) (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.0"; sha256 = "0zm0l97jfbfy90zj0cbi7v3qbhxhfay1g8f2cw0gp829xz4yk9jr"; }) From 5660c5f8b4a5f716f4fd1fdfee11088af4139688 Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski <3494992+nazarewk@users.noreply.github.com> Date: Thu, 10 Mar 2022 17:13:51 +0100 Subject: [PATCH 010/122] jetty 9.4.45.v20220203 -> 11.0.8 updated because plantuml-server requires Jetty 11+ --- pkgs/servers/http/jetty/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 86139e7a24f..645abba303a 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.45.v20220203"; + version = "11.0.8"; src = fetchurl { - url = "mirror://maven/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; - sha256 = "sha256-wmM03qAnNsiEDsLkWyJKZIb3SPCRGCxTsgKBWwopMAw="; + url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; + sha256 = "sha256-fHd0o5f+WLdbDK1nmSnHNKjDO0mV7+vkPs4zVEaqeyw="; }; dontBuild = true; installPhase = '' mkdir -p $out - mv etc lib modules start.ini start.jar $out + mv etc lib modules start.jar $out ''; meta = with lib; { From 4ea5398d20cf110b84800e91f30a3dfce96c1b4e Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski <3494992+nazarewk@users.noreply.github.com> Date: Wed, 9 Mar 2022 10:30:18 +0100 Subject: [PATCH 011/122] plantuml-server 1.2021.12 -> 1.2022.2 - changed JDK version to 17 (11+ required) - added maven build reproducibility --- .../services/web-apps/plantuml-server.nix | 21 +++++++++++++++--- pkgs/tools/misc/plantuml-server/default.nix | 22 ++++++++++++------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index f4bf43f56b9..9ea37b8a4ca 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -20,6 +20,21 @@ in description = "PlantUML server package to use"; }; + packages = { + jdk = mkOption { + type = types.package; + default = pkgs.jdk; + defaultText = literalExpression "pkgs.jdk"; + description = "JDK package to use for the server"; + }; + jetty = mkOption { + type = types.package; + default = pkgs.jetty; + defaultText = literalExpression "pkgs.jetty"; + description = "Jetty package to use for the server"; + }; + }; + user = mkOption { type = types.str; default = "plantuml"; @@ -105,10 +120,10 @@ in ALLOW_PLANTUML_INCLUDE = if cfg.allowPlantumlInclude then "true" else "false"; }; script = '' - ${pkgs.jre}/bin/java \ - -jar ${pkgs.jetty}/start.jar \ + ${cfg.packages.jdk}/bin/java \ + -jar ${cfg.packages.jetty}/start.jar \ --module=deploy,http,jsp \ - jetty.home=${pkgs.jetty} \ + jetty.home=${cfg.packages.jetty} \ jetty.base=${cfg.package} \ jetty.http.host=${cfg.listenHost} \ jetty.http.port=${builtins.toString cfg.listenPort} diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 6afaf0fbb34..8b6c52446aa 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, maven, jdk8_headless }: +{ lib, stdenv, fetchFromGitHub, maven, jdk17_headless }: let - version = "1.2021.12"; + version = "1.2022.2"; src = fetchFromGitHub { owner = "plantuml"; repo = "plantuml-server"; rev = "v${version}"; - sha256 = "sha256:016mrs4djbaid1ma5922dvq372pphbzzmjzsjalj2dqp60538xll"; + sha256 = "sha256-55IBhulFo42jscBFrHM39qA0GRgKBoYNye4q9QkmjsM="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central deps = stdenv.mkDerivation { name = "plantuml-server-${version}-deps"; inherit src; - nativeBuildInputs = [ jdk8_headless maven ]; + nativeBuildInputs = [ jdk17_headless maven ]; buildPhase = '' runHook preBuild @@ -25,10 +25,12 @@ let runHook postBuild ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; + installPhase = '' + find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete + ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256:12w1iw9c5j7y9hhaip07j3aszjiiakkww1v3zszlj15fj8jgqyf2"; + outputHash = "sha256-AheCBX5jFzDHqTI2pCWBIiDESEKMClXlvWIcFvu0goA="; }; in @@ -37,16 +39,20 @@ stdenv.mkDerivation rec { inherit version; inherit src; - nativeBuildInputs = [ jdk8_headless maven ]; + nativeBuildInputs = [ jdk17_headless maven ]; buildPhase = '' runHook preBuild + # maven can output reproducible files after setting project.build.outputTimestamp property + # see https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-do-i-configure-my-maven-build # 'maven.repo.local' must be writable so copy it out of nix store cp -R $src repo chmod +w -R repo cd repo - mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + mvn package --offline \ + -Dproject.build.outputTimestamp=0 \ + -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 runHook postBuild ''; From dd510b9053e38ac176cdc3fdd042d82cb4ff088e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 11 Mar 2022 00:53:01 +0400 Subject: [PATCH 012/122] nixos/mate: allow remove any added package Only extra packages removable currently, but it's possible to run MATE without packages like caja or yelp --- nixos/modules/services/x11/desktop-managers/mate.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index f8f47a06145..a7fda4be979 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -74,11 +74,9 @@ in # Debugging environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; - environment.systemPackages = - pkgs.mate.basePackages ++ - (pkgs.gnome.removePackagesByName - pkgs.mate.extraPackages - config.environment.mate.excludePackages) ++ + environment.systemPackages = pkgs.gnome.removePackagesByName + (pkgs.mate.basePackages ++ + pkgs.mate.extraPackages ++ [ pkgs.desktop-file-utils pkgs.glib @@ -87,7 +85,8 @@ in pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.mate.mate-settings-daemon pkgs.yelp # for 'Contents' in 'Help' menus - ]; + ]) + config.environment.mate.excludePackages; programs.dconf.enable = true; # Shell integration for VTE terminals From 058813373b3a19c4e9b719135eeaed0f49e8739a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 11:34:11 +0100 Subject: [PATCH 013/122] python3Packages.pysigma: init at 0.3.2 --- .../python-modules/pysigma/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/pysigma/default.nix diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix new file mode 100644 index 00000000000..39ab5c9918b --- /dev/null +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pyparsing +, pytestCheckHook +, pythonOlder +, pyyaml +}: + +buildPythonPackage rec { + pname = "pysigma"; + version = "0.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma"; + rev = "v${version}"; + hash = "sha256-V/E2rZqVrk0kIvk+hPhNcAifhMM/rN3mk3pB+CGd43w="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyparsing + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/SigmaHQ/pySigma/pull/31 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/SigmaHQ/pySigma/commit/b7a852d18852007da90c2ec35bff347c97b36f07.patch"; + sha256 = "sha256-zgg8Bsc37W2uuQluFpIZT4jHCQaitY2ZgS93Wk6Hxt0="; + }) + ]; + + postPatch = '' + # https://github.com/SigmaHQ/pySigma/issues/32 + # https://github.com/SigmaHQ/pySigma/issues/33 + substituteInPlace pyproject.toml \ + --replace 'pyparsing = "^2.4.7"' 'pyparsing = "*"' \ + --replace 'pyyaml = "^5.3.1"' 'pyyaml = "*"' + ''; + + pythonImportsCheck = [ + "sigma" + ]; + + meta = with lib; { + description = "Library to parse and convert Sigma rules into queries"; + homepage = "https://github.com/SigmaHQ/pySigma"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e9fb29a35f..5ea8b9430c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7647,6 +7647,8 @@ in { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pysigma = callPackage ../development/python-modules/pysigma { }; + pysignalclirestapi = callPackage ../development/python-modules/pysignalclirestapi { }; pysigset = callPackage ../development/python-modules/pysigset { }; From 403a124f4d2a6e18e245bfb576d3c31ddb776ecf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 11:45:33 +0100 Subject: [PATCH 014/122] python3Packages.pysigma-backend-splunk: init at 0.1.1 --- .../pysigma-backend-splunk/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pysigma-backend-splunk/default.nix diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix new file mode 100644 index 00000000000..f3b122b4eca --- /dev/null +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-backend-splunk"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-backend-splunk"; + rev = "v${version}"; + hash = "sha256-AGT+7BKtINe2ukmomYyoUa5PHYAH1N0tUTtbyjMD+kw="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.backends.splunk" + ]; + + meta = with lib; { + description = "Library to support Splunk for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-backend-splunk"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ea8b9430c8..685096a5947 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7649,6 +7649,8 @@ in { pysigma = callPackage ../development/python-modules/pysigma { }; + pysigma-backend-splunk = callPackage ../development/python-modules/pysigma-backend-splunk { }; + pysignalclirestapi = callPackage ../development/python-modules/pysignalclirestapi { }; pysigset = callPackage ../development/python-modules/pysigset { }; From fd50e124044c6305d23654b3081b9657d5cff8de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 11:59:43 +0100 Subject: [PATCH 015/122] python3Packages.pysigma-pipeline-sysmon: init at 0.1.1 --- .../pysigma-pipeline-sysmon/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix new file mode 100644 index 00000000000..e784ac1eca1 --- /dev/null +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-sysmon"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-sysmon"; + rev = "v${version}"; + hash = "sha256-BBJt2SAbnPEzIwJ+tXW4NmA4Nrb/glIaPlnmYHLoMD0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.sysmon" + ]; + + meta = with lib; { + description = "Library to support Sysmon pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-sysmon"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 685096a5947..b3ea00bbab9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7651,6 +7651,8 @@ in { pysigma-backend-splunk = callPackage ../development/python-modules/pysigma-backend-splunk { }; + pysigma-pipeline-sysmon = callPackage ../development/python-modules/pysigma-pipeline-sysmon { }; + pysignalclirestapi = callPackage ../development/python-modules/pysignalclirestapi { }; pysigset = callPackage ../development/python-modules/pysigset { }; From a5615d445e24762dbafb467adedb0c51ca3b48d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:03:31 +0100 Subject: [PATCH 016/122] python3Packages.pysigma-pipeline-crowdstrike: init at 0.1.3 --- .../pysigma-pipeline-crowdstrike/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix new file mode 100644 index 00000000000..22f589d3b14 --- /dev/null +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-crowdstrike"; + version = "0.1.3"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-crowdstrike"; + rev = "v${version}"; + hash = "sha256-JNJHKydMzKreN+6liLlGMT1CFBUr/IX8Ah+exddKR3g="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.crowdstrike" + ]; + + meta = with lib; { + description = "Library to support CrowdStrike pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3ea00bbab9..dbe8150c54e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7651,6 +7651,8 @@ in { pysigma-backend-splunk = callPackage ../development/python-modules/pysigma-backend-splunk { }; + pysigma-pipeline-crowdstrike = callPackage ../development/python-modules/pysigma-pipeline-crowdstrike { }; + pysigma-pipeline-sysmon = callPackage ../development/python-modules/pysigma-pipeline-sysmon { }; pysignalclirestapi = callPackage ../development/python-modules/pysignalclirestapi { }; From 2e0fce9838a21f5e070ac5ac70c8ba10940202ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:16:53 +0100 Subject: [PATCH 017/122] sigma-cli: init at 0.3.0 --- pkgs/tools/security/sigma-cli/default.nix | 50 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/security/sigma-cli/default.nix diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix new file mode 100644 index 00000000000..3bf4e788912 --- /dev/null +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sigma-cli"; + version = "0.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Nfd78Y35naDTzwodcdvJr/02CptcHxS717VGsR/QOuI="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + prettytable + pysigma + pysigma-backend-splunk + pysigma-pipeline-crowdstrike + pysigma-pipeline-sysmon + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'prettytable = "^3.1.1"' 'prettytable = "*"' + ''; + + pythonImportsCheck = [ + "sigma.cli" + ]; + + meta = with lib; { + description = "Sigma command line interface"; + homepage = "https://github.com/SigmaHQ/sigma-cli"; + license = with licenses; [ lgpl21Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d3698945c8..5497af8c084 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9831,6 +9831,8 @@ with pkgs; slither-analyzer = with python3Packages; toPythonApplication slither-analyzer; + sigma-cli = callPackage ../tools/security/sigma-cli { }; + signify = callPackage ../tools/security/signify { }; # aka., pgp-tools From ae54adf8ff94faf6ce8be85a70a43f5188628342 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 12 Jan 2022 05:04:15 +0100 Subject: [PATCH 018/122] =?UTF-8?q?treesheets:=201.0.1=20=E2=86=92=20unsta?= =?UTF-8?q?ble-2022-03-12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Switch to unstable, using tagged releases is discouraged: https://github.com/aardappel/treesheets/issues/150#issuecomment-874213576 - Also add updateScript to that effect. - CMake is now preferred on Linux, and it installs files to proper locations: https://github.com/aardappel/treesheets/pull/201 - CMake does not set version correctly so we need to do it ourselves. - Format the expression. --- .../office/treesheets/default.nix | 58 +++++++++---------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index d8fe8649381..91716ee31dd 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -1,41 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, wxGTK +, cmake +, ninja +, unstableGitUpdater +}: stdenv.mkDerivation rec { pname = "treesheets"; - version = "1.0.1"; + version = "unstable-2022-03-12"; src = fetchFromGitHub { - owner = "aardappel"; - repo = "treesheets"; - rev = "v${version}"; - sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4"; + owner = "aardappel"; + repo = "treesheets"; + rev = "120c10d4d9ea1ce76db5c1bbd6f5d705b397b57d"; + sha256 = "oXgOvvRoZpueEeWnD3jsc6y5RIAzkXzLeEe7BSErBpw="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wxGTK ]; + nativeBuildInputs = [ + cmake + ninja + ]; - preConfigure = "cd src"; + buildInputs = [ + wxGTK + ]; - postInstall = '' - mkdir "$out/share" -p - cp -av ../TS "$out/share/libexec" + NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; - mkdir "$out/bin" -p - makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets" - - mkdir "$out/share/doc" -p - - for f in readme.html docs examples - do - mv -v "$out/share/libexec/$f" "$out/share/doc" - ln -sv "$out/share/doc/$f" "$out/share/libexec/$f" - done - - mkdir "$out/share/applications" -p - mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications" - substituteInPlace "$out/share/applications/treesheets.desktop" \ - --replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg" - ''; + passthru = { + updateScript = unstableGitUpdater { }; + }; meta = with lib; { description = "Free Form Data Organizer"; @@ -49,9 +45,9 @@ stdenv.mkDerivation rec { planning, requirements gathering, presentation of information, etc. ''; - homepage = "https://strlen.com/treesheets/"; + homepage = "https://strlen.com/treesheets/"; maintainers = with maintainers; [ obadz avery ]; - platforms = platforms.linux; - license = licenses.zlib; + platforms = platforms.linux; + license = licenses.zlib; }; } From 993e8e313d906a6aff071e64c48feb0b7b7ba388 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 12 Jan 2022 05:00:00 +0100 Subject: [PATCH 019/122] treesheets: Switch to GTK 3 --- pkgs/applications/office/treesheets/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 91716ee31dd..2055bfc0fc7 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -4,6 +4,7 @@ , wxGTK , cmake , ninja +, wrapGAppsHook , unstableGitUpdater }: @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f0204a518d..8781517d381 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29457,7 +29457,9 @@ with pkgs; tree = callPackage ../tools/system/tree {}; - treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; + treesheets = callPackage ../applications/office/treesheets { + wxGTK = wxGTK31-gtk3; + }; tremc = callPackage ../applications/networking/p2p/tremc { }; From 65eed885d636e74eb3349b3aacee5e945a99f092 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 8 Jul 2021 19:38:09 -0500 Subject: [PATCH 020/122] klavaro: 3.11 -> 3.13, espeak support * espeak fixup from #64488 * gtkdatabox --- pkgs/games/klavaro/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 2a8f68ddd2c..25bfb4daee2 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -2,23 +2,29 @@ , fetchurl , makeWrapper , curl +, espeak , file , gtk3 +, gtkdatabox , intltool , pkg-config }: stdenv.mkDerivation rec { pname = "klavaro"; - version = "3.11"; + version = "3.13"; src = fetchurl { url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2"; - sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w"; + sha256 = "0z6c3lqikk50mkz3ipm93l48qj7b98lxyip8y6ndg9y9k0z0n878"; }; nativeBuildInputs = [ intltool makeWrapper pkg-config ]; - buildInputs = [ curl gtk3 ]; + buildInputs = [ curl gtk3 gtkdatabox ]; + + postPatch = '' + substituteInPlace src/tutor.c --replace '"espeak ' '"${espeak}/bin/espeak ' + ''; postInstall = '' wrapProgram $out/bin/klavaro \ From 38f7252d3472bc887af3bca7eba4c85686048678 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 13 Mar 2022 16:21:33 -0700 Subject: [PATCH 021/122] btrfs-progs: depends on udev, not systemd The btrfs-progs source code does not depend on systemd. It does, however, optionally depend on a udev implementation such as eudev or systemd-udevd. Let's express this dependency correctly, so that nixpkgs users who choose eudev instead of systemd-udevd don't get a build failure. --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 936555f93a4..28733f8ed77 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto , zstd -, acl, attr, e2fsprogs, libuuid, lzo, systemd, zlib +, acl, attr, e2fsprogs, libuuid, lzo, udev, zlib , runCommand, btrfs-progs }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { python3 python3.pkgs.setuptools ]; - buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ systemd ]; + buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ]; # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; From 7f25d6e079104fb574b4b505218709c06bfb3229 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 23:36:36 +0000 Subject: [PATCH 022/122] firefox-esr-91-unwrapped: 91.7.0esr -> 91.7.1esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6dd783d8662..2da3783c358 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.7.0esr"; + version = "91.7.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301"; + sha512 = "c56aa38e9d706ff1f1838d2639dac82109dcffb54a7ea17326ae306604d78967ac32da13676756999bc1aa0bf50dc4e7072936ceb16e2e834bea48382ae4b48c"; }; meta = { From 09c7cf2f4ecc1665b58002bb9683ba00fbc559cd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 13 Mar 2022 21:43:03 -0500 Subject: [PATCH 023/122] klavaro: patch to fix invalid free --- pkgs/games/klavaro/default.nix | 2 + .../klavaro/trans_lang_get_similar.patch | 71 +++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 pkgs/games/klavaro/trans_lang_get_similar.patch diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 25bfb4daee2..ec00b8308de 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { substituteInPlace src/tutor.c --replace '"espeak ' '"${espeak}/bin/espeak ' ''; + patches = [ ./trans_lang_get_similar.patch ]; + postInstall = '' wrapProgram $out/bin/klavaro \ --prefix LD_LIBRARY_PATH : $out/lib diff --git a/pkgs/games/klavaro/trans_lang_get_similar.patch b/pkgs/games/klavaro/trans_lang_get_similar.patch new file mode 100644 index 00000000000..3b6644c5f7f --- /dev/null +++ b/pkgs/games/klavaro/trans_lang_get_similar.patch @@ -0,0 +1,71 @@ +--- a/src/translation.c (revision 137) ++++ b/src/translation.c (working copy) +@@ -257,23 +257,23 @@ + * Private auxiliar function + */ + static gboolean +-trans_lang_get_similar (gchar * test) ++trans_lang_get_similar (gchar ** test) + { + gint i; + gchar aux_code_2[3]; + + /* Prefer C over en_GB for English variants other than en_GB. (Debian patch 02) */ +- if (g_str_has_prefix (test, "en")) ++ if (g_str_has_prefix (*test, "en")) + { +- g_free (test); +- test = g_strdup ("C"); ++ g_free (*test); ++ *test = g_strdup ("C"); + return (TRUE); + } + +- if (g_str_equal (test, "C")) ++ if (g_str_equal (*test, "C")) + return TRUE; + +- strncpy (aux_code_2, test, 2); ++ strncpy (aux_code_2, *test, 2); + aux_code_2[2] = '\0'; + + for (i = 0; i < lang_num; i++) +@@ -280,15 +280,15 @@ + { + if (strstr (lang[i].code, aux_code_2)) + { +- g_free (test); +- test = g_strdup (lang[i].code); ++ g_free (*test); ++ *test = g_strdup (lang[i].code); + break; + } + } +- if (i == lang_num && g_str_has_prefix (test, "en")) ++ if (i == lang_num && g_str_has_prefix (*test, "en")) + { +- g_free (test); +- test = g_strdup ("C"); ++ g_free (*test); ++ *test = g_strdup ("C"); + return (TRUE); + } + return (i == lang_num ? FALSE : TRUE); +@@ -356,7 +356,7 @@ + lang_ok = (i == 0 ? TRUE : FALSE); + break; + } +- lang_ok = trans_lang_get_similar (tmp_code); ++ lang_ok = trans_lang_get_similar (&tmp_code); + if (lang_ok == TRUE) + break; + g_free (tmp_code); +@@ -368,7 +368,7 @@ + tmp_code = g_win32_getlocale (); + lang_ok = trans_lang_is_available (tmp_code); + if (lang_ok == FALSE) +- lang_ok = trans_lang_get_similar (tmp_code); ++ lang_ok = trans_lang_get_similar (&tmp_code); + #endif + } + if (tmp_code == NULL) From 606eab00d04f298a98a8c9e468b1cd19d7faec48 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 13 Mar 2022 22:27:16 -0500 Subject: [PATCH 024/122] klavaro: patch to use non-deprecated names for icons Started just wanting to fix the "gtk-strikethrough" icon, but kept finding items marked deprecated. This change may be incomplete, but all changes were to deprecated icons (that used to be "stock", I think). Icon name candidates were identified by extracting all used icon-name values and checking which existed in my system's copy of the 'breeze' theme. If missing, these were checked online to find the new replacement. (I couldn't find an authoritative list of the replacements, but looking each up finds the right deprecation warning) --- pkgs/games/klavaro/default.nix | 2 +- pkgs/games/klavaro/icons.patch | 137 +++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/klavaro/icons.patch diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index ec00b8308de..6ea02917648 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { substituteInPlace src/tutor.c --replace '"espeak ' '"${espeak}/bin/espeak ' ''; - patches = [ ./trans_lang_get_similar.patch ]; + patches = [ ./icons.patch ./trans_lang_get_similar.patch ]; postInstall = '' wrapProgram $out/bin/klavaro \ diff --git a/pkgs/games/klavaro/icons.patch b/pkgs/games/klavaro/icons.patch new file mode 100644 index 00000000000..750a899d23d --- /dev/null +++ b/pkgs/games/klavaro/icons.patch @@ -0,0 +1,137 @@ +--- a/data/klavaro.glade (revision 137) ++++ b/data/klavaro.glade (working copy) +@@ -311,7 +311,7 @@ + + True + False +- gtk-delete ++ edit-delete + + + False +@@ -1232,7 +1232,7 @@ + + True + False +- gtk-delete ++ edit-delete + + + False +@@ -1352,7 +1352,7 @@ + + True + False +- gtk-open ++ document-open + + + True +@@ -1510,7 +1510,7 @@ + + True + False +- gtk-open ++ document-open + 2 + + +@@ -1557,7 +1557,7 @@ + + True + False +- gtk-paste ++ edit-paste + 2 + + +@@ -1604,7 +1604,7 @@ + + True + False +- gtk-delete ++ edit-delete + 2 + + +@@ -2051,7 +2051,7 @@ + + True + False +- gtk-delete ++ edit-delete + + + False +@@ -2343,7 +2343,7 @@ + + True + False +- gtk-media-rewind ++ media-seek-backward + 1 + + +@@ -2418,7 +2418,7 @@ + + True + False +- gtk-go-back ++ go-previous + + + False +@@ -2469,7 +2469,7 @@ + + True + False +- gtk-go-forward ++ go-next + + + False +@@ -2577,7 +2577,7 @@ + + True + False +- gtk-save ++ document-save + + + False +@@ -2825,7 +2825,7 @@ + + True + False +- gtk-strikethrough ++ format-text-strikethrough + 6 + + +@@ -2901,7 +2901,7 @@ + + True + False +- gtk-bold ++ format-text-bold + 6 + + +@@ -3630,7 +3630,7 @@ + + True + False +- gtk-goto-top ++ go-top + + + False +@@ -3678,7 +3678,7 @@ + + True + False +- gtk-goto-bottom ++ go-bottom + + + False From 5c4e343b4fd798cae56507c6f88832ff415be0a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 04:35:33 +0000 Subject: [PATCH 025/122] cmst: 2022.01.05 -> 2022.03.13 --- pkgs/tools/networking/cmst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 06ef6675ceb..2f757edbdb1 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cmst"; - version = "2022.01.05"; + version = "2022.03.13"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = "${pname}-${version}"; - sha256 = "0d05vrsjm30q22wpxicnxhjzrjq5kxjhpb6262m46sgkr8yipfhr"; + sha256 = "sha256-PIS77yYM7tR+0vpTDh9Li/dnaWHUQW+w1NLRb5g+sz8="; }; nativeBuildInputs = [ qmake qttools ]; From 075de1bb2d7b41a26399ec84d48fae1dacb70121 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 14 Mar 2022 00:33:21 -0700 Subject: [PATCH 026/122] libvirt: refactor --- ...n-install-prefix-for-building-on-nix.patch | 61 ++- .../0002-meson-patch-ch-install-prefix.patch | 14 - .../development/libraries/libvirt/default.nix | 377 +++++++++++------- 3 files changed, 272 insertions(+), 180 deletions(-) delete mode 100644 pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 86dd461ea07..760235245c8 100644 --- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -1,4 +1,4 @@ -From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 +From a6593bf70dd5f91acc7c2795d658a49eb9d4f672 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 14 Jan 2021 00:32:00 -0800 Subject: [PATCH] meson: patch in an install prefix for building on nix @@ -8,20 +8,21 @@ the nix store, but read them from the root filesystem. --- meson.build | 9 +++++++++ meson_options.txt | 2 ++ + src/ch/meson.build | 4 ++-- src/libxl/meson.build | 6 +++--- src/locking/meson.build | 8 ++++---- src/lxc/meson.build | 6 +++--- src/meson.build | 18 +++++++++--------- - src/network/meson.build | 12 ++++++------ + src/network/meson.build | 10 +++++----- src/nwfilter/xml/meson.build | 2 +- src/qemu/meson.build | 14 +++++++------- src/remote/meson.build | 6 +++--- src/security/apparmor/meson.build | 8 ++++---- tools/meson.build | 4 ++-- - 12 files changed, 53 insertions(+), 42 deletions(-) + 13 files changed, 54 insertions(+), 43 deletions(-) diff --git a/meson.build b/meson.build -index b5164f6..33719f1 100644 +index ad0cd44aca..bdd87c926a 100644 --- a/meson.build +++ b/meson.build @@ -39,6 +39,8 @@ if host_machine.system() == 'windows' @@ -48,7 +49,7 @@ index b5164f6..33719f1 100644 # sysconfdir as this makes a lot of things break in testing situations if prefix == '/usr' diff --git a/meson_options.txt b/meson_options.txt -index e5d79c2..081cd32 100644 +index 5b43cdbd6b..e9dff18441 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ @@ -57,8 +58,22 @@ index e5d79c2..081cd32 100644 option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') +diff --git a/src/ch/meson.build b/src/ch/meson.build +index e34974d56c..4767763c2c 100644 +--- a/src/ch/meson.build ++++ b/src/ch/meson.build +@@ -68,7 +68,7 @@ if conf.has('WITH_CH') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'ch', +- runstatedir / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', ++ install_prefix + runstatedir / 'libvirt' / 'ch', + ] + endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 3bb6cc5..78d7be0 100644 +index 9793899106..4904387162 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') @@ -74,7 +89,7 @@ index 3bb6cc5..78d7be0 100644 ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 8a28310..9da81cc 100644 +index 184d3c3f56..7ffd3740e3 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') @@ -97,10 +112,10 @@ index 8a28310..9da81cc 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index f8e2a88..96d6687 100644 +index ad5c659dba..8010dfbf02 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build -@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') +@@ -181,8 +181,8 @@ if conf.has('WITH_LXC') } virt_install_dirs += [ @@ -113,7 +128,7 @@ index f8e2a88..96d6687 100644 ] endif diff --git a/src/meson.build b/src/meson.build -index 7c47821..d33d16a 100644 +index 2bd88e6699..76df507968 100644 --- a/src/meson.build +++ b/src/meson.build @@ -669,7 +669,7 @@ endforeach @@ -176,10 +191,10 @@ index 7c47821..d33d16a 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index 3ec598c..b02040b 100644 +index d6fb624bb7..96b757b144 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') +@@ -78,9 +78,9 @@ if conf.has('WITH_NETWORK') } virt_install_dirs += [ @@ -192,7 +207,7 @@ index 3ec598c..b02040b 100644 ] configure_file( -@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') +@@ -88,12 +88,12 @@ if conf.has('WITH_NETWORK') output: '@BASENAME@', copy: true, install: true, @@ -208,7 +223,7 @@ index 3ec598c..b02040b 100644 ) diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build -index 0d96c54..66c92a1 100644 +index 0d96c54ebe..66c92a1016 100644 --- a/src/nwfilter/xml/meson.build +++ b/src/nwfilter/xml/meson.build @@ -25,4 +25,4 @@ nwfilter_xml_files = [ @@ -218,7 +233,7 @@ index 0d96c54..66c92a1 100644 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 90640b0..8802cec 100644 +index 3898d23877..c2a2675187 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') @@ -242,7 +257,7 @@ index 90640b0..8802cec 100644 ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index 9ad2f6a..429a15b 100644 +index 0a188268b5..702822612e 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') @@ -273,10 +288,10 @@ index 9ad2f6a..429a15b 100644 ) endif diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build -index af43780..e2d6c81 100644 +index 990f00b4f3..e5a7a14e1d 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build -@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles +@@ -19,22 +19,22 @@ foreach name : apparmor_gen_profiles output: name, configuration: apparmor_gen_profiles_conf, install: true, @@ -304,10 +319,10 @@ index af43780..e2d6c81 100644 rename: 'usr.lib.libvirt.virt-aa-helper', ) diff --git a/tools/meson.build b/tools/meson.build -index b8c6802..dacd0ff 100644 +index 3fba313e5f..a2b891b86c 100644 --- a/tools/meson.build +++ b/tools/meson.build -@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') +@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL') install_rpath: libvirt_rpath, ) @@ -316,7 +331,7 @@ index b8c6802..dacd0ff 100644 endif if host_machine.system() == 'windows' -@@ -274,7 +274,7 @@ configure_file( +@@ -307,7 +307,7 @@ configure_file( if init_script == 'systemd' install_data( 'libvirt-guests.sysconf', @@ -324,3 +339,7 @@ index b8c6802..dacd0ff 100644 + install_dir: install_prefix + sysconfdir / 'sysconfig', rename: 'libvirt-guests', ) + +-- +2.35.1 + diff --git a/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch b/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch deleted file mode 100644 index ae97c6455c6..00000000000 --- a/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ch/meson.build b/src/ch/meson.build -index e34974d56c..4767763c2c 100644 ---- a/src/ch/meson.build -+++ b/src/ch/meson.build -@@ -68,7 +68,7 @@ if conf.has('WITH_CH') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'ch', -- runstatedir / 'libvirt' / 'ch', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', -+ install_prefix + runstatedir / 'libvirt' / 'ch', - ] - endif diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 03d0e17cb4c..d467e6347f0 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,81 +1,118 @@ { lib -, stdenv -, fetchurl -, fetchFromGitLab -, makeWrapper , autoreconfHook -, fetchpatch +, bash-completion +, bridge-utils +, cmake , coreutils -, libxml2 -, gnutls -, perl -, python3 -, attr -, glib +, curl +, darwin +, dbus +, dnsmasq , docutils -, iproute2 -, readline -, lvm2 -, util-linux -, systemd -, libpciaccess +, fetchFromGitLab +, fetchurl , gettext -, libtasn1 +, glib +, gnutls +, iproute2 , iptables , libgcrypt -, yajl -, pmutils -, libcap_ng -, libapparmor -, dnsmasq -, libnl , libpcap +, libtasn1 +, libxml2 , libxslt -, xhtml1 -, numad -, numactl -, perlPackages -, curl -, libiconv -, gmp -, zfs -, parted -, bridge-utils -, dmidecode -, dbus -, libtirpc -, rpcsvc-proto -, darwin +, makeWrapper , meson , ninja -, audit -, cmake -, bash-completion +, perl +, perlPackages , pkg-config -, enableXen ? false -, xen ? null -, enableIscsi ? false -, openiscsi +, pmutils +, python3 +, readline +, rpcsvc-proto +, stdenv +, xhtml1 +, yajl + + # Linux +, acl ? null +, attr ? null +, audit ? null +, dmidecode ? null +, fuse ? null +, kmod ? null +, libapparmor ? null +, libcap_ng ? null +, libnl ? null +, libpciaccess ? null +, libtirpc ? null +, lvm2 ? null +, numactl ? null +, numad ? null +, parted ? null +, systemd ? null +, util-linux ? null + + # Darwin +, gmp ? null +, libiconv ? null +, Carbon ? null +, AppKit ? null + + # Options , enableCeph ? false -, ceph +, ceph ? null , enableGlusterfs ? false -, glusterfs -, Carbon -, AppKit +, glusterfs ? null +, enableIscsi ? false +, openiscsi ? null +, libiscsi ? null +, enableXen ? false +, xen ? null +, enableZfs ? stdenv.isLinux +, zfs ? null }: with lib; -# if you update, also bump and SysVirt in let - buildFromTarball = stdenv.isDarwin; + inherit (stdenv) isDarwin isLinux isx86_64; + binPath = makeBinPath ([ + dnsmasq + ] ++ optionals isLinux [ + bridge-utils + dmidecode + dnsmasq + iproute2 + iptables + kmod + lvm2 + numactl + numad + pmutils + systemd + ] ++ optionals enableIscsi [ + libiscsi + openiscsi + ]); in + +assert enableXen -> isLinux && isx86_64; +assert enableCeph -> isLinux; +assert enableGlusterfs -> isLinux; +assert enableZfs -> isLinux; + +# if you update, also bump and SysVirt in stdenv.mkDerivation rec { pname = "libvirt"; + # NOTE: You must also bump: + # + # SysVirt in version = "7.10.0"; src = - if buildFromTarball then + if isDarwin then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; @@ -93,70 +130,76 @@ stdenv.mkDerivation rec { patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch - ./0002-meson-patch-ch-install-prefix.patch ]; + # remove some broken tests + postPatch = '' + sed -i '/commandtest/d' tests/meson.build + sed -i '/virnetsockettest/d' tests/meson.build + # delete only the first occurrence of this + sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build + ''; + + nativeBuildInputs = [ - ninja meson + cmake + docutils makeWrapper + ninja pkg-config - docutils - ] ++ optional (!stdenv.isDarwin) [ - rpcsvc-proto - ] ++ optionals stdenv.isDarwin [ - darwin.developer_cmds # needed for rpcgen - ]; + ] + ++ optional (!isDarwin) rpcsvc-proto + # NOTE: needed for rpcgen + ++ optional isDarwin darwin.developer_cmds; buildInputs = [ bash-completion - pkg-config - libxml2 + curl + dbus + gettext + glib gnutls + libgcrypt + libpcap + libtasn1 + libxml2 + libxslt perl + perlPackages.XMLXPath + pkg-config python3 readline - gettext - libtasn1 - libgcrypt - yajl - libxslt xhtml1 - perlPackages.XMLXPath - curl - libpcap - glib - dbus - ] ++ optionals stdenv.isLinux [ + yajl + ] ++ optionals isLinux [ + acl + attr audit - libpciaccess - lvm2 - util-linux - systemd - libnl - numad - zfs + fuse libapparmor libcap_ng + libnl + libpciaccess + libtirpc + lvm2 numactl - attr + numad parted - libtirpc - ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ - xen - ] ++ optionals enableIscsi [ - openiscsi - ] ++ optionals enableCeph [ - ceph - ] ++ optionals enableGlusterfs [ - glusterfs - ] ++ optionals stdenv.isDarwin [ - libiconv - gmp - Carbon + systemd + util-linux + ] ++ optionals isDarwin [ AppKit - ]; + Carbon + gmp + libiconv + ] + ++ optionals enableCeph [ ceph ] + ++ optionals enableGlusterfs [ glusterfs ] + ++ optionals enableIscsi [ libiscsi openiscsi ] + ++ optionals enableXen [ xen ] + ++ optionals enableZfs [ zfs ]; preConfigure = let @@ -164,20 +207,23 @@ stdenv.mkDerivation rec { QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; }; + patchBuilder = var: value: '' sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH="${binPath}:$PATH" # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + substituteInPlace build-aux/meson.build \ --replace "gsed" "sed" \ --replace "gmake" "make" \ --replace "ggrep" "grep" + patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); @@ -186,58 +232,99 @@ stdenv.mkDerivation rec { mesonFlags = let - opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; + cfg = option: val: "-D${option}=${val}"; + feat = option: enable: cfg option (if enable then "enabled" else "disabled"); + driver = name: feat "driver_${name}"; + storage = name: feat "storage_${name}"; in [ "--sysconfdir=/var/lib" - "-Dinstall_prefix=${placeholder "out"}" - "-Dlocalstatedir=/var" - "-Drunstatedir=/run" - "-Dlibpcap=enabled" - "-Ddriver_qemu=enabled" - "-Ddriver_vmware=enabled" - "-Ddriver_vbox=enabled" - "-Ddriver_test=enabled" - "-Ddriver_esx=enabled" - "-Ddriver_remote=enabled" - "-Dpolkit=enabled" - (opt "storage_iscsi" enableIscsi) - ] ++ optionals stdenv.isLinux [ - (opt "storage_zfs" (zfs != null)) - "-Dattr=enabled" - "-Dapparmor=enabled" - "-Dsecdriver_apparmor=enabled" - "-Dnumad=enabled" - "-Dstorage_disk=enabled" - (opt "glusterfs" enableGlusterfs) - (opt "storage_rbd" enableCeph) - ] ++ optionals stdenv.isDarwin [ - "-Dinit_script=none" + (cfg "install_prefix" (placeholder "out")) + (cfg "localstatedir" "/var") + (cfg "runstatedir" "/run") + + (cfg "init_script" (if isDarwin then "none" else "systemd")) + + (feat "apparmor" isLinux) + (feat "attr" isLinux) + (feat "audit" isLinux) + (feat "bash_completion" true) + (feat "blkid" isLinux) + (feat "capng" isLinux) + (feat "curl" true) + (feat "docs" true) + (feat "expensive_tests" true) + (feat "firewalld" isLinux) + (feat "firewalld_zone" isLinux) + (feat "fuse" isLinux) + (feat "glusterfs" enableGlusterfs) + (feat "host_validate" true) + (feat "libiscsi" enableIscsi) + (feat "libnl" isLinux) + (feat "libpcap" true) + (feat "libssh2" true) + (feat "login_shell" isLinux) + (feat "nss" isLinux) + (feat "numactl" isLinux) + (feat "numad" isLinux) + (feat "pciaccess" isLinux) + (feat "polkit" true) + (feat "readline" true) + (feat "secdriver_apparmor" isLinux) + (feat "tests" true) + (feat "udev" isLinux) + (feat "yajl" true) + + (driver "ch" isLinux) + (driver "esx" true) + (driver "interface" isLinux) + (driver "libvirtd" true) + (driver "libxl" enableXen) + (driver "lxc" isLinux) + (driver "network" true) + (driver "openvz" isLinux) + (driver "qemu" true) + (driver "remote" true) + (driver "secrets" true) + (driver "test" true) + (driver "vbox" true) + (driver "vmware" true) + + (storage "dir" true) + (storage "disk" isLinux) + (storage "fs" isLinux) + (storage "gluster" enableGlusterfs) + (storage "iscsi" enableIscsi) + (storage "iscsi_direct" enableIscsi) + (storage "lvm" isLinux) + (storage "mpath" isLinux) + (storage "rbd" enableCeph) + (storage "scsi" true) + (storage "vstorage" isLinux) + (storage "zfs" enableZfs) ]; - postInstall = - let - binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; - in - '' - substituteInPlace $out/bin/virt-xml-validate \ - --replace xmllint ${libxml2}/bin/xmllint - - substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ - --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ - --replace "$out/bin" '${gettext}/bin' \ - --replace 'lock/subsys' 'lock' \ - --replace 'gettext.sh' 'gettext.sh - # Added in nixpkgs: - gettext() { "${gettext}/bin/gettext" "$@"; } - ' - '' + optionalString stdenv.isLinux '' - substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill - rm $out/lib/systemd/system/{virtlockd,virtlogd}.* - wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} - ''; + doCheck = true; + + postInstall = '' + substituteInPlace $out/bin/virt-xml-validate \ + --replace xmllint ${libxml2}/bin/xmllint + + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + optionalString isLinux '' + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${binPath} + ''; meta = { homepage = "https://libvirt.org/"; @@ -248,6 +335,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin lovesegfault ]; }; } From f1636eb9679784c5eef9e5d0931ed12125029aaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 07:48:50 +0000 Subject: [PATCH 027/122] git-cliff: 0.6.0 -> 0.6.1 --- .../version-management/git-and-tools/git-cliff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index b93491e267c..c9bf60a1eb9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-cctgZz65BliOePal4zrPpTbxMkz4GJj6gIh2YzEg+Do="; + sha256 = "sha256-CJ/2Cv/XoLq9U7u5mexH8iCCHbGtV6xohP3FapqO3+g="; }; - cargoSha256 = "sha256-M/BNqLZnLthaBONwn5XMmulmqyZTWv5LQFvxASDrBCI="; + cargoSha256 = "sha256-pYStKDgvvV/Z96TAonpDW7DIs1YSO6gAoiUCieVa9QY="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From a8c87a52d28497677fd6117acdc690d4466450a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 09:01:57 +0100 Subject: [PATCH 028/122] checkov: 2.0.938 -> 2.0.941 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3b833addc6b..8862464156f 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.938"; + version = "2.0.941"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-N8jEEtO2fRFtNS3lInEa/9IwtqBb9yDkg7hHp7bhH+s="; + hash = "sha256-hNmIJmxzKEaKQzqLl9LSqtMj1dTpFDeztUo2ESCHIw0="; }; nativeBuildInputs = with py.pkgs; [ From fe92f71efa486f512cd2be5e1bbcd86cd06d8c86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 09:04:35 +0100 Subject: [PATCH 029/122] python3Packages.pyupgrade: 2.31.0 -> 2.31.1 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 8d815ee1ce9..09c2c1ca7a6 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.31.0"; + version = "2.31.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nuYWJ4nilbXa/1KOuGhc6rB7uXDE4+lcESNud4Ug+3Y="; + sha256 = "sha256-l4wF/I3wsA9nowIdLjNPUxCaTPBu5v5oPQ3oNbLh+/o="; }; checkInputs = [ From e73e9e9420009ed37d3c46f847e2e8d2b2853b99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 08:27:34 +0000 Subject: [PATCH 030/122] python310Packages.amcrest: 1.9.4 -> 1.9.7 --- pkgs/development/python-modules/amcrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index 697b9bba00f..dcdf918344a 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.9.4"; + version = "1.9.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "sha256-smwPKZLevolNvpkLxoFR3NGL9YFPlBk3WYQqJXBaS7s="; + sha256 = "sha256-An7MnGtZsmEZU/y6E0sivdexFD6HJRTB1juXqHfbDzE="; }; propagatedBuildInputs = [ From 4f646210564cab1507655922b433268b8fac5bc7 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Thu, 3 Mar 2022 01:04:07 +1300 Subject: [PATCH 031/122] linux_testing_bcachefs: unstable-2022-01-12 -> unstable-2022-03-09 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 52fc24e101e..e396e9205bd 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2022-01-12" -, commit ? "0e6eb60f8be14b02e0a76cb330f4b22c80ec82e9" -, diffHash ? "091w4r7h93s5rv8hk65aix7l0rr4bd504mv998j7x360bqlb7vpi" +, date ? "2022-03-09" +, commit ? "2280551cebc1735f74eef75d650dd5e175461657" +, diffHash ? "1mrrydidbapdq0fs0vpqhs88k6ghdrvmjpk2zi7xlwj7j32h0nwp" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... From db181acbf8fec9bcf23551202279947799da6e2c Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Mon, 14 Mar 2022 21:48:07 +1300 Subject: [PATCH 032/122] bcachefs-tools: unstable-2022-01-12 -> unstable-2022-03-09 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 9e0752b5482..1a9cf9de04c 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-01-12"; + version = "unstable-2022-03-09"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "7b15324de1095f3e2e423e9c53da076d208b52d5"; - sha256 = "0glpq0n1xv7ck28v0gahl1fak9dhyp04id8d1l8yxvnriyw19zxa"; + rev = "3e2e3d468eed1d5ebbb4c6309d2eaebd081912c5"; + sha256 = "1sb0dj2whlp3dxgf642z7yx7s8va5ah82zi6r4qni7l64qy1n554"; }; postPatch = '' From 5a8602a87bbbd48a6e05083d07afda56a80d90dc Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 6 Mar 2022 18:42:17 +1300 Subject: [PATCH 033/122] bcachefs-tools: enable parallel building --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 1a9cf9de04c..c1d26202877 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation { smoke-test = nixosTests.bcachefs; }; + enableParallelBuilding = true; + meta = with lib; { description = "Tool for managing bcachefs filesystems"; homepage = "https://bcachefs.org/"; From 4ee9b84ec5e0367f24fd144d778490d093471d7d Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 6 Mar 2022 18:29:58 +1300 Subject: [PATCH 034/122] nixos/bcachefs: re-enable encryption in test --- nixos/tests/bcachefs.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 211195586ed..44997a74687 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; networking.hostId = "deadbeef"; boot.supportedFilesystems = [ "bcachefs" ]; - environment.systemPackages = with pkgs; [ parted ]; + environment.systemPackages = with pkgs; [ parted keyutils ]; }; testScript = '' @@ -20,10 +20,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { "parted --script /dev/vdb mklabel msdos", "parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s", "udevadm settle", - # Due to #32279, we cannot use encryption for this test yet - # "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", - # "echo password | bcachefs unlock /dev/vdb1", - "bcachefs format --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", + "keyctl link @u @s", + "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", + "echo password | bcachefs unlock /dev/vdb1", "mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", "udevadm settle", "bcachefs fs usage /tmp/mnt", From 2f1f631eaa1cc39ae889fffb3a7911a5de7b502c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 14 Mar 2022 16:51:26 +0800 Subject: [PATCH 035/122] pantheon.elementary-mail: fix build with vala 0.56 --- .../desktops/pantheon/apps/elementary-mail/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 2963f98db40..4a003d6c5ab 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ooqVNMgeAqGlFcfachPPfhSiKTEEcNGv5oWdM7VLWOc="; }; + patches = [ + # Fix build with vala 0.56 + # https://github.com/elementary/mail/pull/765 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/c3aa61d226f49147d7685cc00013469ff4df369a.patch"; + sha256 = "sha256-OxNBGIC1hrEaFSufQ59Wb0AMfdzqPt6diL4g3hbL/Ig="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils From 3b01bd6249cf90bfd7048003e8f2f9e98371c00d Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Mon, 14 Mar 2022 21:52:18 +1300 Subject: [PATCH 036/122] bcachefs: update maintainers As requested in https://github.com/NixOS/nixpkgs/pull/163433#issuecomment-1066169644 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 2 +- pkgs/tools/filesystems/bcachefs-tools/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index e396e9205bd..63d47dd8a38 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -16,7 +16,7 @@ extraMeta = { branch = "master"; - maintainers = with lib.maintainers; [ davidak chiiruno ]; + maintainers = with lib.maintainers; [ davidak Madouura ]; }; } // argsOverride; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index c1d26202877..aa049682b83 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { description = "Tool for managing bcachefs filesystems"; homepage = "https://bcachefs.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ davidak chiiruno ]; + maintainers = with maintainers; [ davidak Madouura ]; platforms = platforms.linux; }; } From 5979627e321fba01a01796ff5403b98be31c9140 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 14 Mar 2022 11:21:36 +0100 Subject: [PATCH 037/122] pt2-clone: 1.41 -> 1.42 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 05e6fac55f0..57c327d429d 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.41"; + version = "1.42"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-FnGtUoA6ol4lqp5HXjoJ3CHjdRs8eML0WI917ruid84="; + sha256 = "sha256-CwnEvQsxrYStJ4RxnE0lHt1fBHQEZrjSldnQnTOPaE0="; }; nativeBuildInputs = [ cmake ]; From 7919dd265510a9d7221c84003a8325ec2f7d9517 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Mar 2022 11:57:01 +0100 Subject: [PATCH 038/122] rocm-opencl-runtime: 4.5.2 -> 5.0.2 --- pkgs/development/libraries/rocm-opencl-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index f69165c5811..9c19638d3f4 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-0OGYF4urlscr8tMkQwo2yATXwN0DjB092KQ+CBEhfIA="; + hash = "sha256-ovYwElZGRKySH1mWFIISxuNNxCjaqoe9oCvqYZGdfq0="; }; nativeBuildInputs = [ cmake rocm-cmake ]; From 35a3108fae664a917b90c7415c346ac31527dc2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Mar 2022 11:58:09 +0100 Subject: [PATCH 039/122] rocm-cmake: 4.5.2 -> 5.0.2 --- pkgs/development/tools/build-managers/rocm-cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 6c366be8b42..f6d5de34893 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - hash = "sha256-5RwhIIOtqeMl/Gyufl5U1gTEpoCjdPJP5MbVnhEKYMM="; + hash = "sha256-4PtLe864MQ9wUn+l1fshiiTQvP06ewD39TDYZl70Hgg="; }; nativeBuildInputs = [ cmake ]; From de8f18cfc653a51b4913f5f6d45ed734442a926b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Mar 2022 12:01:03 +0100 Subject: [PATCH 040/122] rocm-device-libs: 5.0.0 -> 5.0.2 --- pkgs/development/libraries/rocm-device-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 757731d8779..773f98ee54a 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "5.0.0"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-CEpI0vX5kUbSmpe/ZTCFnfDuy6i9D+UsCZiX4/U0X8g="; + hash = "sha256-eZdy9+BfuUVzPO6huvqcwCog96qMVTYoY3l6J0YMUZQ="; }; nativeBuildInputs = [ cmake ]; From 6bf34a0cfe325964ae0ba01e4c53b8ea00ef0df2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Mar 2022 12:01:33 +0100 Subject: [PATCH 041/122] rocm-smi: 5.0.0 -> 5.0.2 --- pkgs/tools/system/rocm-smi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 9280da44311..1a2530d0a06 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "5.0.0"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; From 24b4b027dfea9d60a7c0bcbb772cbf11c3804adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Mon, 14 Mar 2022 12:48:59 +0100 Subject: [PATCH 042/122] mirage-im: add missing dependency Removed in 5e851a1f9b586ff4207bff8e98fa33f97080644e (#155538), probably by mistake. --- .../networking/instant-messengers/mirage/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index f35db8e3a11..bfe11b27218 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -65,6 +65,7 @@ mkDerivation rec { setuptools watchgod dbus-python + matrix-nio ]; qmakeFlags = [ From 21eeb396dea9f77c9737e0347e8dda1bbc74c1b1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 14 Mar 2022 19:58:55 +0800 Subject: [PATCH 043/122] pantheon.elementary-photos: fix build with vala 0.56 --- .../pantheon/apps/elementary-photos/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 1ff9157b301..e5a8523014d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -41,6 +42,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI="; }; + patches = [ + # Fix build with vala 0.56 + # https://github.com/elementary/photos/pull/711 + (fetchpatch { + url = "https://github.com/elementary/photos/commit/6594f1323726fb0d38519a7bdafe16f9170353cb.patch"; + sha256 = "sha256-Ie9ULC8Xw4KLQJANPXh4LDywMjWfniPX/P76eHW8LHc="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils From 2b2ac31248b169b8435f7ada019c549d4aedc8b4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Mar 2022 23:21:45 +0000 Subject: [PATCH 044/122] qemu: remove 9p O_NOATIME patch This is redundant with QEMU commit a5804fcf7b ("9pfs: local: ignore O_NOATIME if we don't have permissions"), included in QEMU since 5.1.0, which will retry opens without O_NOATIME if they fail with it. --- .../qemu/9p-ignore-noatime.patch | 49 ------------------- .../virtualization/qemu/default.nix | 2 - 2 files changed, 51 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch diff --git a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch b/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch deleted file mode 100644 index 7376e6f66ad..00000000000 --- a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9e4932ae99946b1a08ab5b5345fd2bc3486e54a5 Mon Sep 17 00:00:00 2001 -From: aszlig -Date: Mon, 18 Mar 2019 13:21:01 +0100 -Subject: [PATCH] 9pfs: Ignore O_NOATIME open flag - -Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir, -which in turn causes errors when the Nix store is mounted in the guest -because the file owner of the store paths typically don't match the -owner of the QEMU process. - -After submitting a patch to the overlayfs mailing list[1], it turns out -that my patch was incomplete[2] and needs a bit more rework. - -So instead of using an incomplete kernel patch in nixpkgs, which affects -*all* users of overlayfs, not just NixOS VM tests, I decided that for -now it's better to patch QEMU instead. - -The change here really only ignores the O_NOATIME flag so that the -behaviour is similar to what NFS does. From open(2): - -This flag may not be effective on all filesystems. One example is NFS, -where the server maintains the access time. - -This change is therefore only temporary until the final fix lands in the -stable kernel releases. - -[1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html -[2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html - -Signed-off-by: aszlig ---- - hw/9pfs/9p.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c -index a6d6b3f835..4eb26e2294 100644 ---- a/hw/9pfs/9p.c -+++ b/hw/9pfs/9p.c -@@ -139,7 +139,6 @@ static int dotl_to_open_flags(int flags) - { P9_DOTL_DSYNC, O_DSYNC }, - { P9_DOTL_FASYNC, FASYNC }, - #ifndef CONFIG_DARWIN -- { P9_DOTL_NOATIME, O_NOATIME }, - /* - * On Darwin, we could map to F_NOCACHE, which is - * similar, but doesn't quite have the same --- -2.35.1 - diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 9dcf80d0369..2b183dd48d0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -142,8 +142,6 @@ stdenv.mkDerivation rec { # set was removed during the process of upstreaming this functionality, and # will still be needed in nix until the macOS SDK reaches 10.13+. ./provide-fallback-for-utimensat.patch - # Still needed indefinitely - ./9p-ignore-noatime.patch ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; From e6974d060268a52325a11e88f49dff8ec13cc54e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 14 Mar 2022 07:20:13 -0500 Subject: [PATCH 045/122] nix-plugins: pin to nix 2.5, not yet compat with 2.6 --- 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 40f7cc930a4..b64765b9b4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19289,7 +19289,7 @@ with pkgs; ngtcp2 = callPackage ../development/libraries/ngtcp2 { }; - nix-plugins = callPackage ../development/libraries/nix-plugins { }; + nix-plugins = callPackage ../development/libraries/nix-plugins { nix = nixVersions.nix_2_5; }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; From a608df0ecb6ddcbc1177b76d0304511862d46590 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 14 Mar 2022 07:20:29 -0500 Subject: [PATCH 046/122] nix-doc: pin to nix 2.5, not yet compat with 2.6 --- 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 b64765b9b4f..c1e7ffc53a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33585,7 +33585,7 @@ with pkgs; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; - nix-doc = callPackage ../tools/package-management/nix-doc { }; + nix-doc = callPackage ../tools/package-management/nix-doc { nix = nixVersions.nix_2_5; }; nix-bundle = callPackage ../tools/package-management/nix-bundle { }; From c7fe08cea2652bad4cf4f460ac1eb1e8b346802e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 04:37:26 +0000 Subject: [PATCH 047/122] cloud-hypervisor: 22.0 -> 22.1 --- .../virtualization/cloud-hypervisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index bb94c2986f3..b381d3ccca1 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "22.0"; + version = "22.1"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "1n4i7rgx8rkif2naw429fnkhv0888sfxmnky67fd42mlv1lhz9w8"; + sha256 = "sha256-KWCGcGB4HCpV7uSM4otQhSGEzQ+1jQip2fiAysNN54k="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "0kc6lcwlqg9l19l4psakgkc5jf28nw1riz85adci897yha1dsnh0"; + cargoSha256 = "sha256-R70H1R9jFnQyOLI4UNuRzpOAAnGSBGpiHFKbxP2472o="; OPENSSL_NO_VENDOR = true; From 5dd15bb54cb9e8eebc285b9a7c871051ec1e8baf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 14 Mar 2022 07:30:48 -0500 Subject: [PATCH 048/122] klavaro: another icon fix per PR feedback --- pkgs/games/klavaro/icons.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/games/klavaro/icons.patch b/pkgs/games/klavaro/icons.patch index 750a899d23d..1717fdf44e6 100644 --- a/pkgs/games/klavaro/icons.patch +++ b/pkgs/games/klavaro/icons.patch @@ -9,6 +9,15 @@ False +@@ -708,7 +708,7 @@ + True + True + Drag and drop text here to practice with it. +- gtk-clear ++ edit-clear + Press here to restart the exercise. Hotkey: [Ctrl-R] + Press here to restart the exercise. Hotkey: [Ctrl-R] + @@ -1232,7 +1232,7 @@ True From 873b0ad28a460e02078eed803752d50533bf16c0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Mar 2022 19:02:22 +0000 Subject: [PATCH 049/122] icon-library: 0.0.8 -> 0.0.11 --- .../graphics/icon-library/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 276ccb51274..4dd97d92217 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -1,25 +1,21 @@ { lib, stdenv, fetchurl, wrapGAppsHook -, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc -, dbus, gdk-pixbuf, glib, gtk3, gtksourceview4, libhandy +, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc +, gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita }: stdenv.mkDerivation rec { pname = "icon-library"; - version = "0.0.8"; + version = "0.0.11"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/fdf890706e0eef2458a5285e3bf65dd5/icon-library-${version}.tar.xz"; - sha256 = "0807b56bgm8j1gpq4nf8x31gq9wqhcmpzpkqw6s4wissw3cb7q96"; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/93d183b17d216bbed7b03b2f3698059c/icon-library-${version}.tar.xz"; + sha256 = "1zrcnc5dn5fgcl3vklfpbp3m0qzi2n2viw59vw5fhwkysvp670y7"; }; nativeBuildInputs = [ - cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook + cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook ]; - buildInputs = [ dbus gdk-pixbuf glib gtk3 gtksourceview4 libhandy ]; - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - ''; + buildInputs = [ gdk-pixbuf glib gtk4 gtksourceview5 libadwaita ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/icon-library"; From 6d48ecf2dd3c250df86fd40b8c107e698969fbe2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 3 Dec 2021 15:17:40 +0000 Subject: [PATCH 050/122] eos-installer: init at 4.0.3 eos-installer is a GUI Linux image installer program. It was designed to install Endless OS but is becoming more generic over time. --- .../misc/eos-installer/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/misc/eos-installer/default.nix diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix new file mode 100644 index 00000000000..02d629412a3 --- /dev/null +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub +, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config +, gnome, gnupg, gtk3, udisks +}: + +stdenv.mkDerivation rec { + pname = "eos-installer"; + version = "4.0.3"; + + src = fetchFromGitHub { + owner = "endlessm"; + repo = "eos-installer"; + rev = "Release_${version}"; + sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz"; + fetchSubmodules = true; + }; + + strictDeps = true; + nativeBuildInputs = [ + autoconf autoconf-archive automake glib intltool libtool pkg-config + ]; + buildInputs = [ gnome.gnome-desktop gtk3 udisks ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ + "--libexecdir=${placeholder "out"}/bin" + "--localstatedir=/var" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; + + # These are for runtime, so can't be discovered from PATH, which + # is constructed from nativeBuildInputs. + GPG_PATH = "${gnupg}/bin/gpg"; + GPGCONF_PATH = "${gnupg}/bin/gpgconf"; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/endlessm/eos-installer"; + description = "Installer UI which writes images to disk"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8f2dba6f25..9cd052e4975 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25433,6 +25433,8 @@ with pkgs; eolie = callPackage ../applications/networking/browsers/eolie { }; + eos-installer = callPackage ../applications/misc/eos-installer { }; + epdfview = callPackage ../applications/misc/epdfview { }; epeg = callPackage ../applications/graphics/epeg { }; From b0a871a3ec5449a7f77b75f1abfbfe5bde650719 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 12:09:53 +0000 Subject: [PATCH 051/122] zsh: 5.8 -> 5.8.1 Fixes: CVE-2021-45444 --- pkgs/shells/zsh/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 71f95472bb4..5a2c0d050ce 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -13,7 +13,7 @@ , buildPackages }: let - version = "5.8"; + version = "5.8.1"; in stdenv.mkDerivation { @@ -22,19 +22,12 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; + sha256 = "sha256-tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk="; }; patches = [ # fix location of timezone data for TZ= completion ./tz_completion.patch - # This commit will be released with the next version of zsh - (fetchpatch { - name = "fix-git-stash-drop-completions.patch"; - url = "https://github.com/zsh-users/zsh/commit/754658aff38e1bdf487c58bec6174cbecd019d11.patch"; - sha256 = "sha256-ud/rLD+SqvyTzT6vwOr+MWH+LY5o5KACrU1TpmL15Lo="; - excludes = [ "ChangeLog" ]; - }) ]; nativeBuildInputs = [ autoreconfHook perl groff texinfo ] From e1b23b90ceba1a63c0da41d7ff25328f5f42b731 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 12:17:18 +0000 Subject: [PATCH 052/122] xsnow: 3.3.6 -> 3.4.4 --- pkgs/games/xsnow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index ee7cbd8fb48..ff34bfe729b 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.3.6"; + version = "3.4.4"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-rTJO1btS1VBHatj9Yr2R6vZBUPQtCB1Aa6AD6IzwuLg="; + sha256 = "sha256-fPMy5AxKspFkcWphf/IjMc/ZQtayljThKxbcMtvOjRc="; }; nativeBuildInputs = [ pkg-config ]; From eaa21176e27fc081baa4acfa902143ebafedac5c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 14:06:19 +0000 Subject: [PATCH 053/122] tkrev: tkcvs 8.2.1 -> tkrev 9.4.1 Package has been renamed. --- .../version-management/{tkcvs => tkrev}/default.nix | 13 ++++++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) rename pkgs/applications/version-management/{tkcvs => tkrev}/default.nix (54%) diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkrev/default.nix similarity index 54% rename from pkgs/applications/version-management/tkcvs/default.nix rename to pkgs/applications/version-management/tkrev/default.nix index 36e9154571b..66c1aa4d0e1 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkrev/default.nix @@ -1,18 +1,21 @@ { lib, stdenv, fetchurl, tcl, tk }: stdenv.mkDerivation rec { - pname = "tkcvs"; - version = "8.2.1"; + pname = "tkrev"; + version = "9.4.1"; src = fetchurl { - url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; + url = "mirror://sourceforge/tkcvs/tkrev_${version}.tar.gz"; + sha256 = "sha256-WHDZPShEB9Q+Bjbb37mogJLUZk2GuWoO8bz+Zydc7i4="; }; buildInputs = [ tcl tk ]; patchPhase = '' - sed -e 's@exec wish@exec ${tk}/bin/wish@' -i tkcvs/tkcvs.tcl tkdiff/tkdiff + for file in tkrev/tkrev.tcl tkdiff/tkdiff; do + substituteInPlace "$file" \ + --replace "exec wish" "exec ${tk}/bin/wish" + done ''; installPhase = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e69ad01ab65..46a74b391a5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1193,6 +1193,7 @@ mapAliases ({ thunderbird-bin-68 = thunderbird-68; timescale-prometheus = promscale; # Added 2020-09-29 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 + tkcvs = tkrev; # Added 2022-03-07 togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 tomboy = throw "tomboy is not actively developed anymore and was removed."; # Added 2022-01-27 tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cd052e4975..7e9352cd86b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29385,7 +29385,7 @@ with pkgs; tixati = callPackage ../applications/networking/p2p/tixati { }; - tkcvs = callPackage ../applications/version-management/tkcvs { }; + tkrev = callPackage ../applications/version-management/tkrev { }; tla = callPackage ../applications/version-management/arch { }; From 864f1413b0142a3ce26306d1a92bf42ddb7056e7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 14:43:20 +0000 Subject: [PATCH 054/122] tuxguitar: 1.5.4 -> 1.5.5 Fixes: CVE-2020-14940 --- pkgs/applications/editors/music/tuxguitar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index b76e4fa0a7b..3605f6c6e4e 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -2,11 +2,11 @@ let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then - { arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; } + { arch = "x86"; sha256 = "sha256-k4FQrt72VNb5FdYMzxskcVhKlvx8MZelUlLCItxDB7c="; } else - { arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; }; + { arch = "x86_64"; sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; }; in stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.5.5"; pname = "tuxguitar"; src = fetchurl { From d319a2b798dc7dcfff966809a94fea4af2475a15 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 16:58:40 +0000 Subject: [PATCH 055/122] tuxpaint: 0.9.24 -> 0.9.27; clarify license It's not right for everything to be in nativeBuildInputs, but most of the dependencies will never cross-compile anyway, so I'm just going to leave it alone. --- pkgs/games/tuxpaint/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 289b4e386be..2573e8c6de8 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -1,17 +1,21 @@ -{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, - cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf, imagemagick }: +{ lib, stdenv, fetchurl, SDL, SDL_gfx, SDL_image, SDL_ttf, SDL_mixer, libpng +, libimagequant, cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf +, imagemagick +}: stdenv.mkDerivation rec { - version = "0.9.24"; + version = "0.9.27"; pname = "tuxpaint"; src = fetchurl { url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz"; - sha256 = "06m1lg2pikfkmassfvvrbwqffwgixcmjh1li6akaldgkalpmfql7"; + sha256 = "sha256-qyuA6J34gijNDsCmyQtJ1UPLFXqjj7kMvTop8AFAVXo="; }; - nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo - librsvg gettext libpaper fribidi pkg-config gperf imagemagick ]; + nativeBuildInputs = [ + SDL SDL_gfx SDL_image SDL_ttf SDL_mixer libpng cairo libimagequant librsvg + gettext libpaper fribidi pkg-config gperf imagemagick + ]; hardeningDisable = [ "format" ]; makeFlags = [ "GPERF=${gperf}/bin/gperf" "PREFIX=$$out" @@ -45,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Drawing Software for Children"; homepage = "http://www.tuxpaint.org/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; }; From 3d0e5c122777bdf62a9811c442c44f7f61a85d27 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 17:09:38 +0000 Subject: [PATCH 056/122] tuxpaint: stamps: 2014-08-23 -> 2021-11-25 --- pkgs/games/tuxpaint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 2573e8c6de8..0860e2b3be2 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { # stamps stamps = fetchurl { - url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2014-08-23/tuxpaint-stamps-2014.08.23.tar.gz"; - sha256 = "0rhlwrjz44wp269v3rid4p8pi0i615pzifm1ym6va64gn1bms06q"; + url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2021-11-25/tuxpaint-stamps-2021.11.25.tar.gz"; + sha256 = "sha256-y1XuIbLSW0QO4has+rC7jZBq8cma28d+jbEe7DBYnVI="; }; postInstall = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # Install stamps tar xzf $stamps - cd tuxpaint-stamps-2014.08.23 + cd tuxpaint-stamps-* make install-all PREFIX=$out rm -rf $out/share/tuxpaint/stamps/military ''; From 674223e6483b9e0b6c3e230492ceacd8957b9256 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 17:10:06 +0000 Subject: [PATCH 057/122] tuxpaint: enable parallel building Tested at -j48. --- pkgs/games/tuxpaint/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 0860e2b3be2..638fa170f50 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { rm -rf $out/share/tuxpaint/stamps/military ''; + enableParallelBuilding = true; + meta = { description = "Open Source Drawing Software for Children"; homepage = "http://www.tuxpaint.org/"; From 8df0f8bcef282ce2749390001d51111b01398a26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 16:35:54 +0000 Subject: [PATCH 058/122] sbt-extras: 2021-11-08 -> 2022-02-01 --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 759c9f68159..26770276372 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "8ccccd8a1d7efa097b7f30e0ec76e39b3aa0f3df"; - version = "2021-11-08"; + rev = "ef403f4ce126441f126dfc61ca6357a7b42539af"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "376yaucqzoe36VKaJmCz+5vQHc+KNQG4iamAdOb/YQU="; + sha256 = "G7nR2wV0Wv019bCA+ecfYhmFh/DDHFjihKGFKNQ5dgM="; }; dontBuild = true; From 05d738afe863baab18132f76e5eff34aaa13b299 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 14:25:53 +0100 Subject: [PATCH 059/122] python3Packages.parts: disable on older Python releases --- pkgs/development/python-modules/parts/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 088510714a0..65ebd1bf3a1 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { @@ -8,6 +9,8 @@ buildPythonPackage rec { version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; sha256 = "sha256-NrhNpWyzqwn1bNnuqmcyKcUED0A4v7VJE4ZlTHFafJY="; From 2a03d6f2bfe052f33aa3be42d403a6f6de2a5f60 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 14:32:16 +0100 Subject: [PATCH 060/122] python3Packages.bitlist: 0.6.2 -> 0.7.0 --- pkgs/development/python-modules/bitlist/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index dcb83d1ca2a..c96c2e8707b 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -4,16 +4,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "bitlist"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "69cf632ca61b5fb5d2fd7587ddf023bcab8f327302f15070ec9079b68df9082a"; + sha256 = "sha256-p3Gws48u1/AzltbtPyWvSX4O0u4MgSXiVq4GstpPCCg="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { "bitlist" ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=bitlist --cov-report term-missing" "" + ''; + meta = with lib; { description = "Python library for working with little-endian list representation of bit strings"; homepage = "https://github.com/lapets/bitlist"; From 5405a8625ef051b276c1cec151edff2cf111d30c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 14:33:18 +0100 Subject: [PATCH 061/122] python3Packages.fountains: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/fountains/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index b869d583fc8..e62eedf0468 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchPypi , bitlist +, pythonOlder }: buildPythonPackage rec { pname = "fountains"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "6de6bc117c376f40a26e111111d638159a2e8a25cfe32f946db0d779decbb70a"; + sha256 = "sha256-c6nw22UtAREYZp0XCEZE6p7GpRvSLukq5y0c9KvVf9w="; }; propagatedBuildInputs = [ From 8d23c0f0f3a67b9fd5a9089f6798729d409ffc1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 14:36:00 +0100 Subject: [PATCH 062/122] python3Packages.fe25519: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/fe25519/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 05afcff5627..216a84b9ec6 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -6,16 +6,19 @@ , parts , nose , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "fe25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-3WFpbt4bA7zPlK+mp5DJXdgk44MBimCbpIMhRjZ5p0o="; + hash = "sha256-Hzdt8932WonJAaQPtL346JFPqxFXkNW4XQvbQlSoJJE="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=fe25519 --cov-report term-missing" "" + ''; + pythonImportsCheck = [ "fe25519" ]; From 7170d555c12237211c7fe2493f8884ae96d5176a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 14:36:23 +0100 Subject: [PATCH 063/122] python3Packages.ge25519: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/ge25519/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix index 5c9369e005b..22c96920be6 100644 --- a/pkgs/development/python-modules/ge25519/default.nix +++ b/pkgs/development/python-modules/ge25519/default.nix @@ -7,16 +7,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "ge25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-0M9RF8tlEoLyduvY3RvltGAnsus3HF6FEy22b6w6aUs="; + hash = "sha256-8GsNY62SusUmQcaqlhKOPHbd0jvZulCaxMxeob37JJM="; }; propagatedBuildInputs = [ @@ -31,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=ge25519 --cov-report term-missing" "" + ''; + + pythonImportsCheck = [ "ge25519" ]; From 35dc184ac5c45c83924da4b465e4fba7320c67ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 14:39:19 +0100 Subject: [PATCH 064/122] python3Packages.pyftdi: 0.53.3 -> 0.54.0 --- .../python-modules/pyftdi/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index a1fd4215faf..baf57da4160 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,22 +8,29 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.53.3"; - disabled = pythonOlder "3.5"; + version = "0.54.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t4rFsuhcpYdgmQeog+DRFxHk0wpMc+aukQi981vH/44="; + hash = "sha256-vL8jSgTtDvaHuCvaCYmFixILQFasTl82yINL5yRtOwU="; }; - propagatedBuildInputs = [ pyusb pyserial ]; + propagatedBuildInputs = [ + pyserial + pyusb + ]; - # tests requires access to the serial port + # Tests require access to the serial port doCheck = false; - pythonImportsCheck = [ "pyftdi" ]; + pythonImportsCheck = [ + "pyftdi" + ]; meta = with lib; { description = "User-space driver for modern FTDI devices"; From aee602ac0ee907c7b7d0a15c815b29d098a0bbd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 01:10:15 +0000 Subject: [PATCH 065/122] airshipper: 0.6.0 -> 0.7.0 --- pkgs/games/airshipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 1fe33a86f97..bc6f2a8dc71 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "airshipper"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitLab { owner = "Veloren"; repo = "airshipper"; rev = "v${version}"; - sha256 = "sha256-m3H2FE1DoV/uk9PGgf9PCagwmWWSQO/gCi7zpS02/WY="; + sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug="; }; - cargoSha256 = "sha256-ddy4TjT/ia+sLBnpwcXBVUzAS07ar+Jjc04KS5/arlU="; + cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw="; buildInputs = [ openssl From 899f1131d406ee4881b8e3962b14f06e2219cb87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Tue, 8 Mar 2022 13:53:26 -0300 Subject: [PATCH 066/122] irpf: init at 2022-1.0 --- pkgs/applications/finance/irpf/default.nix | 66 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/finance/irpf/default.nix diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix new file mode 100644 index 00000000000..e7ac78da18e --- /dev/null +++ b/pkgs/applications/finance/irpf/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenvNoCC +, fetchzip +, copyDesktopItems +, jdk11 +, makeDesktopItem +, makeWrapper +, unzip +}: + +stdenvNoCC.mkDerivation rec { + pname = "irpf"; + version = "2022-1.0"; + + src = let + year = lib.head (lib.splitVersion version); + in fetchzip { + url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; + sha256 = "0h8f51ilvg7m6hlx0y5mpxhac90p32ksbrffw0hxdqbilgjz1s68"; + }; + + nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem rec { + name = pname; + exec = pname; + icon = "rfb64"; + desktopName = "Imposto de Renda Pessoa Física"; + comment = "Programa Oficial da Receita para elaboração do IRPF"; + categories = [ "Office" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + BASEDIR="$out/share/${pname}" + mkdir -p "$BASEDIR" + + cp -r help lib lib-modulos "$BASEDIR" + + install -Dm755 irpf.jar "$BASEDIR/${pname}.jar" + install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR" + + makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ + --add-flags "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-Dswing.aatext=true" \ + --add-flags "-jar $BASEDIR/${pname}.jar" \ + --set _JAVA_AWT_WM_NONREPARENTING 1 \ + --set AWT_TOOLKIT MToolkit + + mkdir -p $out/share/pixmaps + unzip -j lib/ppgd-icones-4.0.jar icones/rfb64.png -d $out/share/pixmaps + + runHook postInstall + ''; + + meta = with lib; { + description = "Programa Oficial da Receita para elaboração do IRPF"; + homepage = "https://www.gov.br/receitafederal/pt-br"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f0204a518d..02cfb038a50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3373,6 +3373,8 @@ with pkgs; iotools = callPackage ../tools/misc/iotools { }; + irpf = callPackage ../applications/finance/irpf { }; + jellycli = callPackage ../applications/audio/jellycli { }; jellyfin = callPackage ../servers/jellyfin { }; From e2d6f416d5f5cad2fd53cb16b542aee4ba970727 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 14 Mar 2022 14:08:25 +0000 Subject: [PATCH 067/122] mercurial: add patch to fix the libc buffer type for aarch64-linux --- .../version-management/mercurial/default.nix | 5 +++++ .../mercurial/fix-rhg-type-aarch64.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 0fb1cdddfba..9dc3e0329e3 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -28,6 +28,11 @@ let sha256 = "sha256-hvmGReRWWpJWmR3N4it3uOfSLKb7tgwfTNvYRpo4zB8="; }; + patches = [ + # Fix the type of libc buffer for aarch64-linux + ./fix-rhg-type-aarch64.patch + ]; + format = "other"; passthru = { inherit python; }; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch new file mode 100644 index 00000000000..84417b497c0 --- /dev/null +++ b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch @@ -0,0 +1,12 @@ +diff --git a/rust/hg-core/src/lock.rs b/rust/hg-core/src/lock.rs +--- a/rust/hg-core/src/lock.rs ++++ b/rust/hg-core/src/lock.rs +@@ -145,7 +145,7 @@ lazy_static::lazy_static! { + + /// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414 + const BUFFER_SIZE: usize = 1024; +- let mut buffer = [0_i8; BUFFER_SIZE]; ++ let mut buffer = [0 as libc::c_char; BUFFER_SIZE]; + let hostname_bytes = unsafe { + let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE); + if result != 0 { From 198f6c583e3c1645177072e3aa35dccb4d419130 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Mar 2022 14:51:43 -0800 Subject: [PATCH 068/122] steam: re-expose LD_LIBRARY_PATH Was incorrectly altered after cherry-pick --- pkgs/games/steam/fhsenv.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index cd2046b2383..37ec8ef8c7e 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -49,6 +49,7 @@ let # Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present exportLDPath = '' export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH + export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; # bootstrap.tar.xz has 444 permissions, which means that simple deletes fail @@ -252,7 +253,7 @@ in buildFHSUserEnv rec { fi fi - export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + ${exportLDPath} ${fixBootstrap} exec steam "$@" ''; @@ -284,7 +285,8 @@ in buildFHSUserEnv rec { exit 1 fi shift - export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + + ${exportLDPath} ${fixBootstrap} exec -- "$run" "$@" ''; From ec2d8f622d4ed20fecfe4380637747603ecd98aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 14:54:44 +0000 Subject: [PATCH 069/122] python310Packages.chart-studio: 5.5.0 -> 5.6.0 --- pkgs/development/python-modules/chart-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 28e777e8fdd..30a620b5ad6 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.5.0"; + version = "5.6.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51"; + sha256 = "sha256-mf4QASdvO7doV5pKAAEzaKJP66w29osBlbLrJuopUvA="; }; sourceRoot = "source/packages/python/chart-studio"; From ede76de87d082edc629958eefb292020cb621f6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 14:25:45 +0000 Subject: [PATCH 070/122] python310Packages.libcloud: 3.4.1 -> 3.5.0 --- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 77aa9e2927a..d46e86ca106 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.4.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iPGNoM8/rAr3I+dD+3QdnRviUYge2reloNFimVW1ARs="; + sha256 = "sha256-Bz8QSSl2+qODoisTuCwkmCfP6QoIPHFiDoMW6BWm2zs="; }; propagatedBuildInputs = [ From 19bcfe05f3c1c0e121d953934fd953dabc21aa64 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 10 Mar 2022 16:57:54 +0100 Subject: [PATCH 071/122] python3Packages.rencode: switch to fetchFromGitHub --- .../python-modules/rencode/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index a742c422ee9..de09816da93 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,17 +1,18 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , cython }: -buildPythonPackage { +buildPythonPackage rec { pname = "rencode"; - version = "git20150810"; + version = "1.0.3"; - src = fetchgit { - url = "https://github.com/aresch/rencode"; - rev = "b45e04abdca0dea36e383a8199783269f186c99e"; - sha256 = "b4bd82852d4220e8a9493d3cfaecbc57b1325708a2d48c0f8acf262edb10dc40"; + src = fetchFromGitHub { + owner = "aresch"; + repo = "rencode"; + rev = "v${version}"; + sha256 = "sha256-tL2ChS1CIOipST08+uy8V7EyVwii1IwPis8mLtsQ3EA="; }; buildInputs = [ cython ]; From 15eda19c8eafb567c47eba9a725a6691e734196c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 14 Mar 2022 11:35:59 +0100 Subject: [PATCH 072/122] python3Packages.rencode: 1.0.3 -> 1.0.6 --- pkgs/development/python-modules/rencode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index de09816da93..464bbd78515 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "rencode"; - version = "1.0.3"; + version = "1.0.6"; src = fetchFromGitHub { owner = "aresch"; repo = "rencode"; rev = "v${version}"; - sha256 = "sha256-tL2ChS1CIOipST08+uy8V7EyVwii1IwPis8mLtsQ3EA="; + sha256 = "sha256-PGjjrZuoGYSPMNqXG1KXoZnOoWIe4g6s056jFhqrJ60="; }; buildInputs = [ cython ]; From d909888703a4fa120cda19ca87acfdeae7c8e5d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 14:46:37 +0000 Subject: [PATCH 073/122] python310Packages.channels-redis: 3.3.1 -> 3.4.0 --- pkgs/development/python-modules/channels-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index c7383e98219..803104d8547 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "channels-redis"; - version = "3.3.1"; + version = "3.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "channels_redis"; - sha256 = "899dc6433f5416cf8ad74505baaf2acb5461efac3cad40751a41119e3f68421b"; + sha256 = "sha256-Xf/UzBYXQSW9QEP8j+dGLKdAPPgB1Zqfp0EO0QH6alc="; }; buildInputs = [ redis hiredis ]; From f48caecaf35fa87c9cbd7bc7a8d0e105961215b1 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 14 Mar 2022 13:33:01 +0100 Subject: [PATCH 074/122] vscode-extensions.eamodio.gitlens: 12.0.1 -> 12.0.3 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f4dbd811670..d1d1ea57254 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -697,8 +697,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.0.1"; - sha256 = "1xv1vzx643qa8jhjpnpv2wrymz38w130vm0idkcl77lh209r5i8x"; + version = "12.0.3"; + sha256 = "sha256-PHQXfk0JggkEBRflHp+OAUOCVuymCubaszfDCYbpfG0="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; From 2730e56ed814bb49f2c5ec9623c8e0951654ca58 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 14 Mar 2022 13:33:48 +0100 Subject: [PATCH 075/122] vscode-extensions.esbenp.prettier-vscode: 9.2.0 -> 9.3.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d1d1ea57254..4c742a9cce6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -789,8 +789,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.2.0"; - sha256 = "sha256-ROI312MPMUY1q6IV4qVCW8DD0MQPA/hVW7rfamo/IbI="; + version = "9.3.0"; + sha256 = "sha256-hJgPjWf7a8+ltjmXTK8U/MwqgIZqBjmcCfHsAk2G3PA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; From 28a9b174130cfb102d9119d52bdc440d46e93bbe Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 14 Mar 2022 13:34:57 +0100 Subject: [PATCH 076/122] vscode-extensions.formulahendry.auto-close-tag: 0.5.13 -> 0.5.14 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4c742a9cce6..47e3980a716 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -887,8 +887,8 @@ let mktplcRef = { name = "auto-close-tag"; publisher = "formulahendry"; - version = "0.5.13"; - sha256 = "0swyxhcibv6cl54gmfpnbz6bqidjzc77nx369wndhlq264idnwkw"; + version = "0.5.14"; + sha256 = "sha256-XYYHS2QTy8WYjtUYYWsIESzmH4dRQLlXQpJq78BolMw="; }; meta = { license = lib.licenses.mit; From 809af29d7b3a7f376f5e480c2d07259962f4d63f Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 14 Mar 2022 13:35:23 +0100 Subject: [PATCH 077/122] vscode-extensions.formulahendry.auto-rename-tag: 0.1.9 -> 0.1.10 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 47e3980a716..b2da724b0c8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -899,8 +899,8 @@ let mktplcRef = { name = "auto-rename-tag"; publisher = "formulahendry"; - version = "0.1.9"; - sha256 = "1xk8rzda16qgdxhq8bz6f8w09fd9044qczx1wfhszd6w3r4q9262"; + version = "0.1.10"; + sha256 = "sha256-uXqWebxnDwaUVLFG6MUh4bZ7jw5d2rTHRm5NoR2n0Vs="; }; meta = { license = lib.licenses.mit; From 2bf666caafeeb2203f25be9df7799a9d4d3bba63 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 14 Mar 2022 13:35:44 +0100 Subject: [PATCH 078/122] vscode-extensions.jock.svg: 1.4.15 -> 1.4.17 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b2da724b0c8..f5d111b39e2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1229,8 +1229,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.15"; - sha256 = "0a5w6qxvsdzcmgc0yfiagpmz25y90pmzgrxz9899na5qy3pjcbmz"; + version = "1.4.17"; + sha256 = "sha256-CDxh/YRyDGocxG4qOcyLXA0zHCg0YJ7XUu3OjFFjleI="; }; meta = with lib; { license = licenses.mit; From 4f2a47bc5e27315e72ce41411829d98692371157 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 14 Mar 2022 13:36:03 +0100 Subject: [PATCH 079/122] vscode-extensions.ms-azuretools.vscode-docker: 1.19.0 -> 1.20.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f5d111b39e2..ccbd31569c0 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1426,8 +1426,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.19.0"; - sha256 = "sha256-buIAbsyKUvX3blO1AbCq/tJ1KAcqaFpciqQovmOZ5GE="; + version = "1.20.0"; + sha256 = "sha256-i3gYTP76YEDItG2oXR9pEXuGv0qmyf1Xv6HQvDBEOyg="; }; meta = { license = lib.licenses.mit; From 58d61dab7b84ee6b0477cfeacdcf4336ddc47822 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 14 Mar 2022 13:36:21 +0100 Subject: [PATCH 080/122] vscode-extensions.redhat.java: 1.3.0 -> 1.4.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ccbd31569c0..d2cf3faecb5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1590,8 +1590,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.3.0"; - sha256 = "sha256-Y5hP/Rq9BsFwbCRQWOfiLHKoYkKBpZx8blg9o74obfk="; + version = "1.4.0"; + sha256 = "sha256-9q3ilNukx3sQ6Fr1LhuQdjHHS251SDoHxC33w+qrfAI="; }; buildInputs = [ jdk ]; meta = { From 631534d97df2e9cfeb8caa7aecb084807008af5d Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 14 Mar 2022 13:36:39 +0100 Subject: [PATCH 081/122] vscode-extensions.redhat.vscode-yaml: 1.3.0 -> 1.5.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d2cf3faecb5..aeb358a44c0 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1604,8 +1604,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.3.0"; - sha256 = "sha256-Tz6bLcBUATn8cYIzGoLJwgaJZGbBVr1CISmJHz+iM60="; + version = "1.5.1"; + sha256 = "sha256-JXhmgBFZdKNjgX6K7U+M/T7HEmIOBQOzQEJ5957TUuM="; }; meta = { license = lib.licenses.mit; From f2bdaba3fdcd3045edce4d43e0bf5e7571d6c64b Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 14 Mar 2022 13:37:00 +0100 Subject: [PATCH 082/122] vscode-extensions.pkief.material-icon-theme: 4.12.1 -> 4.14.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index aeb358a44c0..e9054f944e7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1659,8 +1659,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.12.1"; - sha256 = "sha256-pmWnnZrdk6zb8YFG5ESgK4k875hgeseWyzkA9YUjg7A="; + version = "4.14.1"; + sha256 = "sha256-OHXi0EfeyKMeFiMU5yg0aDoWds4ED0lb+l6T12XZ3LQ="; }; meta = { license = lib.licenses.mit; From 0b29a7d688bb322ea35573eea5c0eef5705abc31 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 6 Mar 2022 16:02:00 +0100 Subject: [PATCH 083/122] =?UTF-8?q?ocamlPackages.utop:=202.8.0=20=E2=86=92?= =?UTF-8?q?=202.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/utop/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 42baa97b834..3e5471db5ae 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -2,19 +2,17 @@ , lambda-term, cppo, makeWrapper, buildDunePackage }: -if !lib.versionAtLeast ocaml.version "4.03" -then throw "utop is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "utop"; - version = "2.8.0"; + version = "2.9.0"; useDune2 = true; + minimalOCamlVersion = "4.03"; + src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "0mi571ifjzq4wcjarn8q1b7yl8nxjm1jfx3afac224lqwn6bhb2d"; + sha256 = "sha256:17jd61bc6pva5wqmnc9xq70ysyjplrzf1p25sq1s7wgrfq2vlyyd"; }; nativeBuildInputs = [ makeWrapper cppo ]; From e2c5abdd5d5a58bd48de0c2e32fa287d5c0fcbf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 16:09:48 +0100 Subject: [PATCH 084/122] python3Packages.vt-py: 0.13.1 -> 0.13.2 --- pkgs/development/python-modules/vt-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 2d0988473dd..13eeb86be8d 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.13.1"; + version = "0.13.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-85ohhynXHWjuwKB18DciB48tNGZcHzafobMDaGoTkoc="; + sha256 = "sha256-ULzMz81s/C5wjIUtZ+Rz5o1Uump1FV0rTcNW9keERDk="; }; propagatedBuildInputs = [ From c0e90b7c546896708d7359bd4f92a9cc4015c5a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 15:25:11 +0000 Subject: [PATCH 085/122] python310Packages.dash: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 004d42a81df..dc0813acefa 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ul3j1BJd3lKzGCEhPFYxZG0CcAqAZqmOEDi8vGPFItw="; + sha256 = "sha256-iH56c2PO1G/NlLmYC+6sdAMZ+kXvUkpkqxfnl9EmDsQ="; }; propagatedBuildInputs = [ From bf2d8ef5500643a40f62c4fc2fee1313e4dce188 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 19:06:09 -0300 Subject: [PATCH 086/122] fingerd_bsd: "merge" with finger_bsd In order to reduce duplicated code --- pkgs/servers/fingerd/bsd-fingerd/default.nix | 26 ------- .../fingerd/bsd-fingerd/ubuntu-0.17-9.patch | 67 ------------------- pkgs/tools/networking/bsd-finger/default.nix | 39 ++++++++--- pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 31 insertions(+), 104 deletions(-) delete mode 100644 pkgs/servers/fingerd/bsd-fingerd/default.nix delete mode 100644 pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix deleted file mode 100644 index b907c67ccb7..00000000000 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. - -stdenv.mkDerivation rec { - pname = "bsd-fingerd"; - version = "0.17"; - - src = fetchurl { - url = "mirror://ibiblioPubLinux/system/network/finger/bsd-finger-${version}.tar.gz"; - sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; - }; - - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - - patches = [ ./ubuntu-0.17-9.patch ]; - - preBuild = "cd fingerd"; - - preInstall = "mkdir -p $out/man/man8 $out/sbin "; - - meta = with lib; { - platforms = platforms.linux; - license = licenses.bsdOriginal; - }; -} diff --git a/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch b/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch deleted file mode 100644 index 80968d587ba..00000000000 --- a/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- bsd-finger-0.17.orig/fingerd/fingerd.8 -+++ bsd-finger-0.17/fingerd/fingerd.8 -@@ -36,10 +36,10 @@ - .Dt FINGERD 8 - .Os "Linux NetKit (0.17)" - .Sh NAME --.Nm fingerd -+.Nm in.fingerd - .Nd remote user information server - .Sh SYNOPSIS --.Nm fingerd -+.Nm in.fingerd - .Op Fl wulf - .Op Fl pL Ar path - .Op Fl t Ar timeout -@@ -61,7 +61,7 @@ - banner - which also shows some informations (e.g. uptime, operating system name and - release) about the system the --.Nm fingerd -+.Nm in.fingerd - is running on. Some sites may consider this a security risk as it - gives out information that may be useful to crackers. - .Pp -@@ -85,7 +85,7 @@ - .Pp - The - .Fl p --option allows specification of an alternate location for fingerd to find -+option allows specification of an alternate location for in.fingerd to find - the - .Dq finger - program. The -@@ -97,7 +97,7 @@ - option specifies the time to wait for a request before closing the - connection. A value of 0 waits forever. The default is 60 seconds. - .Pp --Options to fingerd should be specified in -+Options to in.fingerd should be specified in - .Pa /etc/inetd.conf . - .Pp - The finger protocol consists mostly of specifying command arguments. -@@ -105,12 +105,12 @@ - .Xr inetd 8 - .Dq super-server - runs --.Nm fingerd -+.Nm in.fingerd - for - .Tn TCP - requests received on port 79. - Once connected --.Nm fingerd -+.Nm in.fingerd - reads a single command line - terminated by a - .Aq Tn CRLF ---- bsd-finger-0.17.orig/fingerd/fingerd.c -+++ bsd-finger-0.17/fingerd/fingerd.c -@@ -55,6 +55,7 @@ - #include - #include - #include -+#include - - #include "pathnames.h" - #include "../version.h" diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index a83a02bd097..12e429b7bcb 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -1,26 +1,47 @@ -{ lib, stdenv, fetchurl }: - -# !!! Duplication: this package is almost exactly the same as `bsd-finger'. +{ lib +, stdenv +, fetchurl +, buildClient ? true +}: stdenv.mkDerivation rec { - pname = "bsd-finger"; + srcName = "bsd-finger"; + pname = srcName + lib.optionalString (!buildClient) "d"; version = "0.17"; src = fetchurl { - url = "mirror://ibiblioPubLinux/system/network/finger/bsd-finger-${version}.tar.gz"; - sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; + url = "mirror://ibiblioPubLinux/system/network/finger/${srcName}-${version}.tar.gz"; + hash = "sha256-hIhdZo0RfvUOAccDSkXYND10fOxiEuQOjQgVG8GOE/o="; }; + # outputs = [ "out" "man" ]; + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - patches = [ ./ubuntu-0.17-9.patch ]; + patches = [ + ./ubuntu-0.17-9.patch + ]; - preBuild = "cd finger"; + preBuild = let + srcdir = if buildClient then "finger" else "fingerd"; + in '' + cd ${srcdir} + ''; - preInstall = "mkdir -p $out/man/man1 $out/bin "; + preInstall = let + bindir = if buildClient then "bin" else "sbin"; + mandir = if buildClient then "man/man1" else "man/man8"; + in '' + mkdir -p $out/${bindir} $out/${mandir} + ''; meta = with lib; { + description = + if buildClient + then "User information lookup program" + else "Remote user information server"; platforms = platforms.linux; license = licenses.bsdOriginal; }; } +# TODO: multiple outputs (manpage) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da76e3eb9c6..fb9b89b8dbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5476,6 +5476,7 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; finger_bsd = callPackage ../tools/networking/bsd-finger { }; + fingerd_bsd = finger_bsd.override({ buildClient = false; }); iprange = callPackage ../applications/networking/firehol/iprange.nix {}; @@ -21264,8 +21265,6 @@ with pkgs; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; - fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; - inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird; freeradius = callPackage ../servers/freeradius { }; From 0562c75f4a8aa2f1c6ccc7ebfcfc338a0443ee34 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 14 Mar 2022 12:53:58 -0300 Subject: [PATCH 087/122] rename+alias finger_bsd to bsd-finger --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 46a74b391a5..f4bb9c1ebc6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -320,6 +320,8 @@ mapAliases ({ fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # Added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 + finger_bsd = bsd-finger; + fingerd_bsd = bsd-fingerd; firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25."; firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb9b89b8dbc..f8139459d6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5475,8 +5475,8 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; - finger_bsd = callPackage ../tools/networking/bsd-finger { }; - fingerd_bsd = finger_bsd.override({ buildClient = false; }); + bsd-finger = callPackage ../tools/networking/bsd-finger { }; + bsd-fingerd = bsd-finger.override({ buildClient = false; }); iprange = callPackage ../applications/networking/firehol/iprange.nix {}; From fb3ef16f527767c7e61c06c1209344f72a9236b6 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 3 Mar 2022 15:20:58 +0100 Subject: [PATCH 088/122] gnome-obfuscate: init at 0.0.4 --- .../graphics/gnome-obfuscate/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/applications/graphics/gnome-obfuscate/default.nix diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix new file mode 100644 index 00000000000..8cb4208e267 --- /dev/null +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitLab + +, gettext +, meson +, ninja +, pkg-config +, python3 +, rustPlatform +, wrapGAppsHook + +, appstream-glib +, desktop-file-utils +, glib +, gtk4 +, libadwaita +}: + +stdenv.mkDerivation rec { + pname = "gnome-obfuscate"; + version = "0.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Obfuscate"; + rev = version; + sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U="; + }; + + nativeBuildInputs = [ + gettext + glib + meson + ninja + pkg-config + python3 + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook + ]; + + buildInputs = [ + appstream-glib + desktop-file-utils + glib + gtk4 + libadwaita + ]; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + ''; + + meta = with lib; { + description = "Censor private information"; + homepage = "https://gitlab.gnome.org/World/obfuscate"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42a912c908f..5141a946562 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27944,6 +27944,8 @@ with pkgs; oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; + gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg_4 = ffmpeg-full; }; From b93c5724fc6cebcda6ee57982c3311adf90c9623 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 11:56:56 +0000 Subject: [PATCH 089/122] python310Packages.tatsu: 5.7.3 -> 5.8.0 --- pkgs/development/python-modules/tatsu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 18ab606afdd..b2a719a020b 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.7.3"; + version = "5.8.0"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "v${version}"; - sha256 = "1d6rnlybj971b5j5glvq288hd4r204nkmssqb0k8rm6cqcwhz292"; + sha256 = "sha256-spTIHiyspjrIV8DKR7YNpNTNO9SlcLOROuABhmu3ckA="; }; nativeBuildInputs = [ pytest-runner ]; From 3e497e315e97df5d0f57b7fcd9068c252dea07d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Mon, 14 Mar 2022 17:34:15 +0100 Subject: [PATCH 090/122] weechat: 3.4 -> 3.4.1 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index bfde86a366a..15dc8c07800 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,14 +28,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.4"; + version = "3.4.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-+JhIVcGA2wcvTr4O5eTn5vNszHpCuEt6D90a743PfQU="; + sha256 = "sha256-TJ4JI97WiobkBxgnkUGh/XQAIlDV+PDgIxCzTqefiMw="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; From 4339b99d6b8cfd8b9277a8fe614ae6f0661d5d53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 11:30:45 +0000 Subject: [PATCH 091/122] python310Packages.symengine: 0.9.0 -> 0.9.2 --- pkgs/development/python-modules/symengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index c2c22358661..db0f01ae51f 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "sha256-kz4M4ghR9Mi8Ig5K+pZC4zHt8XxoP3vU4ATImejqbgg="; + sha256 = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; }; postConfigure = '' From 92cabfd24f143980189374b668e7799242e57e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Mon, 14 Mar 2022 18:36:10 +0100 Subject: [PATCH 092/122] weechat: Disable documentation --- pkgs/applications/networking/irc/weechat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 15dc8c07800..541ad8c68f2 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -42,7 +42,7 @@ let cmakeFlags = with lib; [ "-DENABLE_MAN=ON" - "-DENABLE_DOC=ON" + "-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 "-DENABLE_PHP=OFF" ] From a624ff71ce538f7a9d9ad046f741db8daca4d1e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 15:53:30 +0000 Subject: [PATCH 093/122] oh-my-zsh: 2022-03-10 -> 2022-03-14 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f85797f7635..1907745fe8d 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2022-03-10"; + version = "2022-03-14"; pname = "oh-my-zsh"; - rev = "c10241f3d1d7bf77d483e11869a6a00f1d2e5e88"; + rev = "345976874550efa09fa7e9cdbe1215ce27d1541b"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "HVV3zhEZ4NU4Dk7zHv+NeatTJUbzxqOvM4cYNzjuTfo="; + sha256 = "AxKt84XDqmkwBlUeWsE6Tm0aRxvv0HXRdBf/OXjIyHo="; }; installPhase = '' From 471445a4e59ca073c6ebf92ef0b3b246d085be7e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 14 Mar 2022 12:55:17 -0300 Subject: [PATCH 094/122] freeradius: rename finger_bsd to bsd-finger --- pkgs/servers/freeradius/default.nix | 87 +++++++++++++---------------- 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index a3cdec3fec8..3999d422d21 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -1,28 +1,23 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, talloc, finger_bsd, perl -, openssl -, linkOpenssl? true -, openldap -, withLdap ? true -, sqlite -, withSqlite ? true -, libpcap -, withPcap ? true -, libcap -, withCap ? true -, libmemcached -, withMemcached ? false -, hiredis -, withRedis ? false -, libmysqlclient -, withMysql ? false -, json_c -, withJson ? false -, libyubikey -, withYubikey ? false -, collectd -, withCollectd ? false -, curl -, withRest ? false +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, bsd-finger +, perl +, talloc +, linkOpenssl? true, openssl +, withCap ? true, libcap +, withCollectd ? false, collectd +, withJson ? false, json_c +, withLdap ? true, openldap +, withMemcached ? false, libmemcached +, withMysql ? false, libmysqlclient +, withPcap ? true, libpcap +, withRedis ? false, hiredis +, withRest ? false, curl +, withSqlite ? true, sqlite +, withYubikey ? false, libyubikey }: assert withSqlite -> sqlite != null; @@ -36,43 +31,38 @@ assert withYubikey -> libyubikey != null; assert withCollectd -> collectd != null; assert withRest -> curl != null && withJson; -## TODO: include windbind optionally (via samba?) -## TODO: include oracle optionally -## TODO: include ykclient optionally - -with lib; stdenv.mkDerivation rec { pname = "freeradius"; version = "3.0.25"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "SIOmi7PO5GAlNZqXwWkc5lXour/W3DwCHQDhCaL/TBA="; + hash = "sha256-SIOmi7PO5GAlNZqXwWkc5lXour/W3DwCHQDhCaL/TBA="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openssl talloc finger_bsd perl ] - ++ optional withLdap openldap - ++ optional withSqlite sqlite - ++ optional withPcap libpcap - ++ optional withCap libcap - ++ optional withMemcached libmemcached - ++ optional withRedis hiredis - ++ optional withMysql libmysqlclient - ++ optional withJson json_c - ++ optional withYubikey libyubikey - ++ optional withCollectd collectd - ++ optional withRest curl; - + buildInputs = [ openssl talloc bsd-finger perl ] + ++ lib.optional withCap libcap + ++ lib.optional withCollectd collectd + ++ lib.optional withJson json_c + ++ lib.optional withLdap openldap + ++ lib.optional withMemcached libmemcached + ++ lib.optional withMysql libmysqlclient + ++ lib.optional withPcap libpcap + ++ lib.optional withRedis hiredis + ++ lib.optional withRest curl + ++ lib.optional withSqlite sqlite + ++ lib.optional withYubikey libyubikey; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] ++ optional (!linkOpenssl) "--with-openssl=no"; + ] ++ lib.optional (!linkOpenssl) "--with-openssl=no"; postPatch = '' - substituteInPlace src/main/checkrad.in --replace "/usr/bin/finger" "${finger_bsd}/bin/finger" + substituteInPlace src/main/checkrad.in \ + --replace "/usr/bin/finger" "${bsd-finger}/bin/finger" ''; # By default, freeradius will generate Diffie-Hellman parameters and @@ -99,6 +89,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ]; platforms = with platforms; linux; }; - } - +## TODO: include windbind optionally (via samba?) +## TODO: include oracle optionally +## TODO: include ykclient optionally From 44a3a284df33c8984aa2038b4b3bb5ff4922d4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 14 Mar 2022 18:48:35 +0100 Subject: [PATCH 095/122] lab: 0.23.0 -> 0.24.0 --- .../version-management/git-and-tools/lab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index f1be6a4fc8d..8f4acbc3fc4 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "lab"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "0g8v3cli8rvr0zsxiv4w0afzqmh0d85a832c4hc75b3f9amkr0dl"; + sha256 = "sha256-sw00D/PJaLAPHoPdJC2WYUNklIzMbc/bXt2jlQZ7E90="; }; subPackages = [ "." ]; - vendorSha256 = "09xn5vycb9shygs13pfwxlb89j6rhrbplm10mfgxi4kzlvm7agl6"; + vendorSha256 = "sha256-FwnVMH//GwFbi+llFF6XNqrZX2hRB4r51p8TRz2vN+g="; doCheck = false; From a42c074db07f10716a3c6e25cae3c394b615c109 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 14 Mar 2022 17:47:46 +0100 Subject: [PATCH 096/122] nuget-to-nix: add missing comma This fixes a regression introduced in bbcb7d3d34ca5ea620740184eea9db61e4b84f8b --- pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index 2d02767814e..d2e7882caf6 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -9,7 +9,7 @@ fi pkgs=$1 tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX) -trap 'rm -f "$tmpfile" EXIT +trap "rm -f ${tmpfile}" EXIT echo "{ fetchNuGet }: [" From ecde75c8cad48e9c759d8a5fd3e956a15af6e574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 14 Mar 2022 19:00:44 +0100 Subject: [PATCH 097/122] open-policy-agent: 0.38.0 -> 0.38.1 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 3f6ea3b6462..66648faed1d 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-RGGxqmQ0mZ5iSAzDvUU6mAlCve3MknuNr2wAzHcV3RQ="; + sha256 = "sha256-x8mSlZ2X0DdkhaW5QXs5axERJkwARu8tHueQHXfamXM="; }; vendorSha256 = null; From dab246af156c62045b4622f61e9092c0a26562a2 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 14 Mar 2022 19:00:58 +0100 Subject: [PATCH 098/122] tcpdump: Filter Darwin from supported platforms (#163888) Co-authored-by: Sandro --- pkgs/tools/networking/tcpdump/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 6726e5b751a..cdb33ab1f1a 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ globin ]; platforms = platforms.unix; + badPlatforms = platforms.darwin; }; } From 4eec80710a0802f831d9d5d0822d7b1a5f42060b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 14 Mar 2022 19:10:42 +0100 Subject: [PATCH 099/122] qrcp: 0.9.0 -> 0.9.1 --- pkgs/tools/networking/qrcp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index ddbba0650f4..150a1fa899f 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "qrcp"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "sha256-vem9aXyRIV/2O3sfZ5zpcxs9GSc+uqUgFedyY1O4hWw="; + sha256 = "sha256-oXtFkjCnbfjV15XWkmmJmhG82GyaY4FAcF5NrGnxHm0="; }; vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4"; From d886a9ae83cbf2f81da9ff014c0b6fdc2953a4c3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 14 Mar 2022 10:12:12 -0700 Subject: [PATCH 100/122] libvirt: 7.10.0 -> 8.1.0 --- ...n-install-prefix-for-building-on-nix.patch | 257 +++++++++++++----- .../development/libraries/libvirt/default.nix | 10 +- 2 files changed, 194 insertions(+), 73 deletions(-) diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 760235245c8..0945f21211d 100644 --- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -1,4 +1,4 @@ -From a6593bf70dd5f91acc7c2795d658a49eb9d4f672 Mon Sep 17 00:00:00 2001 +From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 14 Jan 2021 00:32:00 -0800 Subject: [PATCH] meson: patch in an install prefix for building on nix @@ -6,23 +6,28 @@ Subject: [PATCH] meson: patch in an install prefix for building on nix Used in the nixpkgs version of libvirt so that we can install things in the nix store, but read them from the root filesystem. --- - meson.build | 9 +++++++++ + meson.build | 9 ++++++++ meson_options.txt | 2 ++ - src/ch/meson.build | 4 ++-- - src/libxl/meson.build | 6 +++--- - src/locking/meson.build | 8 ++++---- - src/lxc/meson.build | 6 +++--- - src/meson.build | 18 +++++++++--------- - src/network/meson.build | 10 +++++----- + src/ch/meson.build | 6 ++--- + src/interface/meson.build | 2 +- + src/libxl/meson.build | 18 +++++++-------- + src/locking/meson.build | 8 +++---- + src/lxc/meson.build | 10 ++++---- + src/meson.build | 18 +++++++-------- + src/network/meson.build | 14 ++++++------ + src/node_device/meson.build | 2 +- + src/nwfilter/meson.build | 6 ++--- src/nwfilter/xml/meson.build | 2 +- - src/qemu/meson.build | 14 +++++++------- - src/remote/meson.build | 6 +++--- - src/security/apparmor/meson.build | 8 ++++---- - tools/meson.build | 4 ++-- - 13 files changed, 54 insertions(+), 43 deletions(-) + src/qemu/meson.build | 38 +++++++++++++++---------------- + src/remote/meson.build | 10 ++++---- + src/secret/meson.build | 4 ++-- + src/security/apparmor/meson.build | 8 +++---- + src/storage/meson.build | 6 ++--- + tools/meson.build | 2 +- + 18 files changed, 88 insertions(+), 77 deletions(-) diff --git a/meson.build b/meson.build -index ad0cd44aca..bdd87c926a 100644 +index 9016c0458a..b26e690194 100644 --- a/meson.build +++ b/meson.build @@ -39,6 +39,8 @@ if host_machine.system() == 'windows' @@ -59,40 +64,66 @@ index 5b43cdbd6b..e9dff18441 100644 option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') diff --git a/src/ch/meson.build b/src/ch/meson.build -index e34974d56c..4767763c2c 100644 +index 66b77907b0..6aa9bbc548 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build -@@ -68,7 +68,7 @@ if conf.has('WITH_CH') +@@ -64,8 +64,8 @@ if conf.has('WITH_CH') } virt_install_dirs += [ - localstatedir / 'lib' / 'libvirt' / 'ch', +- localstatedir / 'log' / 'libvirt' / 'ch', - runstatedir / 'libvirt' / 'ch', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'ch', + install_prefix + runstatedir / 'libvirt' / 'ch', ] endif +diff --git a/src/interface/meson.build b/src/interface/meson.build +index 828f274422..2a6b1f8c5e 100644 +--- a/src/interface/meson.build ++++ b/src/interface/meson.build +@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE') + } + + virt_install_dirs += [ +- runstatedir / 'libvirt' / 'interface', ++ install_prefix + runstatedir / 'libvirt' / 'interface', + ] + endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 9793899106..4904387162 100644 +index 0cc277db82..48d8c5b962 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build -@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') +@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL') } virt_install_dirs += [ +- confdir / 'libxl', +- confdir / 'libxl' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'libxl', -- runstatedir / 'libvirt' / 'libxl', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save', - localstatedir / 'log' / 'libvirt' / 'libxl', +- runstatedir / 'libvirt' / 'libxl', ++ install_prefix + confdir / 'libxl', ++ install_prefix + confdir / 'libxl' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', -+ install_prefix + runstatedir / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save', + install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', ++ install_prefix + runstatedir / 'libvirt' / 'libxl', ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 184d3c3f56..7ffd3740e3 100644 +index 72f7780438..abe70d20d5 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build -@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD') } virt_install_dirs += [ @@ -112,26 +143,39 @@ index 184d3c3f56..7ffd3740e3 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index ad5c659dba..8010dfbf02 100644 +index 99d4a34213..aae477c1ee 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build -@@ -181,8 +181,8 @@ if conf.has('WITH_LXC') +@@ -176,10 +176,10 @@ if conf.has('WITH_LXC') } virt_install_dirs += [ +- confdir / 'lxc', +- confdir / 'lxc' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'lxc', -- runstatedir / 'libvirt' / 'lxc', - localstatedir / 'log' / 'libvirt' / 'lxc', +- runstatedir / 'libvirt' / 'lxc', ++ install_prefix + confdir / 'lxc', ++ install_prefix + confdir / 'lxc' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', -+ install_prefix + runstatedir / 'libvirt' / 'lxc', + install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', ++ install_prefix + runstatedir / 'libvirt' / 'lxc', ] endif diff --git a/src/meson.build b/src/meson.build -index 2bd88e6699..76df507968 100644 +index b2d951d36c..305716010f 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -669,7 +669,7 @@ endforeach +@@ -210,7 +210,7 @@ openrc_init_files = [] + + # virt_install_dirs: + # list of directories to create during installation +-virt_install_dirs = [ confdir ] ++virt_install_dirs = [ install_prefix + confdir ] + + # driver_source_files: + # driver source files to check +@@ -663,7 +663,7 @@ endforeach virt_conf_files += 'libvirt.conf' @@ -140,7 +184,7 @@ index 2bd88e6699..76df507968 100644 install_data(virt_aug_files, install_dir: virt_aug_dir) # augeas_test_data: -@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs +@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs output: '@0@.conf'.format(data['name']), configuration: daemon_conf, install: true, @@ -149,15 +193,16 @@ index 2bd88e6699..76df507968 100644 ) if data.get('with_ip', false) -@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD') install_data( init_file, - install_dir: sysconfdir / 'init.d', + install_dir: install_prefix + sysconfdir / 'init.d', + install_mode: 'rwxr-xr-x', rename: [ init['name'] ], ) - +@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD') if init.has_key('confd') install_data( init['confd'], @@ -166,16 +211,7 @@ index 2bd88e6699..76df507968 100644 rename: [ init['name'] ], ) endif -@@ -872,7 +872,7 @@ if init_script != 'none' - foreach sysconf : sysconf_files - install_data( - sysconf['file'], -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: [ sysconf['name'] ], - ) - endforeach -@@ -897,10 +897,10 @@ endif +@@ -882,10 +882,10 @@ endif # Install empty directories virt_install_dirs += [ @@ -191,23 +227,27 @@ index 2bd88e6699..76df507968 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index d6fb624bb7..96b757b144 100644 +index b5eff0c3ab..a0f26d624e 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -78,9 +78,9 @@ if conf.has('WITH_NETWORK') +@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK') } virt_install_dirs += [ +- confdir / 'qemu' / 'networks', +- confdir / 'qemu' / 'networks' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'network', - localstatedir / 'lib' / 'libvirt' / 'dnsmasq', - runstatedir / 'libvirt' / 'network', ++ install_prefix + confdir / 'qemu' / 'networks', ++ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', + install_prefix + runstatedir / 'libvirt' / 'network', ] configure_file( -@@ -88,12 +88,12 @@ if conf.has('WITH_NETWORK') +@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK') output: '@BASENAME@', copy: true, install: true, @@ -222,6 +262,35 @@ index d6fb624bb7..96b757b144 100644 '../default.xml', 'default.xml', ) +diff --git a/src/node_device/meson.build b/src/node_device/meson.build +index 1c95975c37..a7831242db 100644 +--- a/src/node_device/meson.build ++++ b/src/node_device/meson.build +@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES') + } + + virt_install_dirs += [ +- runstatedir / 'libvirt' / 'nodedev', ++ install_prefix + runstatedir / 'libvirt' / 'nodedev', + ] + endif +diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build +index 55cf8fcce4..d331086f2e 100644 +--- a/src/nwfilter/meson.build ++++ b/src/nwfilter/meson.build +@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER') + } + + virt_install_dirs += [ +- confdir / 'nwfilter', +- runstatedir / 'libvirt' / 'nwfilter-binding', +- runstatedir / 'libvirt' / 'nwfilter', ++ install_prefix + confdir / 'nwfilter', ++ install_prefix + runstatedir / 'libvirt' / 'nwfilter-binding', ++ install_prefix + runstatedir / 'libvirt' / 'nwfilter', + ] + + subdir('xml') diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build index 0d96c54ebe..66c92a1016 100644 --- a/src/nwfilter/xml/meson.build @@ -233,43 +302,71 @@ index 0d96c54ebe..66c92a1016 100644 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 3898d23877..c2a2675187 100644 +index 39f0f615cc..5f6f30f82b 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') - } +@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU') + endif virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'qemu', -- runstatedir / 'libvirt' / 'qemu', +- confdir / 'qemu', +- confdir / 'qemu' / 'autostart', - localstatedir / 'cache' / 'libvirt' / 'qemu', -- localstatedir / 'log' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot', - localstatedir / 'lib' / 'libvirt' / 'swtpm', -- runstatedir / 'libvirt' / 'qemu' / 'swtpm', +- localstatedir / 'log' / 'libvirt' / 'qemu', - localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', -+ install_prefix + runstatedir / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu' / 'dbus', +- runstatedir / 'libvirt' / 'qemu' / 'slirp', +- runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + confdir / 'qemu', ++ install_prefix + confdir / 'qemu' / 'autostart', + install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', -+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', + install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index 0a188268b5..702822612e 100644 +index b2aafe6320..6972d254ca 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build -@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') +@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE') } virt_install_dirs += [ - localstatedir / 'log' / 'libvirt', +- runstatedir / 'libvirt', +- runstatedir / 'libvirt' / 'common', + install_prefix + localstatedir / 'log' / 'libvirt', ++ install_prefix + runstatedir / 'libvirt', ++ install_prefix + runstatedir / 'libvirt' / 'common', ] logrotate_conf = configuration_data() -@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') +@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE') ) install_data( log_file, @@ -278,7 +375,7 @@ index 0a188268b5..702822612e 100644 rename: [ name ], ) endforeach -@@ -309,7 +309,7 @@ endif +@@ -301,7 +301,7 @@ endif if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -287,6 +384,20 @@ index 0a188268b5..702822612e 100644 rename: [ 'libvirt.conf' ], ) endif +diff --git a/src/secret/meson.build b/src/secret/meson.build +index 1bda59849b..392bc2cb2e 100644 +--- a/src/secret/meson.build ++++ b/src/secret/meson.build +@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS') + } + + virt_install_dirs += [ +- confdir / 'secrets', +- runstatedir / 'libvirt' / 'secrets', ++ install_prefix + confdir / 'secrets', ++ install_prefix + runstatedir / 'libvirt' / 'secrets', + ] + endif diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build index 990f00b4f3..e5a7a14e1d 100644 --- a/src/security/apparmor/meson.build @@ -318,8 +429,25 @@ index 990f00b4f3..e5a7a14e1d 100644 + install_dir: install_prefix + apparmor_dir / 'local', rename: 'usr.lib.libvirt.virt-aa-helper', ) +diff --git a/src/storage/meson.build b/src/storage/meson.build +index 26e7ff1a1a..ad5c6eddc3 100644 +--- a/src/storage/meson.build ++++ b/src/storage/meson.build +@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE') + } + + virt_install_dirs += [ +- confdir / 'storage', +- confdir / 'storage' / 'autostart', +- runstatedir / 'libvirt' / 'storage', ++ install_prefix + confdir / 'storage', ++ install_prefix + confdir / 'storage' / 'autostart', ++ install_prefix + runstatedir / 'libvirt' / 'storage', + ] + endif + diff --git a/tools/meson.build b/tools/meson.build -index 3fba313e5f..a2b891b86c 100644 +index f4b4a16c29..059c73a955 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL') @@ -331,15 +459,6 @@ index 3fba313e5f..a2b891b86c 100644 endif if host_machine.system() == 'windows' -@@ -307,7 +307,7 @@ configure_file( - if init_script == 'systemd' - install_data( - 'libvirt-guests.sysconf', -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: 'libvirt-guests', - ) - -- 2.35.1 diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index d467e6347f0..14e0e478790 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -109,14 +109,14 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "7.10.0"; + version = "8.1.0"; src = if isDarwin then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "sha256-yzGAFK8JcyeSjG49cpIuO+AqPmQBJHsqpS2auOC0gPk="; + sha256 = "sha256-PGxDvs/+s0o/OXxhYgaqaaiT/4v16CCDk8hOjnU1KTQ="; } else fetchFromGitLab @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bB8LsjZFeJbMmmC0YRPyMag2MBhwagUFC7aB1KhZEkA="; + sha256 = "sha256-nk8pBlss+g4EMy+RnAOyz6YlGGvlBvl5aBpcytsK1wY="; fetchSubmodules = true; }; @@ -138,6 +138,8 @@ stdenv.mkDerivation rec { sed -i '/virnetsockettest/d' tests/meson.build # delete only the first occurrence of this sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build + '' + optionalString isDarwin '' + sed -i '/qemucapabilitiestest/d' tests/meson.build ''; @@ -228,7 +230,7 @@ stdenv.mkDerivation rec { '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); - mesonAutoFeatures = "auto"; + mesonAutoFeatures = "disabled"; mesonFlags = let From 165a9f08e6d9db8d2eaeed78bc1cea11bd6f1c6a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 14 Mar 2022 10:25:50 -0700 Subject: [PATCH 101/122] python3Packages.libvirt: 7.10.0 -> 8.1.0 --- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index a8e21a698f7..d69885fcb0f 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "7.10.0"; + version = "8.1.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw="; + sha256 = "sha256-/uGxjptiqm5B823z4mcjredj9ZLZC2WTTqhQrQPVfDU="; }; nativeBuildInputs = [ pkg-config ]; From 1fef27cc119f32abf577ac2727e892db3beedbc7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 14 Mar 2022 10:27:20 -0700 Subject: [PATCH 102/122] perlPackages.SysVirt: 7.10.0 -> 8.1.0 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 943ad79cc28..d106a1897e4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20782,12 +20782,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "7.10.0"; + version = "8.1.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; - rev = "v7.10.0"; - sha256 = "sha256-cXuzg4bBwCftdZhz3e50L+4fO0RWX5Tl8zDOoydECd4="; + rev = "v${version}"; + sha256 = "sha256-9cjH4hIIxB+Pv9+ck6xg8KmfM8jtVFKVQNGLYr2AnAM="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From 20dd1e678299aae83735f1af5d1dcd80de22da5f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 14 Mar 2022 11:04:45 -0700 Subject: [PATCH 103/122] virt-manager: fix masked tests for libvirt 8.1.0 --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index ab38de0f919..aa225c1d173 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -66,8 +66,8 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTests = [ - "testCLI0001virt_install_many_devices" - "test_disk_dir_searchable" + "testAlterDisk" + "test_misc_nonpredicatble_generate" ]; preCheck = '' From e0cce3d7bffa8e6b5bc6f931b341d66fd5548c48 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 14 Mar 2022 15:47:56 -0300 Subject: [PATCH 104/122] goobook: export to all-packages.nix --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8139459d6d..f9b81097978 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27292,6 +27292,8 @@ with pkgs; luddite = with python3Packages; toPythonApplication luddite; + goobook = with python3Packages; toPythonApplication goobook; + lumail = callPackage ../applications/networking/mailreaders/lumail { lua = lua5_1; }; From a9b8e7d21d27cdadbfed53aef8abcfbb373de691 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 14 Mar 2022 12:54:44 -0300 Subject: [PATCH 105/122] lbdb: rename finger_bsd to bsd-finger --- pkgs/tools/misc/lbdb/default.nix | 55 +++++++++++++++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index ce3a5acd4c9..3a7338221ba 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,38 +1,49 @@ -{ lib, stdenv, fetchurl, fetchpatch, perl, finger_bsd -, abook ? null -, gnupg ? null -, goobook ? null -, khard ? null -, mu ? null +{ lib +, stdenv +, fetchurl +, fetchpatch +, perl +, bsd-finger +, withAbook ? true, abook +, withGnupg ? true, gnupg +, withGoobook ? true, goobook +, withKhard ? true, khard +, withMu ? true, mu }: let - perl' = perl.withPackages (p: with p; [ ConvertASN1 perlldap AuthenSASL ]); + perl' = perl.withPackages (p: with p; [ + AuthenSASL + ConvertASN1 + perlldap + ]); in stdenv.mkDerivation rec { pname = "lbdb"; version = "0.48.1"; + src = fetchurl { url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; - buildInputs = [ goobook perl' ] - ++ lib.optional (!stdenv.isDarwin) finger_bsd - ++ lib.optional (abook != null) abook - ++ lib.optional (gnupg != null) gnupg - ++ lib.optional (goobook != null) goobook - ++ lib.optional (khard != null) khard - ++ lib.optional (mu != null) mu; + buildInputs = [ perl' ] + ++ lib.optional (!stdenv.isDarwin) bsd-finger + ++ lib.optional withAbook abook + ++ lib.optional withGnupg gnupg + ++ lib.optional withGoobook goobook + ++ lib.optional withKhard khard + ++ lib.optional withMu mu; configureFlags = [ ] - ++ lib.optional (abook != null) "--with-abook" - ++ lib.optional (gnupg != null) "--with-gpg" - ++ lib.optional (goobook != null) "--with-goobook" - ++ lib.optional (khard != null) "--with-khard" - ++ lib.optional (mu != null) "--with-mu"; + ++ lib.optional withAbook "--with-abook" + ++ lib.optional withGnupg "--with-gpg" + ++ lib.optional withGoobook "--with-goobook" + ++ lib.optional withKhard "--with-khard" + ++ lib.optional withMu "--with-mu"; - patches = [ ./add-methods-to-rc.patch + patches = [ + ./add-methods-to-rc.patch # fix undefined exec_prefix. Remove with the next release (fetchpatch { url = "https://github.com/RolandRosenfeld/lbdb/commit/60b7bae255011f59212d96adfbded459d6a27129.patch"; @@ -43,9 +54,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.spinnaker.de/lbdb/"; + description = "The Little Brother's Database"; license = licenses.gpl2; + maintainers = with maintainers; [ kaiha bfortz ]; platforms = platforms.all; - description = "The Little Brother's Database"; - maintainers = [ maintainers.kaiha maintainers.bfortz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9b81097978..17eb9106a0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27120,7 +27120,7 @@ with pkgs; caps = callPackage ../applications/audio/caps { }; - lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; + lbdb = callPackage ../tools/misc/lbdb { }; lbry = callPackage ../applications/video/lbry { }; From fefb6ba0708524832f0c9976dbf9e950a91cce2c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 14 Mar 2022 12:15:29 -0700 Subject: [PATCH 106/122] nixops_unstable: fix libvirt plugin for 8.1.0 --- .../cluster/nixops/poetry-git-overlay.nix | 10 ++--- .../networking/cluster/nixops/poetry.lock | 42 ++++++++++--------- .../networking/cluster/nixops/pyproject.toml | 5 ++- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index b5c9820bb31..27c496905e5 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops.git"; - rev = "d939c9bcae184d10583bf48211739b5b6521fc64"; - sha256 = "111wfph4c737xxs717pz8bnksp8zw0b6zv1il4zzq3fshv2ckd5c"; + rev = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3"; + sha256 = "199cw25cvjb8gxs56nc8ilq7v4560c6vgi1sh1vqrsqxayq1g4cs"; }; } ); @@ -74,9 +74,9 @@ self: super: { nixops-virtd = super.nixops-virtd.overridePythonAttrs ( _: { src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-libvirtd.git"; - rev = "1245280d97e0adc4643d02d1cf62ddd582c73e49"; - sha256 = "1z3zsx54585rcyabj6hrbwbd1c783rrlfj53np1sa3i7m93vmxzc"; + url = "https://github.com/lovesegfault/nixops-libvirtd.git"; + rev = "84d1688ee06afff136738b3eaf51f9cc3c08c350"; + sha256 = "1f3q9bwmdjr3qac7fh9b9hgw7l43hmiixbsmqm2zrnhb7xcyfmfg"; }; } ); diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index d42776a82ea..fa17d4286b3 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -8,14 +8,14 @@ python-versions = "*" [[package]] name = "apache-libcloud" -version = "3.4.1" +version = "3.5.0" description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" category = "main" optional = false -python-versions = ">=3.5, <4" +python-versions = ">=3.6, <4" [package.dependencies] -requests = ">=2.5.0" +requests = ">=2.26.0" [[package]] name = "babel" @@ -38,14 +38,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.21.11" +version = "1.21.18" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.24.11,<1.25.0" +botocore = ">=1.24.18,<1.25.0" jmespath = ">=0.7.1,<1.0.0" s3transfer = ">=0.5.0,<0.6.0" @@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.24.11" +version = "1.24.18" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -194,7 +194,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake [[package]] name = "libvirt-python" -version = "7.10.0" +version = "8.1.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -227,7 +227,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "d939c9bcae184d10583bf48211739b5b6521fc64" +resolved_reference = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3" [[package]] name = "nixops-aws" @@ -358,14 +358,14 @@ python-versions = "^3.7" develop = false [package.dependencies] -libvirt-python = "^7.0" +libvirt-python = "^8.0" nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} [package.source] type = "git" -url = "https://github.com/nix-community/nixops-libvirtd.git" -reference = "master" -resolved_reference = "1245280d97e0adc4643d02d1cf62ddd582c73e49" +url = "https://github.com/lovesegfault/nixops-libvirtd.git" +reference = "update-libvirt" +resolved_reference = "84d1688ee06afff136738b3eaf51f9cc3c08c350" [[package]] name = "nixopsvbox" @@ -677,7 +677,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "e75c6429aa8989659a345f903e2e67d87514b5864751e33890d90aa2d20ef3e2" +content-hash = "63b68a38ca6f7b9189d2403c2c6d1ec7af29cc1ccdeab2fbc970b5dbd766c3c6" [metadata.files] alabaster = [ @@ -685,8 +685,8 @@ alabaster = [ {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, ] apache-libcloud = [ - {file = "apache-libcloud-3.4.1.tar.gz", hash = "sha256:88f18da0cf3fac0af723e743fb741d9d1be251881edab7a5a0d1629955b5011b"}, - {file = "apache_libcloud-3.4.1-py2.py3-none-any.whl", hash = "sha256:af1a5b3cda7bc3220093726ff67dbb70928521e2ec19d0e33a31b1e22fde1850"}, + {file = "apache-libcloud-3.5.0.tar.gz", hash = "sha256:073f10492976faa383a22b13b82c249827cfe90a083c71620e8316e815a6db3b"}, + {file = "apache_libcloud-3.5.0-py2.py3-none-any.whl", hash = "sha256:3789f4f2464fe18e317cdd3a03eff363268e096bc47f1f5770ee82d6ffe28c40"}, ] babel = [ {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"}, @@ -697,12 +697,12 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.21.11-py3-none-any.whl", hash = "sha256:bf5f6a8997ed11a66280ace67cc25ec31c28525940da91d309c3976a9955d4cf"}, - {file = "boto3-1.21.11.tar.gz", hash = "sha256:f2cecf5d176f398a39bfde0008df83c03f2142b2be5eabe32bf104961df68810"}, + {file = "boto3-1.21.18-py3-none-any.whl", hash = "sha256:d857feb6af9932e1ee3a748060a2cd9fd6043dbbccf66976eda54586597efdc0"}, + {file = "boto3-1.21.18.tar.gz", hash = "sha256:8d6f3c548f0ee03d742f404c96515e7579fc6968135aaa50dd855a046698ff79"}, ] botocore = [ - {file = "botocore-1.24.11-py3-none-any.whl", hash = "sha256:b29c2b5906d7f70782634bb8713c77e39f23aafc994bb2f7dccbeb2b36712adc"}, - {file = "botocore-1.24.11.tar.gz", hash = "sha256:2af93de704f3122878a3233e7cf5de0b02f6c4c9fa993ca853b583f597bb1c38"}, + {file = "botocore-1.24.18-py3-none-any.whl", hash = "sha256:7ea8ef1ff7c4882ab59b337662f90ddf5ea860e95e7e209dca593a34ea585b1b"}, + {file = "botocore-1.24.18.tar.gz", hash = "sha256:d2da7ccbc5ddd61fe3cd45fcbd3de380d9e3a15bfa8fbfd2d9259a93dcc60c56"}, ] certifi = [ {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, @@ -775,6 +775,8 @@ cryptography = [ {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"}, {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, @@ -815,7 +817,7 @@ jsonpickle = [ {file = "jsonpickle-2.1.0.tar.gz", hash = "sha256:84684cfc5338a534173c8dd69809e40f2865d0be1f8a2b7af8465e5b968dcfa9"}, ] libvirt-python = [ - {file = "libvirt-python-7.10.0.tar.gz", hash = "sha256:267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975"}, + {file = "libvirt-python-8.1.0.tar.gz", hash = "sha256:a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43"}, ] markupsafe = [ {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3028252424c72b2602a323f70fbf50aa80a5d3aa616ea6add4ba21ae9cc9da4c"}, diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index 89e6e34c771..acee33da249 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -14,7 +14,10 @@ nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"} nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"} nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} -nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} +# FIXME: Once #30 lands this can be replaced +# https://github.com/nix-community/nixops-libvirtd/pull/30 +# nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} +nixops-virtd = { git = "https://github.com/lovesegfault/nixops-libvirtd.git", branch = "update-libvirt" } [tool.poetry.dev-dependencies] sphinx = "^3.1.2" From af7cb945a67bb255ca3cc4f0e1f658b1386cd4f0 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 11 Mar 2022 09:54:14 -0800 Subject: [PATCH 107/122] civetweb: use cmake prometheus-cpp 1.0.0 depends on civetweb's cmake files being available: CMake Error at pull/CMakeLists.txt:11 (find_package): Could not find a package configuration file provided by "civetweb" with any of the following names: civetwebConfig.cmake civetweb-config.cmake Add the installation prefix of "civetweb" to CMAKE_PREFIX_PATH or set "civetweb_DIR" to a directory containing one of the above files. If "civetweb" provides a separate development package or SDK, be sure it has been installed. Cmake also properly handles setting the prefix, libdir, and includedir paths, so that patch was dropped. --- ...0001-allow-setting-paths-in-makefile.patch | 33 ---------------- .../libraries/civetweb/default.nix | 39 +++++++++---------- 2 files changed, 18 insertions(+), 54 deletions(-) delete mode 100644 pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch diff --git a/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch b/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch deleted file mode 100644 index 8a14fb3a5fa..00000000000 --- a/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -u a/Makefile b/Makefile ---- a/Makefile 2020-12-27 18:48:53.934098765 +0100 -+++ b/Makefile 2020-12-27 18:50:44.022674117 +0100 -@@ -19,13 +19,13 @@ - # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html - PREFIX ?= /usr/local - EXEC_PREFIX = $(PREFIX) --BINDIR = $(EXEC_PREFIX)/bin -+BINDIR ?= $(EXEC_PREFIX)/bin - DATAROOTDIR = $(PREFIX)/share - DOCDIR = $(DATAROOTDIR)/doc/$(CPROG) - SYSCONFDIR ?= $(PREFIX)/etc - HTMLDIR = $(DOCDIR) --INCLUDEDIR = $(DESTDIR)$(PREFIX)/include --LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib -+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include -+LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib - PID_FILE ?= /var/run/$(CPROG).pid - - # build tools -@@ -337,10 +337,10 @@ - install -m 755 $(CPROG) "$(BINDIR)/" - - install-headers: -- install -m 644 $(HEADERS) "$(INCLUDEDIR)" -+ install -m 644 $(HEADERS) "$(INCLUDEDIR)/" - - install-lib: lib$(CPROG).a -- install -m 644 $< "$(LIBDIR)" -+ install -m 644 $< "$(LIBDIR)/" - - install-slib: lib$(CPROG).so - $(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g')) diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix index 93ac618bcac..bf737972612 100644 --- a/pkgs/development/libraries/civetweb/default.nix +++ b/pkgs/development/libraries/civetweb/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, cmake }: stdenv.mkDerivation rec { @@ -13,33 +15,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4="; }; - makeFlags = [ - "WITH_CPP=1" - "PREFIX=${placeholder "out"}" - "LIBDIR=${placeholder "out"}/lib" - "INCLUDEDIR=${placeholder "dev"}/include" - ]; - - patches = [ - ./0001-allow-setting-paths-in-makefile.patch - ]; + outputs = [ "out" "dev" ]; strictDeps = true; - outputs = [ "out" "dev" ]; - - installTargets = [ - "install-headers" - "install-lib" - "install-slib" - "install" + nativeBuildInputs = [ + cmake ]; - preInstall = '' - mkdir -p $dev/include - mkdir -p $out/lib + # The existence of the "build" script causes `mkdir -p build` to fail: + # mkdir: cannot create directory 'build': File exists + preConfigure = '' + rm build ''; + cmakeFlags = [ + "-DCIVETWEB_ENABLE_CXX=ON" + "-DBUILD_SHARED_LIBS=ON" + + # The civetweb unit tests rely on downloading their fork of libcheck. + "-DCIVETWEB_BUILD_TESTING=OFF" + ]; + meta = { description = "Embedded C/C++ web server"; homepage = "https://github.com/civetweb/civetweb"; From 1351b6fbffe63f5cb9ed09dc0a1111edc5839f57 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 11 Mar 2022 09:57:22 -0800 Subject: [PATCH 108/122] prometheus-cpp: 0.9.0 -> 1.0.0 I want to use the Exposer::GetListeningPorts function, but it was just released in 1.0.0. --- pkgs/development/libraries/prometheus-cpp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 173ee6d2e09..a046f255a6a 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , gbenchmark @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "prometheus-cpp"; - version = "0.9.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "jupp0r"; repo = pname; rev = "v${version}"; - sha256 = "1pjz29ywzfg3blhg2v8fn7gjvq46k3bqn7y0xvmn468ixxhv21fi"; + sha256 = "L6CXRup3kU1lY5UnwPbaOwEtCeAySNmFCPmHwsk6cRE="; }; nativeBuildInputs = [ cmake ]; From c281c1e4e96ae08052cc3de7a8448c048b3726b3 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 14 Mar 2022 12:03:07 -0700 Subject: [PATCH 109/122] proxysql: use vendored prometheus-cpp They specifically want v0.9.0 and already have it vendored. However, we continue to use the civetweb from Nixpkgs. It may be necessary at some point in the future to just allow them to use their vendored sources for this altogether, but it works fine for now. --- pkgs/servers/sql/proxysql/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index ab8f7f9a699..be1739f2b8a 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -24,7 +24,6 @@ , openssl , pcre , perl -, prometheus-cpp , python2 , re2 , zlib @@ -109,7 +108,6 @@ stdenv.mkDerivation rec { { f = "libssl"; p = openssl; } { f = "lz4"; p = lz4; } { f = "pcre"; p = pcre; } - { f = "prometheus-cpp"; p = prometheus-cpp; } { f = "re2"; p = re2; } ]} @@ -123,8 +121,9 @@ stdenv.mkDerivation rec { ln -s ${nlohmann_json.src}/single_include/nlohmann/json.hpp . popd - pushd prometheus-cpp/prometheus-cpp/3rdparty - replace_dep . "${civetweb.src}" civetweb + pushd prometheus-cpp + tar xf v0.9.0.tar.gz + replace_dep prometheus-cpp/3rdparty "${civetweb.src}" civetweb popd sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config From 438d426b89406eb1b5f20f8bc07cfd6cd40acb1c Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 14 Mar 2022 20:34:02 +0100 Subject: [PATCH 110/122] jujutsu: init at 0.3.1 (#161421) --- .../version-management/jujutsu/default.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 65 insertions(+) create mode 100644 pkgs/applications/version-management/jujutsu/default.nix diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix new file mode 100644 index 00000000000..fbf800363ab --- /dev/null +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, dbus +, sqlite +, Security +, SystemConfiguration +, libiconv +, testVersion +, jujutsu +}: + +rustPlatform.buildRustPackage rec { + pname = "jujutsu"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "martinvonz"; + repo = "jj"; + rev = "v${version}"; + sha256 = "sha256-BOT2pKcOSOha28fba62X+GgILcplhkMWhZo7Q0gGTQ8="; + }; + + cargoSha256 = "sha256-uvR+WXX2iIWFhcPYpOoOS1WBvOXuhTmgVVT2446c6XE="; + + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + dbus + sqlite + ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + libiconv + ]; + + passthru.tests = { + version = testVersion { + package = jujutsu; + command = "jj --version"; + }; + }; + + meta = with lib; { + description = "A Git-compatible DVCS that is both simple and powerful"; + homepage = "https://github.com/martinvonz/jj"; + changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38f4e67d778..071bf333e6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27619,6 +27619,11 @@ with pkgs; clerk = callPackage ../applications/audio/clerk { }; + jujutsu = callPackage ../applications/version-management/jujutsu { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin) libiconv; + }; + nbstripout = callPackage ../applications/version-management/nbstripout { python = python3; }; ncmpc = callPackage ../applications/audio/ncmpc { }; From a6fc7b289104015b99eff8f744112a86ae2e5f68 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 14 Mar 2022 12:45:04 -0700 Subject: [PATCH 111/122] evince: pass -Dmultimedia=disabled if !supportMultimedia The evince derivation has an option supportMultimedia?true, which if set to false will exclude gstreamer from the nativeBuildInputs. Unfortunately this is not enough; the build will fail with: Run-time dependency gstreamer-base-1.0 found: NO (tried pkgconfig) meson.build:236:0: ERROR: Dependency "gstreamer-base-1.0" not found, tried pkgconfig Let's pass "-Dmultimedia=disabled" to meson in this case so that the build succeeds. Checked with nixpkgs-hammer, which did not report any new warnings introduced by this commit. --- pkgs/desktops/gnome/core/evince/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 28406e41284..4e6f036f196 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -130,6 +130,8 @@ stdenv.mkDerivation rec { "-Dps=enabled" ] ++ lib.optionals (!withLibsecret) [ "-Dkeyring=disabled" + ] ++ lib.optionals (!supportMultimedia) [ + "-Dmultimedia=disabled" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; From 718c34857cbee73670e01af51dd7a05a255df1e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Mar 2022 00:47:24 +0000 Subject: [PATCH 112/122] agi: 2.2.0-dev-20220120 -> 3.1.0-dev-20220314 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 1dc47e4287a..4a0ef0e9a73 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "2.2.0-dev-20220120"; + version = "3.1.0-dev-20220314"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-0f17CAANxomtx1fvhj+mI6k4IqwIimmcTSTXZGbbWDY="; + sha256 = "sha256-j/ozkIoRM+G7fi0qBG8UGKPtrn6DR6KNK0Hc53dxsMw="; }; nativeBuildInputs = [ From 8ec9e73da6c4379b57fb5889be838c6efae1c4af Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Mon, 14 Mar 2022 23:08:33 +0100 Subject: [PATCH 113/122] coreboot-utils: limit intel-tools to x86-platforms --- pkgs/tools/misc/coreboot-utils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 36e82903a7e..783af7fda71 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -53,6 +53,7 @@ let pname = "intelmetool"; meta.description = "Dump interesting things about Management Engine"; buildInputs = [ pciutils zlib ]; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; }; cbfstool = generic { pname = "cbfstool"; @@ -77,6 +78,7 @@ let pname = "inteltool"; meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)"; buildInputs = [ pciutils zlib ]; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; }; amdfwtool = generic { pname = "amdfwtool"; From 4b1fe3c976feda6ff0b361ec7b68896bd52b62a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Mar 2022 04:31:17 +0000 Subject: [PATCH 114/122] python310Packages.py3status: 3.41 -> 3.42 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index a5de75f70f8..c56fc990f2c 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.41"; + version = "3.42"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2G+5lKkLtgZ/2ghU0xVTDqIXbTNykYIKRiwZiagusoc="; + sha256 = "sha256-2/YT36X4UvmmhiaxyJBtCKA3QuibYtReTS6MQ3YGV+c="; }; doCheck = false; From 9fe7f4ba4dc16a4a19384cf80d98d4760a68aa24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Mar 2022 01:40:51 +0000 Subject: [PATCH 115/122] python310Packages.pytest-cases: 3.6.9 -> 3.6.10 --- pkgs/development/python-modules/pytest-cases/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 766e0754387..5d4d8d1798f 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.9"; + version = "3.6.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bf9favhlHcGj8nf1JxTkMjpo8hMyfBHgMCilOcIL2Sk="; + sha256 = "sha256-W8Syxgl/lPqDX2zdzvpk3Q/0aNBWM8JeUOXGDBYyamM="; }; nativeBuildInputs = [ From a507a6acc1e7919607d16528a23db6c321bc1af6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Mar 2022 05:07:10 +0000 Subject: [PATCH 116/122] deep-translator: 1.8.0 -> 1.8.1 --- pkgs/development/python-modules/deep-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index fd6d4d478f4..a4f71774c4d 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2u4ZmLUEOwbN2sbPgLu9R1VdNevXBP4lBFuGw2aiRMg="; + sha256 = "sha256-Oi5dzrC19PnlExCOgu+bT5n3/XwgJkDirzl8ra8w7Nw="; }; propagatedBuildInputs = [ From be872a7453a176df625c12190b8a6c10f6b21647 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 05:42:50 +0000 Subject: [PATCH 117/122] python310Packages.pyramid_exclog: 1.0 -> 1.1 --- pkgs/development/python-modules/pyramid_exclog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 96570fce884..2d23256ff84 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyramid_exclog"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "d05ced5c12407507154de6750036bc83861b85c11be70b3ec3098c929652c14b"; + sha256 = "sha256-Tl2rYH/GifNfB9w4nG9UIqAQz0O6kujCED/4iZnPKDw="; }; propagatedBuildInputs = [ pyramid ]; From 0326d67a58f58ddf6756f3df673bba5d2c9870da Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 21 Feb 2022 16:08:10 -0800 Subject: [PATCH 118/122] nixos/nvidia: add vaapi support --- nixos/modules/hardware/video/nvidia.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index c0ba60e49a7..a81220a92a1 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -285,8 +285,12 @@ in hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out; hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32; - hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out; - hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32; + hardware.opengl.extraPackages = [ + pkgs.nvidia-vaapi-driver + ] ++ optional offloadCfg.enable nvidia_x11.out; + hardware.opengl.extraPackages32 = [ + pkgs.pkgsi686Linux.nvidia-vaapi-driver + ] ++ optional offloadCfg.enable nvidia_x11.lib32; environment.systemPackages = [ nvidia_x11.bin ] ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ] From 54d6aee8f3754266a4ff6723268c068269ff7965 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Mar 2022 10:22:08 -0800 Subject: [PATCH 119/122] nixos/doc/rl-22.05: mention nvidia va-api additions --- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 11 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index d3a944533ab..6a122544a7c 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1290,6 +1290,15 @@ pkgs.theLoungePlugins.themes. + + + The option + services.xserver.videoDriver = [ "nvidia" ]; + will now also install + nvidia + VA-API drivers by default. + + The firmwareLinuxNonfree package has been diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index fe30cbc3cf5..ddfc9702c97 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -477,6 +477,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`. +- The option `services.xserver.videoDriver = [ "nvidia" ];` will now also install [nvidia VA-API drivers](https://github.com/elFarto/nvidia-vaapi-driver) by default. + - The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`. - It is now possible to specify wordlists to include as handy to access environment variables using the `config.environment.wordlist` configuration options. From 33e7aae62fa6374fdbccd87173f315f3a93c1144 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Mar 2022 05:28:51 +0000 Subject: [PATCH 120/122] python310Packages.plaid-python: 9.1.0 -> 9.1.1 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 83c697aa7c8..d36ba25ba47 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.1.0"; + version = "9.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-jvg/2dL+W4N7rbbBcIUZUrSt0BCV15k4QgYST2lEA5U="; + hash = "sha256-vHJ35MvMw3G1k/A2gifaE97GayoVEOQ9lR6yG6ZkzS4="; }; propagatedBuildInputs = [ From b95cbc904d2931ada767b2cd3a950a195001ac2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Mar 2022 06:07:26 +0000 Subject: [PATCH 121/122] python310Packages.sabyenc3: 5.1.0 -> 5.1.1 --- pkgs/development/python-modules/sabyenc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index 2e44326acc4..d2dbb2e4058 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "sabyenc3"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-y2I/kSyPIPSz7PrwW/AbP4BsEXHWQgXRb1VT0nTHQcE="; + hash = "sha256-muqJCn5FcSp5KNZqfW433NCOxfj1DvFvlZPClmNkPR0="; }; # Tests are not included in pypi distribution From aa6313a23d749f0d73f91af35a2fe15e74501451 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 9 Mar 2022 21:16:59 +0100 Subject: [PATCH 122/122] =?UTF-8?q?ocamlPackages.ppx=5Ftools:=206.4=20?= =?UTF-8?q?=E2=86=92=206.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ppx_tools/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 59b7c29730a..9ec1c24dbe3 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: let param = - let v6_4 = { - version = "6.4"; - sha256 = "15v7yfv6gyp8lzlgwi9garz10wpg34dk4072jdv19n6v20zfg7n1"; + let v6_5 = { + version = "6.5"; + sha256 = "sha256:0fwibah2hgllrnbdrmfqil5gr5raf6pb5h2zx6zs1h3d4ykvy8k8"; useDune2 = true; nativeBuildInputs = [cppo]; buildInputs = [cppo]; @@ -28,12 +28,13 @@ let param = "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; - "4.08" = v6_4; - "4.09" = v6_4; - "4.10" = v6_4; - "4.11" = v6_4; - "4.12" = v6_4; - "4.13" = v6_4; + "4.08" = v6_5; + "4.09" = v6_5; + "4.10" = v6_5; + "4.11" = v6_5; + "4.12" = v6_5; + "4.13" = v6_5; + "4.14" = v6_5; }.${ocaml.meta.branch}; in