From 5106a2f74fd0fcf8f0ed6b4d9fef2eb0a2281f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 3 Oct 2021 20:08:18 +0200 Subject: [PATCH 001/382] javaPackages.mavenfod: init --- pkgs/development/java-modules/maven-fod.nix | 55 +++++++++++++++++++++ pkgs/top-level/java-packages.nix | 4 +- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/java-modules/maven-fod.nix diff --git a/pkgs/development/java-modules/maven-fod.nix b/pkgs/development/java-modules/maven-fod.nix new file mode 100644 index 00000000000..3e0d460ee48 --- /dev/null +++ b/pkgs/development/java-modules/maven-fod.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, maven +}: + +{ src +, patches ? [] +, pname +, version +, mvnSha256 ? "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" +, mvnHash ? "sha256-${mvnSha256}" +, mvnFetchExtraArgs ? {} +, ... +} @args: + +# originally extracted from dbeaver +# created to allow using maven packages in the same style as rust + +stdenv.mkDerivation (rec { + fetchedMavenDeps = stdenv.mkDerivation ({ + name = "${pname}-${version}-maven-deps"; + inherit src; + + buildInputs = [ + maven + ]; + + buildPhase = '' + mvn package -Dmaven.repo.local=$out/.m2 -P desktop,all-platforms + ''; + + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + installPhase = '' + find $out -type f \ + -name \*.lastUpdated -or \ + -name resolver-status.properties -or \ + -name _remote.repositories \ + -delete + ''; + + # don't do any fixup + dontFixup = true; + outputHashMode = "recursive"; + outputHash = mvnHash; + } // mvnFetchExtraArgs); + + buildPhase = '' + runHook preBuild + + mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd) + mvn package --offline "-Dmaven.repo.local=$mvnDeps/.m2" -P desktop,all-platforms + + runHook postBuild + ''; +} // args) diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index cf6474f0da5..6f0f802f38e 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -9,8 +9,10 @@ let openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; + mavenfod = callPackage ../development/java-modules/maven-fod.nix { }; + in { - inherit mavenbuild fetchMaven openjfx11 openjfx15; + inherit mavenbuild mavenfod fetchMaven openjfx11 openjfx15; compiler = let From a61cf20944911e20b91fa69b84749e52e72eefd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 3 Oct 2021 20:08:33 +0200 Subject: [PATCH 002/382] dbeaver: use javaPackages.mavenfod --- pkgs/applications/misc/dbeaver/default.nix | 37 ++-------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 156cc7188dc..a53ed73532a 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -16,9 +16,10 @@ , maven , webkitgtk , glib-networking +, javaPackages }: -stdenv.mkDerivation rec { +javaPackages.mavenfod rec { pname = "dbeaver"; version = "21.3.0"; # When updating also update fetchedMavenDeps.sha256 @@ -29,31 +30,7 @@ stdenv.mkDerivation rec { sha256 = "iKxnuMm5hpreP706N+XxaBrDVVwVFRWKNmiCyXkOUCQ="; }; - fetchedMavenDeps = stdenv.mkDerivation { - name = "dbeaver-${version}-maven-deps"; - inherit src; - - buildInputs = [ - maven - ]; - - buildPhase = "mvn package -Dmaven.repo.local=$out/.m2 -P desktop,all-platforms"; - - # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = '' - find $out -type f \ - -name \*.lastUpdated -or \ - -name resolver-status.properties -or \ - -name _remote.repositories \ - -delete - ''; - - # don't do any fixup - dontFixup = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210="; - }; + mvnSha256 = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210="; nativeBuildInputs = [ copyDesktopItems @@ -88,14 +65,6 @@ stdenv.mkDerivation rec { }) ]; - buildPhase = '' - runHook preBuild - - mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 -P desktop,all-platforms - - runHook postBuild - ''; - installPhase = let productTargetPath = "product/community/target/products/org.jkiss.dbeaver.core.product"; From d8110b0e75cd576adb82f4eb4946ddb8f90c578f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 3 Oct 2021 20:08:59 +0200 Subject: [PATCH 003/382] keycloak: add keycloak.plugins --- pkgs/servers/keycloak/all-plugins.nix | 4 ++++ pkgs/servers/keycloak/default.nix | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/keycloak/all-plugins.nix diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/servers/keycloak/all-plugins.nix new file mode 100644 index 00000000000..4a3fcd1cded --- /dev/null +++ b/pkgs/servers/keycloak/all-plugins.nix @@ -0,0 +1,4 @@ +{ callPackage }: + +{ +} diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index cd8373f0842..6bd2d3afd28 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchzip, makeWrapper, jre, writeText, nixosTests , postgresql_jdbc ? null, mysql_jdbc ? null +, callPackage }: let @@ -55,7 +56,10 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre} ''; - passthru.tests = nixosTests.keycloak; + passthru = { + tests = nixosTests.keycloak; + plugins = callPackage ./all-plugins.nix {}; + }; meta = with lib; { homepage = "https://www.keycloak.org/"; From 74801dd0ea01ba714071cc80922a379c0019262b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 3 Oct 2021 20:09:19 +0200 Subject: [PATCH 004/382] keycloak.plugins.scim-for-keycloak: init at kc-15-b2 --- pkgs/servers/keycloak/all-plugins.nix | 1 + .../keycloak/scim-for-keycloak/default.nix | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/keycloak/scim-for-keycloak/default.nix diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/servers/keycloak/all-plugins.nix index 4a3fcd1cded..e821becc872 100644 --- a/pkgs/servers/keycloak/all-plugins.nix +++ b/pkgs/servers/keycloak/all-plugins.nix @@ -1,4 +1,5 @@ { callPackage }: { + scim-for-keycloak = callPackage ./scim-for-keycloak {}; } diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/servers/keycloak/scim-for-keycloak/default.nix new file mode 100644 index 00000000000..b2fa2accdec --- /dev/null +++ b/pkgs/servers/keycloak/scim-for-keycloak/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, maven +, javaPackages +}: + +javaPackages.mavenfod rec { + pname = "scim-for-keycloak"; + version = "kc-15-b2"; # When updating also update mvnHash + + src = fetchFromGitHub { + owner = "Captain-P-Goldfish"; + repo = "scim-for-keycloak"; + rev = version; + sha256 = "K34c7xISjEETI3jFkRLdZ0C8pZHTWtPtrrIzwC76Tv0="; + }; + + mvnHash = "sha256-L1i9Fn9l6Xun6usvqiDLtMkMscQMEcqgaWXV3OUKrwQ="; + + nativeBuildInputs = [ + maven + ]; + + installPhase = '' + EAR=$(find -iname "*.ear") + install -D "$EAR" "$out/$(basename $EAR)" + ''; + + meta = with lib; { + homepage = "https://github.com/Captain-P-Goldfish/scim-for-keycloak"; + description = "A third party module that extends Keycloak with SCIM functionality"; + license = licenses.bsd3; + maintainers = with maintainers; [ mkg20001 ]; + }; +} From 891f2053a019c5fa834988e59c9639b4b47545c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 3 Oct 2021 20:26:29 +0200 Subject: [PATCH 005/382] nixos/keycloak: add plugins option Co-authored-by: Kim Lindberger --- nixos/modules/services/web-apps/keycloak.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index df8c7114102..699c88bc239 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -216,6 +216,14 @@ in ''; }; + plugins = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = []; + description = '' + Keycloak plugin jar, ear files or derivations with them + ''; + }; + initialAdminPassword = lib.mkOption { type = lib.types.str; default = "changeme"; @@ -675,8 +683,18 @@ in umask u=rwx,g=,o= + install_plugin() { + if [ -d "$1" ]; then + find "$1" -type f \( -iname \*.ear -o -iname \*.jar \) -exec install -m 0500 -o keycloak -g keycloak "{}" "/run/keycloak/deployments/" \; + else + install -m 0500 -o keycloak -g keycloak "$1" "/run/keycloak/deployments/" + fi + } + install -T -m 0400 -o keycloak -g keycloak '${cfg.database.passwordFile}' /run/keycloak/secrets/db_password - '' + lib.optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) '' + '' + lib.optionalString (cfg.plugins != []) (lib.concatStringsSep "\n" (map (pl: "install_plugin ${lib.escapeShellArg pl}") cfg.plugins)) + + lib.optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) '' + install -T -m 0400 -o keycloak -g keycloak '${cfg.sslCertificate}' /run/keycloak/secrets/ssl_cert install -T -m 0400 -o keycloak -g keycloak '${cfg.sslCertificateKey}' /run/keycloak/secrets/ssl_key ''; From 985afdbb33cf546191307a2df7191ef9f470baf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 3 Oct 2021 20:43:01 +0200 Subject: [PATCH 006/382] keycloak.plugins.keycloak-discord: init at 0.3.1 --- pkgs/servers/keycloak/all-plugins.nix | 1 + .../keycloak/keycloak-discord/default.nix | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/keycloak/keycloak-discord/default.nix diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/servers/keycloak/all-plugins.nix index e821becc872..84de940d077 100644 --- a/pkgs/servers/keycloak/all-plugins.nix +++ b/pkgs/servers/keycloak/all-plugins.nix @@ -2,4 +2,5 @@ { scim-for-keycloak = callPackage ./scim-for-keycloak {}; + keycloak-discord = callPackage ./keycloak-discord {}; } diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/servers/keycloak/keycloak-discord/default.nix new file mode 100644 index 00000000000..710e66eb747 --- /dev/null +++ b/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, lib +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "keycloak-discord"; + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-ear-${version}.ear"; + sha256 = "0fswhbnxc80dpfqf5y6j29dxk3vcnm4kki6qdk22qliasvpw5n9c"; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + install "$src" "$out/${pname}-ear-${version}.ear" + ''; + + meta = with lib; { + homepage = "https://github.com/wadahiro/keycloak-discord"; + description = "Keycloak Social Login extension for Discord"; + license = licenses.apsl20; + maintainers = with maintainers; [ mkg20001 ]; + }; +} From bd33583c88f0859768dbf84186128ffc597864f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 3 Oct 2021 20:43:29 +0200 Subject: [PATCH 007/382] nixosTests.keycloak: add discord plugin to test --- nixos/tests/keycloak.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 1be3fed6acc..e86faa0c9a7 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -16,8 +16,7 @@ let }; nodes = { - keycloak = { ... }: { - + keycloak = { config, ... }: { security.pki.certificateFiles = [ certs.ca.cert ]; @@ -36,6 +35,9 @@ let username = "bogus"; passwordFile = pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH"; }; + plugins = with config.services.keycloak.package.plugins; [ + keycloak-discord + ]; }; environment.systemPackages = with pkgs; [ From 8e317c16309c7fe6f30213e705f3cecdbd2275eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 13 Dec 2021 17:55:07 +0100 Subject: [PATCH 008/382] javaPackages.mavenfod: make maven parameters configurable --- pkgs/applications/misc/dbeaver/default.nix | 1 + pkgs/development/java-modules/maven-fod.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index a53ed73532a..1a1a6753b06 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -31,6 +31,7 @@ javaPackages.mavenfod rec { }; mvnSha256 = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210="; + mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/development/java-modules/maven-fod.nix b/pkgs/development/java-modules/maven-fod.nix index 3e0d460ee48..24ce572af57 100644 --- a/pkgs/development/java-modules/maven-fod.nix +++ b/pkgs/development/java-modules/maven-fod.nix @@ -10,6 +10,7 @@ , mvnSha256 ? "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" , mvnHash ? "sha256-${mvnSha256}" , mvnFetchExtraArgs ? {} +, mvnParameters ? "" , ... } @args: @@ -26,7 +27,7 @@ stdenv.mkDerivation (rec { ]; buildPhase = '' - mvn package -Dmaven.repo.local=$out/.m2 -P desktop,all-platforms + mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters} ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside From b2e2e7c6363988bfee822ab0ff4f1ca76a8962fc Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 23 Feb 2022 17:01:14 +0100 Subject: [PATCH 009/382] synaesthesia: init at 2.4 --- .../audio/synaesthesia/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/synaesthesia/default.nix diff --git a/pkgs/applications/audio/synaesthesia/default.nix b/pkgs/applications/audio/synaesthesia/default.nix new file mode 100644 index 00000000000..efdd6f7e73a --- /dev/null +++ b/pkgs/applications/audio/synaesthesia/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, lib +, fetchzip +, SDL +, pkg-config +, libSM +}: +stdenv.mkDerivation rec { + pname = "synaesthesia"; + version = "2.4"; + + src = fetchzip { + url = "https://logarithmic.net/pfh-files/synaesthesia/synaesthesia-${version}.tar.gz"; + sha256 = "0nzsdxbah0shm2vlziaaw3ilzlizd3d35rridkpg40nfxmq84qnx"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + SDL + libSM + ]; + + meta = { + homepage = "https://logarithmic.net/pfh/synaesthesia"; + description = "Program for representing sounds visually"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.infinisil ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e30157ec978..619e2acb9a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10140,6 +10140,8 @@ with pkgs; symengine = callPackage ../development/libraries/symengine { }; + synaesthesia = callPackage ../applications/audio/synaesthesia { }; + sysbench = callPackage ../development/tools/misc/sysbench {}; system-config-printer = callPackage ../tools/misc/system-config-printer { From e2566775c76ae2e98617941c2555b439bc15de6d Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Sun, 27 Feb 2022 16:55:03 +0100 Subject: [PATCH 010/382] micro: add test with expect --- pkgs/applications/editors/micro/default.nix | 4 ++- .../editors/micro/test-with-expect.nix | 30 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/editors/micro/test-with-expect.nix diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index c3c42ac24cb..d9805cbb36a 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, callPackage }: buildGoModule rec { pname = "micro"; @@ -24,6 +24,8 @@ buildGoModule rec { install -Dt $out/share/applications assets/packaging/micro.desktop ''; + passthru.tests.expect = callPackage ./test-with-expect.nix {}; + meta = with lib; { homepage = "https://micro-editor.github.io"; description = "Modern and intuitive terminal-based text editor"; diff --git a/pkgs/applications/editors/micro/test-with-expect.nix b/pkgs/applications/editors/micro/test-with-expect.nix new file mode 100644 index 00000000000..d3e1d60e087 --- /dev/null +++ b/pkgs/applications/editors/micro/test-with-expect.nix @@ -0,0 +1,30 @@ +{ micro, expect, runCommand, writeScript, runtimeShell }: + +let expect-script = writeScript "expect-script" '' + #!${expect}/bin/expect -f + + spawn micro file.txt + expect "file.txt" + + send "Hello world!" + expect "Hello world!" + + # Send ctrl-q (exit) + send "\021" + + expect "Save changes to file.txt before closing?" + send "y" + + expect eof +''; in +runCommand "micro-test-expect" +{ + nativeBuildInputs = [ micro expect ]; + passthru = { inherit expect-script; }; +} '' + # Micro really wants a writable $HOME for its config directory. + export HOME=$(pwd) + expect -f ${expect-script} + grep "Hello world!" file.txt + touch $out +'' From 6ebf051cc036b0b864e43e532bf434895a7dae38 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 2 Mar 2022 19:02:11 +0200 Subject: [PATCH 011/382] maintainers/scripts/remove-old-aliases.py: ignore lines which have 'preserve, reason:' in them --- maintainers/scripts/remove-old-aliases.py | 2 +- pkgs/top-level/aliases.nix | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py index 5d9398feaa2..8ed326cbc20 100755 --- a/maintainers/scripts/remove-old-aliases.py +++ b/maintainers/scripts/remove-old-aliases.py @@ -57,7 +57,7 @@ def get_date_lists( except ValueError: continue - if my_date is None or my_date > cutoffdate: + if my_date is None or my_date > cutoffdate or "preserve, reason:" in line.lower(): continue if "=" not in line: diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1972123bd98..5e2aa716f6a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -38,9 +38,14 @@ in # A script to convert old aliases to throws and remove old # throws can be found in './maintainers/scripts/remove-old-aliases.py'. +# Add 'preserve, reason: reason why' after the date if the alias should not be removed. +# Try to keep them to a minimum. +# valid examples of what to preserve: +# distro aliases such as: +# debian-package-name -> nixos-package-name + mapAliases ({ - # forceSystem should not be used directly in Nixpkgs. - # Added 2018-07-16 + # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs. forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); From 662414d8a838f5aa8eb3c71b7f94b0b64f6cc373 Mon Sep 17 00:00:00 2001 From: Marcos Benevides Date: Mon, 14 Mar 2022 22:36:54 -0300 Subject: [PATCH 012/382] insomnia: 2021.7.2 -> 2022.1.1 --- pkgs/development/web/insomnia/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 2abdabc2331..ae6200df5ef 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -2,7 +2,7 @@ , fontconfig, freetype, gdk-pixbuf, glib, pango, mesa, nspr, nss, gtk3 , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, nghttp2 , libudev0-shim, glibc, curl, openssl, autoPatchelfHook }: let @@ -15,12 +15,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.7.2"; + version = "2022.1.1"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-HkQWW4h2+XT5Xi4oiIiMPnrRKw+GIyjGMQ5B1NrBARU="; + sha256 = "sha256-AaRiXGdKCzcsY4GEgLr5PO+f7STsR+p7ybGISdJlCVk="; }; nativeBuildInputs = @@ -53,6 +53,7 @@ in stdenv.mkDerivation rec { libXrender libXtst libxcb + libxshmfence mesa # for libgbm nspr nss From fccbe209cb2cc4cc893f3fd30f759be411986d21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 19:20:19 +0000 Subject: [PATCH 013/382] stellarsolver: 2.0 -> 2.2 --- .../libraries/science/astronomy/stellarsolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index 933b972a4e7..754f408ca26 100644 --- a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "2.0"; + version = "2.2"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-pqTSsey1CgOHiEm/C+7sTl9uGe3RVpL7Rdm04KgY+Z8="; + sha256 = "sha256-Ay7bszR4D5KKFiVLXfweJcc8jgUSZljnZVblEx7xh8o="; }; nativeBuildInputs = [ cmake ]; From 73449ea799ec13e91349a4a4dae758e03e6c51aa Mon Sep 17 00:00:00 2001 From: tilcreator Date: Thu, 17 Mar 2022 17:50:49 +0100 Subject: [PATCH 014/382] inav-configurator: 3.0.2 -> 4.1.0 --- .../science/robotics/inav-configurator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/applications/science/robotics/inav-configurator/default.nix index 40914a8ac1a..ec605a3a97e 100644 --- a/pkgs/applications/science/robotics/inav-configurator/default.nix +++ b/pkgs/applications/science/robotics/inav-configurator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inav-configurator"; - version = "3.0.2"; + version = "4.1.0"; src = fetchurl { url = "https://github.com/iNavFlight/inav-configurator/releases/download/${version}/INAV-Configurator_linux64_${version}.tar.gz"; - sha256 = "0v6dcg634wpp9q4ya3mj00j3pg25g62aq209iq2dsvj0a03afbp2"; + sha256 = "sha256-+rPzytnAQcNGbISFBHb4JS9Nqy0C2i36k+EPBvq/mso="; }; icon = fetchurl { From 96698efe0cd9e0ffe38d95e043acafa926fa5e0d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 18 Mar 2022 00:32:53 +0100 Subject: [PATCH 015/382] lib/modules: Finally remove deprecated types.optionSet types.optionSet has been deprecated for almost 10 years now (0e333688cea468a28516bf6935648c03ed62a7bb)! A removal was already attempted in 2019 (27982b408e465554b8831f492362bc87ed0ec02a), but it was promptly reinstantiated since some third-party uses were discovered (f531ce75e4178c6867cc1d0f7fec96b2d5c3f1cb). It's finally time to remove it for good :) --- .../reviewing-contributions.chapter.md | 4 +-- lib/modules.nix | 34 ++++--------------- lib/options.nix | 2 -- lib/types.nix | 8 ----- 4 files changed, 8 insertions(+), 40 deletions(-) diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index 0a90781d0c5..b78fda6c288 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -122,7 +122,7 @@ Reviewing process: - [CODEOWNERS](https://help.github.com/articles/about-codeowners/) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers. - Ensure that the module tests, if any, are succeeding. - Ensure that the introduced options are correct. - - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated). + - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated). - Description, default and example should be provided. - Ensure that option changes are backward compatible. - `mkRenamedOptionModule` and `mkAliasOptionModule` functions provide way to make option changes backward compatible. @@ -157,7 +157,7 @@ Reviewing process: - Ensure that the module tests, if any, are succeeding. - Ensure that the introduced options are correct. - - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated). + - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated). - Description, default and example should be provided. - Ensure that module `meta` field is present - Maintainers should be declared in `meta.maintainers`. diff --git a/lib/modules.nix b/lib/modules.nix index 01ba914ca80..735cb3c967a 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -609,17 +609,9 @@ rec { throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}." else let - /* Add the modules of the current option to the list of modules - already collected. The options attribute except either a list of - submodules or a submodule. For each submodule, we add the file of the - current option declaration as the file use for the submodule. If the - submodule defines any filename, then we ignore the enclosing option file. */ - options' = toList opt.options.options; - getSubModules = opt.options.type.getSubModules or null; submodules = if getSubModules != null then map (setDefaultModuleLocation opt._file) getSubModules ++ res.options - else if opt.options ? options then map (coerceOption opt._file) options' ++ res.options else res.options; in opt.options // res // { declarations = res.declarations ++ [opt._file]; @@ -802,27 +794,13 @@ rec { compare = a: b: (a.priority or 1000) < (b.priority or 1000); in sort compare defs'; + # This calls substSubModules, whose entire purpose is only to ensure that + # option declarations in submodules have accurate position information. + # TODO: Merge this into mergeOptionDecls fixupOptionType = loc: opt: - let - options = opt.options or - (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); - - # Hack for backward compatibility: convert options of type - # optionSet to options of type submodule. FIXME: remove - # eventually. - f = tp: - if tp.name == "option set" || tp.name == "submodule" then - throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." - else if (tp.functor.wrapped.name or null) == "optionSet" then - if tp.name == "attrsOf" then types.attrsOf (types.submodule options) - else if tp.name == "listOf" then types.listOf (types.submodule options) - else if tp.name == "nullOr" then types.nullOr (types.submodule options) - else tp - else tp; - in - if opt.type.getSubModules or null == null - then opt // { type = f (opt.type or types.unspecified); } - else opt // { type = opt.type.substSubModules opt.options; options = []; }; + if opt.type.getSubModules or null == null + then opt // { type = opt.type or types.unspecified; } + else opt // { type = opt.type.substSubModules opt.options; options = []; }; /* Properties. */ diff --git a/lib/options.nix b/lib/options.nix index 9efc1249e58..8d0801775c4 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -79,8 +79,6 @@ rec { visible ? null, # Whether the option can be set only once readOnly ? null, - # Deprecated, used by types.optionSet. - options ? null } @ attrs: attrs // { _type = "option"; }; diff --git a/lib/types.nix b/lib/types.nix index 00d97bf5723..5c4b9631061 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -749,14 +749,6 @@ rec { nestedTypes.finalType = finalType; }; - # Obsolete alternative to configOf. It takes its option - # declarations from the ‘options’ attribute of containing option - # declaration. - optionSet = mkOptionType { - name = "optionSet"; - description = "option set"; - deprecationMessage = "Use `types.submodule' instead"; - }; # Augment the given type with an additional type check function. addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; }; From 7b32b8b66f80c10e7d509d62051dfd64470b3ebb Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 18 Mar 2022 21:23:40 +0100 Subject: [PATCH 016/382] Remove ancient mkOption tests These are completely non-functional by now --- pkgs/test/mkOption/declare.nix | 53 ------------------------------- pkgs/test/mkOption/keep.nix | 11 ------- pkgs/test/mkOption/keep.ref | 57 ---------------------------------- pkgs/test/mkOption/merge.nix | 15 --------- pkgs/test/mkOption/merge.ref | 20 ------------ pkgs/test/mkOption/test.sh | 9 ------ 6 files changed, 165 deletions(-) delete mode 100644 pkgs/test/mkOption/declare.nix delete mode 100644 pkgs/test/mkOption/keep.nix delete mode 100644 pkgs/test/mkOption/keep.ref delete mode 100644 pkgs/test/mkOption/merge.nix delete mode 100644 pkgs/test/mkOption/merge.ref delete mode 100755 pkgs/test/mkOption/test.sh diff --git a/pkgs/test/mkOption/declare.nix b/pkgs/test/mkOption/declare.nix deleted file mode 100644 index 9e89a1c096d..00000000000 --- a/pkgs/test/mkOption/declare.nix +++ /dev/null @@ -1,53 +0,0 @@ -# sets of small configurations: -# Each configuration -rec { - # has 2 arguments pkgs and this. - configA = pkgs: this: { - # Can depends on other configuration - require = configB; - - # Defines new options - optionA = pkgs.lib.mkOption { - # With default values - default = false; - # And merging functions. - merge = pkgs.lib.mergeEnableOption; - }; - - # Add a new definition to other options. - optionB = this.optionA; - }; - - # Can be used for option header. - configB = pkgs: this: { - # Can depends on more than one configuration. - require = [ configC configD ]; - - optionB = pkgs.lib.mkOption { - default = false; - }; - - # Is not obliged to define other options. - }; - - configC = pkgs: this: { - require = [ configA ]; - - optionC = pkgs.lib.mkOption { - default = false; - }; - - # Use the default value if it is not overwritten. - optionA = this.optionC; - }; - - # Can also be used as option configuration only. - # without any arguments (backward compatibility) - configD = { - # Is not forced to specify the require attribute. - - # Is not force to make new options. - optionA = true; - optionD = false; - }; -} diff --git a/pkgs/test/mkOption/keep.nix b/pkgs/test/mkOption/keep.nix deleted file mode 100644 index 26fb8c28dd5..00000000000 --- a/pkgs/test/mkOption/keep.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - pkgs = import ../../.. {}; - config = import ./declare.nix; -in - with (pkgs.lib); - - finalReferenceOptionSets - filterOptionSets - pkgs - # List of main configurations. - [ config.configB config.configC ] diff --git a/pkgs/test/mkOption/keep.ref b/pkgs/test/mkOption/keep.ref deleted file mode 100644 index a3a051eb48c..00000000000 --- a/pkgs/test/mkOption/keep.ref +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/test/mkOption/merge.nix b/pkgs/test/mkOption/merge.nix deleted file mode 100644 index bbf68218aa0..00000000000 --- a/pkgs/test/mkOption/merge.nix +++ /dev/null @@ -1,15 +0,0 @@ -let - pkgs = import ../../.. {}; - config = import ./declare.nix; - - # Define the handler of unbound options. - noOption = name: values: - builtins.trace "Attribute named '${name}' does not match any option declaration." values; -in - with (pkgs.lib); - - finalReferenceOptionSets - (mergeOptionSets noOption) - pkgs - # List of main configurations. - [ config.configB config.configC ] diff --git a/pkgs/test/mkOption/merge.ref b/pkgs/test/mkOption/merge.ref deleted file mode 100644 index 6956f65dbbc..00000000000 --- a/pkgs/test/mkOption/merge.ref +++ /dev/null @@ -1,20 +0,0 @@ -trace: Str("Attribute named 'optionD' does not match any option declaration.",[]) - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/test/mkOption/test.sh b/pkgs/test/mkOption/test.sh deleted file mode 100755 index 5478846d563..00000000000 --- a/pkgs/test/mkOption/test.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh -e - -echo 1>&2 "Test: Merge of option bindings." -nix-instantiate merge.nix --eval-only --strict --xml >& merge.out -diff merge.ref merge.out - -echo 1>&2 "Test: Filter of option declarations." -nix-instantiate keep.nix --eval-only --strict --xml >& keep.out -diff keep.ref keep.out From fb71b0acab701c547a66541962a17167596f46b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Mar 2022 06:36:40 +0000 Subject: [PATCH 017/382] autorestic: 1.5.7 -> 1.5.8 --- pkgs/tools/backup/autorestic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index b1d863c1cf1..d7b6af03164 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o3SO3y26ur16D20rTYtzfyZWNDbeOzvj/BpMykvG698="; + sha256 = "sha256-0eq2u3DCNgfxsiE4lycf+xGIoEC3sZgEMha9+40j+9s="; }; vendorSha256 = "sha256-qYXdRpQT7x+Y5h8PuKGjsANXLqjNlsPKO76GQhnufTU="; From 76cfedbe2800a5e86a3dc60f55fb762671043a94 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 19 Mar 2022 17:17:52 +0000 Subject: [PATCH 018/382] linux: 5.10.106 -> 5.10.107 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index dec0ebb154a..00613f51606 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.106"; + version = "5.10.107"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6"; + sha256 = "1snzzhkzdjlj92gqig3sanxlhv0xc0xk2xwjdjr0yds6g43w6ry4"; }; } // (args.argsOverride or {})) From 32f1dca656e0485f960d9c1a3ce27f2feffd644c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 19 Mar 2022 17:17:58 +0000 Subject: [PATCH 019/382] linux: 5.15.29 -> 5.15.30 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 7b76ab0c8a5..0cfb2c91df0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.29"; + version = "5.15.30"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0vl7xm4xs59z071wfjna392yada3hg5h6h3dfjaswircc22fc1ar"; + sha256 = "0ckiz985x88x68psg6wazyk7zpv34k8rbzpzyzj0gaph13za4ki5"; }; } // (args.argsOverride or { })) From e5f91ad13411b39100e46f709a5a5c3e3d5de60f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 19 Mar 2022 17:18:05 +0000 Subject: [PATCH 020/382] linux: 5.16.15 -> 5.16.16 --- pkgs/os-specific/linux/kernel/linux-5.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index 1fadc0d420e..63dc8d0463a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.15"; + version = "5.16.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1mi41npkk1inqchm3yp14xmzc5lrp50d7vbpazwxwq5kw04c8c4g"; + sha256 = "13qk6cjnjwgnxj25mphyv08pjf1sqz7bxxrr3fpl8gz3aghdd9yc"; }; } // (args.argsOverride or { })) From 7c8a33bbcf533b797f223a5f557b65357a802b0d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 19 Mar 2022 17:18:10 +0000 Subject: [PATCH 021/382] linux: 5.4.185 -> 5.4.186 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index c234b4f898c..b8958558588 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.185"; + version = "5.4.186"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "11rp3x05bq9cs9gwy4x36ynkgl7nb5ss29zi6m7n5ywvczdfjpyi"; + sha256 = "1f9rigm58miq5s98bx7pvylqi9hlzlfnq1nrj4cd8f4arcjcvxv1"; }; } // (args.argsOverride or {})) From 2d1b42d21680f392cd85146fb82f4e6b1b113139 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 19 Mar 2022 17:18:44 +0000 Subject: [PATCH 022/382] linux-rt_5_10: 5.10.104-rt63 -> 5.10.106-rt64 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 50b3f18e9e2..cf0744bce68 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.104-rt63"; # updated by ./update-rt.sh + version = "5.10.106-rt64"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1wb2ql58md45wi49bp3rck7ppgisyjdl7lxarzqd094fx9kr4jir"; + sha256 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "17ivd6dm49axc9k6cqf39wjjqrjqbj5xd3n7lqk7vv95rg9fg0g7"; + sha256 = "0z5gyi1vyjyd05vyccmk9yfgvm5v1lc8vbfywahx495xzpp9i8xb"; }; }; in [ rt-patch ] ++ kernelPatches; From 7a40437bddfaedeb4d0300afbc1bb2cbf9081290 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 21 Mar 2022 12:35:42 +0100 Subject: [PATCH 023/382] write-darwin-bundle: Invert squircle logic Older macOS cannot interpret the `CFBundleIconFiles` key so we cannot rewrite the `CFBundleIconFile` entry without special consideration. I opted to fix this by inverting the squircle logic. We always add both the `CFBundleIconFile` and `CFBundleIconFiles` keys. The former is necessary for at least macOS 10.13 and probably 10.12. The latter seems to be ignored on those versions and overrides the former on newer versions of macOS. Inverting the logic also allows us to rely on the `toPlist` generator to generate the XML syntax, which is a nice bonus. --- .../make-darwin-bundle/write-darwin-bundle.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix index d21e0475e2d..fde977c3636 100644 --- a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix +++ b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix @@ -5,6 +5,7 @@ let CFBundleDevelopmentRegion = "English"; CFBundleExecutable = "$name"; CFBundleIconFile = "$icon"; + CFBundleIconFiles = [ "$icon" ]; CFBundleIdentifier = "org.nixos.$name"; CFBundleInfoDictionaryVersion = "6.0"; CFBundleName = "$name"; @@ -25,11 +26,8 @@ in writeScriptBin "write-darwin-bundle" '' ${pListText} EOF - if [[ $squircle != 0 && $squircle != "false" ]]; then - sed " - s|CFBundleIconFile|CFBundleIconFiles|; - s|$icon|$icon| - " -i "$plist" + if [[ $squircle == 0 || $squircle == "false" ]]; then + sed '/CFBundleIconFiles/,\||d' -i "$plist" fi cat > "$prefix/Applications/$name.app/Contents/MacOS/$name" < Date: Mon, 21 Mar 2022 12:41:52 +0100 Subject: [PATCH 024/382] desktopToDarwinBundle: Drop 48x48 size On macOS 10.13 the 48x48 icon size is not supported. It results in a corrupted image being displayed. I suspect the image data is being truncated to what it expects for 32x32 or maybe data is read for 128x128, which would be a buffer overflow. --- .../setup-hooks/desktop-to-darwin-bundle.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index b2e2738cb6e..235cb0323b3 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -18,7 +18,9 @@ convertIconTheme() { local -r iconName=$3 local -r theme=${4:-hicolor} - local -ra iconSizes=(16 32 48 128 256 512) + # Sizes based on archived Apple documentation: + # https://developer.apple.com/design/human-interface-guidelines/macos/icons-and-images/app-icon#app-icon-sizes + local -ra iconSizes=(16 32 128 256 512) local -ra scales=([1]="" [2]="@2") # Based loosely on the algorithm at: @@ -31,13 +33,6 @@ convertIconTheme() { local scaleSuffix=${scales[$scale]} local exactSize=${iconSize}x${iconSize}${scaleSuffix} - if [[ $exactSize = '48x48@2' ]]; then - # macOS does not support a 2x scale variant of 48x48 icons - # See: https://en.wikipedia.org/wiki/Apple_Icon_Image_format#Icon_types - echo "unsupported" - return 0 - fi - local -a validSizes=( ${exactSize} $((iconSize + 1))x$((iconSize + 1))${scaleSuffix} From c3d974e44181603e73ec541568c0e8b102cecd0e Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 21 Mar 2022 12:44:51 +0100 Subject: [PATCH 025/382] desktopToDarwinBundle: Simplify double negation --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 235cb0323b3..5b67378aa78 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -132,8 +132,8 @@ convertIconTheme() { } iconsdir=$(getIcons "$sharePath" "apps/${iconName}" "$theme") - if [[ ! -z "$(ls -1 "$iconsdir/"*)" ]]; then icnsutil compose "$out/${iconName}.icns" "$iconsdir/"* + if [[ -n "$(ls -1 "$iconsdir/"*)" ]]; then else echo "Warning: no icons were found. Creating an empty icon for ${iconName}.icns." touch "$out/${iconName}.icns" From 08a2b83c9630fb191022dda93d62cc1c0f9e5aa4 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 21 Mar 2022 12:45:26 +0100 Subject: [PATCH 026/382] desktopToDarwinBundle: Include TOC in generated ICNS file In order to compose a `.icns` file containing multiple icon sizes I had to pass `--toc` to `icnsutil`. This did not seem to have a negative effect on `.icns` containing only a single icon size. --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 5b67378aa78..0519d183ba9 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -132,8 +132,8 @@ convertIconTheme() { } iconsdir=$(getIcons "$sharePath" "apps/${iconName}" "$theme") - icnsutil compose "$out/${iconName}.icns" "$iconsdir/"* if [[ -n "$(ls -1 "$iconsdir/"*)" ]]; then + icnsutil compose --toc "$out/${iconName}.icns" "$iconsdir/"* else echo "Warning: no icons were found. Creating an empty icon for ${iconName}.icns." touch "$out/${iconName}.icns" From 6aa5c537483e9cc9cbd66ac28fef8800ba306f97 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 21 Mar 2022 13:26:19 +0100 Subject: [PATCH 027/382] desktopToDarwinBundle: Fall back to scaling available Sometimes scalable icons or icons within the thresholds from the desired resolutions aren't available. In this case it's still nicer to end up with a blocky scaled icon rather than the generic default. --- .../setup-hooks/desktop-to-darwin-bundle.sh | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 0519d183ba9..d54af90b688 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -50,8 +50,10 @@ convertIconTheme() { else echo "threshold $icon" fi - return 0 + elif [[ -a $icon ]]; then + echo "fallback $icon" fi + return 0 done done echo "scalable" @@ -101,6 +103,17 @@ convertIconTheme() { scalableIcon=('-') fi + # Tri-state variable, NONE means no icons have been found, an empty + # icns file will be generated, not sure that's necessary because macOS + # will default to a generic icon if no icon can be found. + # + # OTHER means an appropriate icon was found. + # + # Any other value is a path to an icon file that isn't scalable or + # within the threshold. This is used as a fallback in case no better + # icon can be found and will be scaled as much as + # necessary to result in appropriate icon sizes. + local foundIcon=NONE for iconSize in "${iconSizes[@]}"; do for scale in "${!scales[@]}"; do local iconResult=$(findIcon $iconSize $scale) @@ -112,6 +125,7 @@ convertIconTheme() { fixed) local density=$((72 * scale))x$((72 * scale)) magick convert -density "$density" -units PixelsPerInch "$icon" "$result" + foundIcon=OTHER ;; threshold) # Synthesize an icon of the exact size if a scalable icon is available @@ -119,15 +133,32 @@ convertIconTheme() { if ! synthesizeIcon "${scalableIcon[0]}" "$result" "$iconSize" "$scale"; then resizeIcon "$icon" "$result" "$iconSize" "$scale" fi + foundIcon=OTHER ;; scalable) synthesizeIcon "${scalableIcon[0]}" "$result" "$iconSize" "$scale" || true + foundIcon=OTHER + ;; + fallback) + # Use the largest size available to scale to + # appropriate sizes. + if [[ $foundIcon != OTHER ]]; then + foundIcon=$icon + fi ;; *) ;; esac done done + if [[ $foundIcon != NONE && $foundIcon != OTHER ]]; then + # Ideally we'd only resize to whatever the closest sizes are, + # starting from whatever icon sizes are available. + for iconSize in 16 32 128 256 512; do + local result=${resultdir}/${iconSize}x${iconSize}.png + resizeIcon "$foundIcon" "$result" "$iconSize" 1 + done + fi echo "$resultdir" } From b22dba3859f719d0ac89a49d0db7d5b37fae28e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Mar 2022 16:57:08 +0000 Subject: [PATCH 028/382] qmplay2: 21.12.24 -> 22.03.19 --- pkgs/applications/video/qmplay2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index 9621b8864c9..12864d3b40a 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation rec { pname = "qmplay2"; - version = "21.12.24"; + version = "22.03.19"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = version; - sha256 = "sha256-SHReKh+M1rgSIiweYFgVvwMeKWeQD52S4KxEiTsyHrI="; + sha256 = "sha256-+EIv74dMm0zxZcCfa5wR6FJNJl5Xaes+/dCRQEBqFeo="; fetchSubmodules = true; }; From c1bc8de9e3f174853df69acdc2fa594d34d5417c Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 8 Jan 2022 21:12:11 +1100 Subject: [PATCH 029/382] nixos-rebuild: Reexec when using flakes --- .../linux/nixos-rebuild/nixos-rebuild.sh | 55 ++++++++++++------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index e7c6bd01604..8d7396b9abe 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -343,16 +343,6 @@ if [[ -z $flake && -e /etc/nixos/flake.nix ]]; then flake="$(dirname "$(readlink -f /etc/nixos/flake.nix)")" fi -# Re-execute nixos-rebuild from the Nixpkgs tree. -# FIXME: get nixos-rebuild from $flake. -if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast && -z $flake ]]; then - if p=$(runCmd nix-build --no-out-link --expr 'with import {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then - export _NIXOS_REBUILD_REEXEC=1 - runCmd exec "$p/bin/nixos-rebuild" "${origArgs[@]}" - exit 1 - fi -fi - # For convenience, use the hostname as the default configuration to # build from the flake. if [[ -n $flake ]]; then @@ -371,6 +361,40 @@ if [[ -n $flake ]]; then fi fi + +tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) + +cleanup() { + for ctrl in "$tmpDir"/ssh-*; do + ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true + done + rm -rf "$tmpDir" +} +trap cleanup EXIT + + +# Re-execute nixos-rebuild from the Nixpkgs tree. +if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast ]]; then + if [[ -z $flake ]]; then + if p=$(runCmd nix-build --no-out-link --expr 'with import {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then + SHOULD_REEXEC=1 + fi + else + runCmd nix "${flakeFlags[@]}" build --out-link "${tmpDir}/nixos-rebuild" "$flake#$flakeAttr.config.system.build.nixos-rebuild" "${extraBuildFlags[@]}" "${lockFlags[@]}" + if p=$(readlink -e "${tmpDir}/nixos-rebuild"); then + SHOULD_REEXEC=1 + fi + fi + + if [[ -n $SHOULD_REEXEC ]]; then + export _NIXOS_REBUILD_REEXEC=1 + # Manually call cleanup as the EXIT trap is not triggered when using exec + cleanup + runCmd exec "$p/bin/nixos-rebuild" "${origArgs[@]}" + exit 1 + fi +fi + # Find configuration.nix and open editor instead of building. if [ "$action" = edit ]; then if [[ -z $flake ]]; then @@ -385,19 +409,8 @@ if [ "$action" = edit ]; then exit 1 fi - -tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" -cleanup() { - for ctrl in "$tmpDir"/ssh-*; do - ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true - done - rm -rf "$tmpDir" -} -trap cleanup EXIT - - # First build Nix, since NixOS may require a newer version than the # current one. if [[ -n "$rollback" || "$action" = dry-build ]]; then From 467c3cc4cd9ddf546945deb7d6b515f42293adfe Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 21 Mar 2022 19:40:26 -0400 Subject: [PATCH 030/382] keycloak-discord: fix installPhase --- pkgs/servers/keycloak/keycloak-discord/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/servers/keycloak/keycloak-discord/default.nix index 710e66eb747..047bc67fbc5 100644 --- a/pkgs/servers/keycloak/keycloak-discord/default.nix +++ b/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + mkdir -p "$out" install "$src" "$out/${pname}-ear-${version}.ear" ''; From 6bf2168e2b9be5731e49037bcbbfc7944934e720 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 21 Mar 2022 19:40:50 -0400 Subject: [PATCH 031/382] scim-for-keycloak: fix mvnHash --- pkgs/servers/keycloak/scim-for-keycloak/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/servers/keycloak/scim-for-keycloak/default.nix index b2fa2accdec..1ef06061326 100644 --- a/pkgs/servers/keycloak/scim-for-keycloak/default.nix +++ b/pkgs/servers/keycloak/scim-for-keycloak/default.nix @@ -16,7 +16,7 @@ javaPackages.mavenfod rec { sha256 = "K34c7xISjEETI3jFkRLdZ0C8pZHTWtPtrrIzwC76Tv0="; }; - mvnHash = "sha256-L1i9Fn9l6Xun6usvqiDLtMkMscQMEcqgaWXV3OUKrwQ="; + mvnHash = "sha256-kDYhXTEOAWH/dcRJalKtbwBpoxcD1aX9eqcRKs6ewbE="; nativeBuildInputs = [ maven From d6f50a5c8ec3ed386531011027a56908829f7124 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 22 Mar 2022 12:36:14 -0400 Subject: [PATCH 032/382] keycloak: fix a missing newline when using plugins --- nixos/modules/services/web-apps/keycloak.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index 88cba0febfc..c4a2127663a 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -811,7 +811,7 @@ in export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}' '' - + lib.optionalString (cfg.plugins != []) (lib.concatStringsSep "\n" (map (pl: "install_plugin ${lib.escapeShellArg pl}") cfg.plugins)) + + lib.optionalString (cfg.plugins != []) (lib.concatStringsSep "\n" (map (pl: "install_plugin ${lib.escapeShellArg pl}") cfg.plugins)) + "\n" + optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) '' pushd /run/keycloak/ssl/ cat "$CREDENTIALS_DIRECTORY/ssl_cert" <(echo) \ From a12b2ce73c8cd2c2e1d7b469b205d5b93ec0949f Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 22 Mar 2022 15:03:47 -0400 Subject: [PATCH 033/382] keycloak: wrap all the shell scripts Most of these just need JAVA_HOME, but a few assume that java is in PATH --- pkgs/servers/keycloak/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 5913da77771..d9797de6d17 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -51,9 +51,11 @@ stdenv.mkDerivation rec { ln -s ${mkModuleXml "com.mysql" "mysql-connector-java.jar"} $module_path/com/mysql/main/module.xml ''} - wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre} + for script in add-user-keycloak.sh add-user.sh domain.sh elytron-tool.sh jboss-cli.sh jconsole.sh jdr.sh standalone.sh wsconsume.sh wsprovide.sh; do + wrapProgram $out/bin/$script --set JAVA_HOME ${jre} + done + wrapProgram $out/bin/kcadm.sh --prefix PATH : ${jre}/bin + wrapProgram $out/bin/kcreg.sh --prefix PATH : ${jre}/bin ''; passthru = { From 6f5636223cf615d2c304c8335ee072726d775191 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 22 Mar 2022 19:57:11 -0400 Subject: [PATCH 034/382] keycloak-metrics-spi: init at 2.5.3 --- nixos/tests/keycloak.nix | 16 +++++++++++- pkgs/servers/keycloak/all-plugins.nix | 1 + .../keycloak/keycloak-metrics-spi/default.nix | 26 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/keycloak/keycloak-metrics-spi/default.nix diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index a4beea40279..fce8df2b7e3 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -37,6 +37,7 @@ let }; plugins = with config.services.keycloak.package.plugins; [ keycloak-discord + keycloak-metrics-spi ]; }; @@ -104,8 +105,21 @@ let ### Realm Setup ### # Get an admin interface access token + keycloak.succeed(""" + curl -sSf -d 'client_id=admin-cli' \ + -d 'username=admin' \ + -d 'password=${initialAdminPassword}' \ + -d 'grant_type=password' \ + '${frontendUrl}/realms/master/protocol/openid-connect/token' \ + | jq -r '"Authorization: bearer " + .access_token' >admin_auth_header + """) + + # Register the metrics SPI keycloak.succeed( - "curl -sSf -d 'client_id=admin-cli' -d 'username=admin' -d 'password=${initialAdminPassword}' -d 'grant_type=password' '${frontendUrl}/realms/master/protocol/openid-connect/token' | jq -r '\"Authorization: bearer \" + .access_token' >admin_auth_header" + "${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt", + "KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' ${pkgs.keycloak}/bin/kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password '${initialAdminPassword}'", + "KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' ${pkgs.keycloak}/bin/kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'", + "curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'" ) # Publish the realm, including a test OIDC client and user diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/servers/keycloak/all-plugins.nix index 84de940d077..4dbd2487263 100644 --- a/pkgs/servers/keycloak/all-plugins.nix +++ b/pkgs/servers/keycloak/all-plugins.nix @@ -3,4 +3,5 @@ { scim-for-keycloak = callPackage ./scim-for-keycloak {}; keycloak-discord = callPackage ./keycloak-discord {}; + keycloak-metrics-spi = callPackage ./keycloak-metrics-spi {}; } diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix new file mode 100644 index 00000000000..b5e23d0fe22 --- /dev/null +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + pname = "keycloak-metrics-spi"; + version = "2.5.3"; + + src = fetchurl { + url = "https://github.com/aerogear/keycloak-metrics-spi/releases/download/${version}/keycloak-metrics-spi-${version}.jar"; + sha256 = "15lsy8wjw6nlfdfhllc45z9l5474p0lsghrwzzsssvd68bw54gwv"; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out + install "$src" "$out" + ''; + + meta = with lib; { + homepage = "https://github.com/aerogear/keycloak-metrics-spi"; + description = "Keycloak Service Provider that adds a metrics endpoint"; + license = licenses.apsl20; + maintainers = with maintainers; [ benley ]; + }; +} From 7b7e648b80d152e7b910196f2c893d9e120d666e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 01:04:38 +0000 Subject: [PATCH 035/382] aliyun-cli: 3.0.112 -> 3.0.113 --- pkgs/tools/admin/aliyun-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 94f793f47fd..58fb1bd27cd 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.112"; + version = "3.0.113"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-gzZFxZMLq0TS8bxnQTTEno6OdAu/5tqr0Tl1cF8Rm3c="; + sha256 = "sha256-+ZbfWFAf7G5mwtSgfGe/oslqIbOqqiwdtP9mWx/3u4w="; }; vendorSha256 = "sha256-FQvBq8+80h7m271gjraV445ayWcpkemOtVswfmHzUM0="; From 43453d562a909eb251fb8d1c02c1340737f973c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 07:12:22 +0000 Subject: [PATCH 036/382] nodejs-17_x: 17.7.2 -> 17.8.0 --- pkgs/development/web/nodejs/v17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix index 20d76246020..1c4dcc02a97 100644 --- a/pkgs/development/web/nodejs/v17.nix +++ b/pkgs/development/web/nodejs/v17.nix @@ -7,8 +7,8 @@ let in buildNodejs { inherit enableNpm; - version = "17.7.2"; - sha256 = "sha256-OuXnTgsWIoz37faIU1mp0uAZrIQ5BsXgGUjXRvq6Sq8="; + version = "17.8.0"; + sha256 = "0jsf6sv42rzpizvil7g1gf9bskh8lx0gcxg0yzpr4hk7mx7i90br"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; From 1f161a57c248fe64bd6bc52193ab14e08465e7ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Mar 2022 23:26:58 +0000 Subject: [PATCH 037/382] build(deps): bump peter-evans/commit-comment from 1 to 2 Bumps [peter-evans/commit-comment](https://github.com/peter-evans/commit-comment) from 1 to 2. - [Release notes](https://github.com/peter-evans/commit-comment/releases) - [Commits](https://github.com/peter-evans/commit-comment/compare/v1...v2) --- updated-dependencies: - dependency-name: peter-evans/commit-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/direct-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/direct-push.yml b/.github/workflows/direct-push.yml index 459475c3c6b..082a4806e61 100644 --- a/.github/workflows/direct-push.yml +++ b/.github/workflows/direct-push.yml @@ -22,7 +22,7 @@ jobs: if: steps.ismerge.outputs.ismerge != 'true' - name: Warn if the commit was a direct push if: steps.ismerge.outputs.ismerge != 'true' - uses: peter-evans/commit-comment@v1 + uses: peter-evans/commit-comment@v2 with: body: | @${{ github.actor }}, you pushed a commit directly to master/release branch From 4a2da4208aecd7275c59d916f96aab095178c53e Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 23 Mar 2022 08:39:34 +0000 Subject: [PATCH 038/382] libpwquality: 1.4.2 -> 1.4.4 - corrected the license: https://github.com/libpwquality/libpwquality/blob/libpwquality-1.4.4/COPYING - added long description - added myself as a maintainer - removed unnecessary patch - split outputs - added pam for building the pam module --- .../libraries/libpwquality/default.nix | 57 +++++++++++++------ .../libpwquality/python-binding-prefix.patch | 13 +++++ pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-packages.nix | 7 +++ 4 files changed, 62 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/libraries/libpwquality/python-binding-prefix.patch diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index 5d83b137b8e..abc65130fc3 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,36 +1,57 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3, fetchpatch }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, perl +, cracklib +, enablePAM ? stdenv.hostPlatform.isLinux +, pam +, enablePython ? false +, python +}: + +# python binding generates a shared library which are unavailable with musl build +assert enablePython -> !stdenv.hostPlatform.isStatic; stdenv.mkDerivation rec { pname = "libpwquality"; - version = "1.4.2"; + version = "1.4.4"; + + outputs = [ "out" "dev" "lib" "man" ] ++ lib.optionals enablePython [ "py" ]; src = fetchFromGitHub { owner = "libpwquality"; repo = "libpwquality"; rev = "${pname}-${version}"; - sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h"; + sha256 = "sha256-7gAzrx5VP1fEBwAt6E5zGM8GyuPRR+JxYifYfirY+U8="; }; - nativeBuildInputs = [ autoreconfHook perl python3 ]; - buildInputs = [ cracklib ]; - - patches = lib.optional stdenv.hostPlatform.isStatic [ - (fetchpatch { - name = "static-build.patch"; - url = "https://github.com/libpwquality/libpwquality/pull/40.patch"; - sha256 = "1ypccq437wxwgddd98cvd330jfm7jscdlzlyxgy05g6yzrr68xyk"; - }) + patches = [ + # ensure python site-packages goes in $py output + ./python-binding-prefix.patch ]; - configureFlags = lib.optional stdenv.hostPlatform.isStatic [ - # Python binding generates a shared library which are unavailable with musl build - "--disable-python-bindings" - ]; + nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals enablePython [ python ]; + buildInputs = [ cracklib ] ++ lib.optionals enablePAM [ pam ]; + + configureFlags = lib.optionals (!enablePython) [ "--disable-python-bindings" ]; meta = with lib; { - description = "Password quality checking and random password generation library"; homepage = "https://github.com/libpwquality/libpwquality"; - license = licenses.bsd3; + description = "Password quality checking and random password generation library"; + longDescription = '' + The libpwquality library purpose is to provide common functions for + password quality checking and also scoring them based on their apparent + randomness. The library also provides a function for generating random + passwords with good pronounceability. The library supports reading and + parsing of a configuration file. + + In the package there are also very simple utilities that use the library + function and PAM module that can be used instead of pam_cracklib. The + module supports all the options of pam_cracklib. + ''; + license = with licenses; [ bsd3 /* or */ gpl2Plus ]; + maintainers = with maintainers; [ jk ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpwquality/python-binding-prefix.patch b/pkgs/development/libraries/libpwquality/python-binding-prefix.patch new file mode 100644 index 00000000000..a8f77142e1d --- /dev/null +++ b/pkgs/development/libraries/libpwquality/python-binding-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/python/Makefile.am b/python/Makefile.am +index 1d00c0c..0987690 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${py} + + clean-local: + rm -rf py$(PYTHONREV) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a294c4020d..27302cf0678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18714,7 +18714,9 @@ with pkgs; libpulsar = callPackage ../development/libraries/libpulsar { }; - libpwquality = callPackage ../development/libraries/libpwquality { }; + libpwquality = callPackage ../development/libraries/libpwquality { + python = python3; + }; libqalculate = callPackage ../development/libraries/libqalculate { readline = readline81; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f4a3a9fba5..1e9bff3dbfe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4665,6 +4665,13 @@ in { libpyvivotek = callPackage ../development/python-modules/libpyvivotek { }; + libpwquality = pipe pkgs.libpwquality [ + toPythonModule + (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; })) + (p: p.override { enablePython = true; inherit python; }) + (p: p.py) + ]; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; From f25337c6ef0b7b853d5d04fb0255462b485574b2 Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 23 Mar 2022 10:12:40 +0100 Subject: [PATCH 039/382] autokey: delete unused patch --- .../office/autokey/remove-requires-dbus-python.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 pkgs/applications/office/autokey/remove-requires-dbus-python.patch diff --git a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch deleted file mode 100644 index 73372e43529..00000000000 --- a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -71,7 +71,7 @@ - 'console_scripts': ['autokey-gtk=autokey.gtkui.__main__:main'] - }, - scripts=['autokey-qt', 'autokey-run', 'autokey-shell'], -- install_requires=['dbus-python', 'pyinotify', 'python3-xlib'], -+ install_requires=['pyinotify', 'python-xlib'], - classifiers=[ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Developers', From 6eb2adefdab848ea1d4b45ed53a181b54bbd475a Mon Sep 17 00:00:00 2001 From: "florian on nixos (Florian Brandes)" Date: Wed, 23 Mar 2022 07:36:27 +0100 Subject: [PATCH 040/382] octoprint: fix build due to black Signed-off-by: florian on nixos (Florian Brandes) --- pkgs/applications/misc/octoprint/default.nix | 43 +++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index eda78c54a10..4dc6f876318 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -34,6 +34,47 @@ let (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b") + # black uses hash, not sha256 identifier. Newer black version requires newer click version + ( + self: super: { + black = super.black.overridePythonAttrs (oldAttrs: rec { + version = "21.12b0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-d7gPaTpWni5SeVhFljTxjfmwuiYluk4MLV2lvkLm8rM="; + }; + doCheck = false; + }); + } + ) + + # tests need network + ( + self: super: { + curio = super.curio.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_timeout" + "test_ssl_outgoing" + ]; + }); + } + ) + + # tests need network + ( + self: super: { + trio = super.trio.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_local_address_real" + ]; + disabledTestPaths = [ + "trio/tests/test_exports.py" + "trio/tests/test_socket.py" + ]; + }); + } + ) + # Requires flask<2, cannot mkOverride because tests need to be disabled ( self: super: { @@ -400,7 +441,7 @@ let homepage = "https://octoprint.org/"; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3Only; - maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; + maintainers = with maintainers; [ abbradar gebner WhittlesJr gador ]; }; }; } From da2a5558ab0416ba1c2ddb1c454cdcfc3c05af60 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Tue, 22 Mar 2022 11:20:58 +0100 Subject: [PATCH 041/382] alot: fix ModuleNotFoundError of '_notmuch_config' --- pkgs/applications/networking/mailreaders/alot/notmuch.nix | 6 ++++++ .../networking/mailreaders/notmuch/default.nix | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/alot/notmuch.nix b/pkgs/applications/networking/mailreaders/alot/notmuch.nix index bd195b52d44..5d74270a58c 100644 --- a/pkgs/applications/networking/mailreaders/alot/notmuch.nix +++ b/pkgs/applications/networking/mailreaders/alot/notmuch.nix @@ -14,6 +14,12 @@ buildPythonPackage { buildInputs = [ python notmuch cffi ]; + # since notmuch 0.35, this package expects _notmuch_config.py that is + # generated by notmuch's configure script + postPatch = '' + cp ${notmuch.bindingconfig}/_notmuch_config.py . + ''; + # no tests doCheck = false; pythonImportsCheck = [ "notmuch2" ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 184804a8788..e89216802e5 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -62,7 +62,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ "V=1" ]; - outputs = [ "out" "man" "info" ] + postConfigure = '' + mkdir ${placeholder "bindingconfig"} + cp bindings/python-cffi/_notmuch_config.py ${placeholder "bindingconfig"}/ + ''; + + outputs = [ "out" "man" "info" "bindingconfig" ] ++ lib.optional withEmacs "emacs" ++ lib.optional withRuby "ruby"; From 3d635629bece87df5088b3dc698b5dc6fe494cf0 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Wed, 23 Mar 2022 11:04:27 +0100 Subject: [PATCH 042/382] python3Packages.notmuch2: init at 0.35 --- pkgs/applications/networking/mailreaders/alot/default.nix | 8 +------- .../python-modules/notmuch2/default.nix} | 0 pkgs/top-level/python-packages.nix | 4 ++++ 3 files changed, 5 insertions(+), 7 deletions(-) rename pkgs/{applications/networking/mailreaders/alot/notmuch.nix => development/python-modules/notmuch2/default.nix} (100%) diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index 3d09711fb3c..cb49829dce0 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -9,13 +9,7 @@ , withManpage ? false }: -with python3.pkgs; -let - notmuch2 = callPackage ./notmuch.nix { - inherit notmuch; - }; -in -buildPythonApplication rec { +with python3.pkgs; buildPythonApplication rec { pname = "alot"; version = "0.10"; diff --git a/pkgs/applications/networking/mailreaders/alot/notmuch.nix b/pkgs/development/python-modules/notmuch2/default.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/alot/notmuch.nix rename to pkgs/development/python-modules/notmuch2/default.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5d436ccd52..f688567d415 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5606,6 +5606,10 @@ in { inherit (pkgs) notmuch; }; + notmuch2 = callPackage ../development/python-modules/notmuch2 { + inherit (pkgs) notmuch; + }; + nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; notus-scanner = callPackage ../development/python-modules/notus-scanner { }; From d19a9162c848517cfc9437f10945b736d718b948 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 20:51:49 +0000 Subject: [PATCH 043/382] elvish: 0.17.0 -> 0.18.0 --- pkgs/shells/elvish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index ba03ffb4f45..fc61efc3006 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "elvish"; - version = "0.17.0"; + version = "0.18.0"; subPackages = [ "cmd/elvish" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F6yjfsEEBrD6kXUgbMrz+1mxrz0z+sdfeoyztpy7rEk="; + sha256 = "sha256-AyTkJiNebpq17vdPluwJBztivezd+c1KAdWFTYYDIFE="; }; - vendorSha256 = "sha256-810YVxO1rjeDV1XWvE4RmJjGOMdTlicnv7YbvKtoDbM="; + vendorSha256 = "sha256-iuklI7XEQUgZ2ObYRROxyiccZ1JkajK5OJA7hIcpRZQ="; doCheck = false; From e0476d93fe71dabae965f153724648df813c4fe0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Mar 2022 17:57:23 +0100 Subject: [PATCH 044/382] treewide: rename name to pname&version --- pkgs/applications/audio/airwave/default.nix | 4 +- .../audio/aj-snapshot/default.nix | 5 +- pkgs/applications/audio/ams/default.nix | 2 +- .../audio/bitwig-studio/bitwig-studio2.nix | 2 +- pkgs/applications/audio/cardinal/default.nix | 2 +- pkgs/applications/audio/cmt/default.nix | 4 +- pkgs/applications/audio/jamin/default.nix | 2 +- pkgs/applications/audio/mid2key/default.nix | 11 ++-- pkgs/applications/audio/midas/generic.nix | 9 ++- pkgs/applications/audio/qmidiarp/default.nix | 4 +- pkgs/applications/audio/sisco.lv2/default.nix | 4 +- .../audio/soundkonverter/default.nix | 2 +- .../blockchains/bitcoin-unlimited/default.nix | 2 +- .../blockchains/dogecoin/default.nix | 2 +- .../blockchains/litecoin/default.nix | 3 +- .../blockchains/namecoin/default.nix | 2 +- .../applications/editors/jetbrains/darwin.nix | 5 +- .../editors/jetbrains/default.nix | 64 +++++++++---------- pkgs/applications/editors/jetbrains/linux.nix | 25 ++++---- .../jupyter-kernels/octave/default.nix | 3 +- .../applications/editors/qxmledit/default.nix | 2 +- pkgs/applications/emulators/wine/base.nix | 8 +-- pkgs/applications/emulators/wine/packages.nix | 6 +- pkgs/applications/gis/grass/default.nix | 2 +- .../graphics/inkscape/extensions.nix | 4 +- .../applications/graphics/mtpaint/default.nix | 8 +-- .../networking/browsers/chromium/common.nix | 2 +- .../networking/browsers/chromium/default.nix | 4 +- pkgs/applications/radio/gnuradio/wrapper.nix | 7 +- .../science/logic/why3/with-provers.nix | 2 +- 30 files changed, 100 insertions(+), 102 deletions(-) diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 438159201de..6ed488d7d64 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -3,7 +3,6 @@ }: let - version = "1.3.3"; airwave-src = fetchFromGitHub { @@ -38,7 +37,8 @@ let in multiStdenv.mkDerivation { - name = "airwave-${version}"; + pname = "airwave"; + inherit version; src = airwave-src; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 00fde01859c..9143b5f5b08 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, jack2, minixml, pkg-config }: stdenv.mkDerivation rec { - name = packageName + "-" + version ; - packageName = "aj-snapshot" ; + pname = "aj-snapshot" ; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/${packageName}/${name}.tar.bz2"; + url = "mirror://sourceforge/aj-snapshot/aj-snapshot-${version}.tar.bz2"; sha256 = "0z8wd5yvxdmw1h1rj6km9h01xd4xmp4d86gczlix7hsc7zrf0wil"; }; diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index 388d8b44dcf..7b209994103 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { - name = "ams"; + pname = "ams"; version = "unstable-2019-04-27"; src = fetchgit { diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 345750e9e2a..0d93284e294 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -2,7 +2,7 @@ pulseaudio }: bitwig-studio1.overrideAttrs (oldAttrs: rec { - name = "bitwig-studio-${version}"; + pname = "bitwig-studio"; version = "2.5"; src = fetchurl { diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 9200a36f9f3..1e77ade6cdb 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation rec { - name = "cardinal-${version}"; + pname = "cardinal"; version = "22.02"; src = fetchurl { diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/applications/audio/cmt/default.nix index bb23f9b62bb..1062d897c6b 100644 --- a/pkgs/applications/audio/cmt/default.nix +++ b/pkgs/applications/audio/cmt/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "cmt"; + pname = "cmt"; version = "1.17"; src = fetchurl { - url = "http://www.ladspa.org/download/${name}_${version}.tgz"; + url = "http://www.ladspa.org/download/cmt_${version}.tgz"; sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb"; }; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 325d115b581..2bd23b821f1 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.95.0"; - name = "jamin-${version}"; + pname = "jamin"; src = fetchurl { url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz"; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 5db17b99d1c..0a5aecfecb0 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, alsa-lib, libX11, libXi, libXtst, xorgproto }: +{ lib, stdenv, fetchFromGitHub, alsa-lib, libX11, libXi, libXtst, xorgproto }: stdenv.mkDerivation rec { - name = "mid2key-r1"; + pname = "mid2key"; + version = "1"; - src = fetchurl { - url = "http://mid2key.googlecode.com/files/${name}.tar.gz"; + src = fetchFromGitHub { + owner = "dnschneid"; + repo = "mid2key"; + rev = "v${version}"; sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904"; }; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index 93a215e46b1..b58bd0b2757 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, brand, type, version, homepage, url, sha256, ... }: stdenv.mkDerivation rec { - inherit type; - baseName = "${type}-Edit"; - name = "${lib.toLower baseName}-${version}"; + pname = "${lib.toLower type}-edit"; + inherit version; src = fetchurl { inherit url; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ${baseName} $out/bin + cp ${pname} $out/bin ''; preFixup = let # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ - $out/bin/${baseName} + $out/bin/${pname} ''; meta = with lib; { diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index 618062dc2f3..487f86cf660 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { - name = "qmidiarp"; + pname = "qmidiarp"; version = "0.6.5"; src = fetchgit { url = "https://git.code.sf.net/p/qmidiarp/code"; sha256 = "1g2143gzfbihqr2zi3k2v1yn1x3mwfbb2khmcd4m4cq3hcwhhlx9"; - rev = "qmidiarp-0.6.5"; + rev = "qmidiarp-${version}"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 3ecd4665f26..5aa407a1502 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }: let - name = "sisco.lv2-${version}"; version = "0.7.0"; robtkVersion = "80a2585253a861c81f0bfb7e4579c75f5c73af89"; @@ -22,7 +21,8 @@ let }; in stdenv.mkDerivation rec { - inherit name; + pname = "sisco.lv2"; + inherit version; srcs = [ src robtkSrc ]; sourceRoot = src.name; diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 1c1724fbce8..d8536762641 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -45,7 +45,7 @@ let runtimeDeps = [] in mkDerivation rec { - name = "soundkonverter"; + pname = "soundkonverter"; version = "3.0.1"; src = fetchFromGitHub { owner = "dfaust"; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index 802a19167a9..fe7acb0bbe1 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -6,7 +6,7 @@ with lib; stdenv.mkDerivation rec { - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; + pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited"; version = "1.9.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/dogecoin/default.nix b/pkgs/applications/blockchains/dogecoin/default.nix index 35b9fb026e3..8094959a248 100644 --- a/pkgs/applications/blockchains/dogecoin/default.nix +++ b/pkgs/applications/blockchains/dogecoin/default.nix @@ -6,7 +6,7 @@ with lib; stdenv.mkDerivation rec { - name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; + pname = "dogecoin" + optionalString (!withGui) "d"; version = "1.14.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index c80ef342c75..0a82ca0ce2c 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -11,8 +11,7 @@ with lib; mkDerivation rec { - - name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; + pname = "litecoin" + optionalString (!withGui) "d"; version = "0.18.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index 1851c581c9a..d5c739e00f4 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -3,8 +3,8 @@ with lib; stdenv.mkDerivation rec { + pname = "namecoin" + optionalString (!withGui) "d"; version = "nc22.0"; - name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; diff --git a/pkgs/applications/editors/jetbrains/darwin.nix b/pkgs/applications/editors/jetbrains/darwin.nix index b1002e23582..f771894f533 100644 --- a/pkgs/applications/editors/jetbrains/darwin.nix +++ b/pkgs/applications/editors/jetbrains/darwin.nix @@ -5,7 +5,7 @@ }: { meta -, name +, pname , product , productShort ? product , src @@ -17,7 +17,7 @@ let loname = lib.toLower productShort; in stdenvNoCC.mkDerivation { - inherit meta src version; + inherit pname meta src version; desktopName = product; installPhase = '' runHook preInstall @@ -32,6 +32,5 @@ in runHook postInstall ''; nativeBuildInputs = [ undmg ]; - pname = lib.concatStringsSep "-" (lib.init (lib.splitString "-" name)); sourceRoot = "."; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b47c1270790..f0ee51dde3c 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -24,9 +24,9 @@ let # Sorted alphabetically - buildClion = { name, version, src, license, description, wmClass, ... }: + buildClion = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "CLion"; meta = with lib; { homepage = "https://www.jetbrains.com/clion/"; @@ -62,9 +62,9 @@ let ''; }); - buildDataGrip = { name, version, src, license, description, wmClass, ... }: + buildDataGrip = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "DataGrip"; meta = with lib; { homepage = "https://www.jetbrains.com/datagrip/"; @@ -78,9 +78,9 @@ let }; }); - buildGoland = { name, version, src, license, description, wmClass, ... }: + buildGoland = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "Goland"; meta = with lib; { homepage = "https://www.jetbrains.com/go/"; @@ -106,9 +106,9 @@ let ''; }); - buildIdea = { name, version, src, license, description, wmClass, product, ... }: + buildIdea = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk product; + inherit pname version src wmClass jdk product; productShort = "IDEA"; extraLdPath = [ zlib ]; extraWrapperArgs = [ @@ -129,9 +129,9 @@ let }; }); - buildMps = { name, version, src, license, description, wmClass, product, ... }: + buildMps = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct rec { - inherit name version src wmClass jdk product; + inherit pname version src wmClass jdk product; productShort = "MPS"; meta = with lib; { homepage = "https://www.jetbrains.com/mps/"; @@ -146,9 +146,9 @@ let }; }); - buildPhpStorm = { name, version, src, license, description, wmClass, ... }: + buildPhpStorm = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "PhpStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/phpstorm/"; @@ -162,9 +162,9 @@ let }; }); - buildPycharm = { name, version, src, license, description, wmClass, product, ... }: + buildPycharm = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk product; + inherit pname version src wmClass jdk product; productShort = "PyCharm"; meta = with lib; { homepage = "https://www.jetbrains.com/pycharm/"; @@ -186,9 +186,9 @@ let }; }); - buildRider = { name, version, src, license, description, wmClass, ... }: + buildRider = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "Rider"; meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; @@ -211,9 +211,9 @@ let ''); }); - buildRubyMine = { name, version, src, license, description, wmClass, ... }: + buildRubyMine = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "RubyMine"; meta = with lib; { homepage = "https://www.jetbrains.com/ruby/"; @@ -223,9 +223,9 @@ let }; }); - buildWebStorm = { name, version, src, license, description, wmClass, ... }: + buildWebStorm = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "WebStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/webstorm/"; @@ -251,7 +251,7 @@ in # Sorted alphabetically clion = buildClion rec { - name = "clion-${version}"; + pname = "clion"; version = products.clion.version; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; @@ -264,7 +264,7 @@ in }; datagrip = buildDataGrip rec { - name = "datagrip-${version}"; + pname = "datagrip"; version = products.datagrip.version; description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; @@ -277,7 +277,7 @@ in }; goland = buildGoland rec { - name = "goland-${version}"; + pname = "goland"; version = products.goland.version; description = "Up and Coming Go IDE"; license = lib.licenses.unfree; @@ -290,7 +290,7 @@ in }; idea-community = buildIdea rec { - name = "idea-community-${version}"; + pname = "idea-community"; product = "IntelliJ IDEA CE"; version = products.idea-community.version; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; @@ -304,7 +304,7 @@ in }; idea-ultimate = buildIdea rec { - name = "idea-ultimate-${version}"; + pname = "idea-ultimate"; product = "IntelliJ IDEA"; version = products.idea-ultimate.version; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; @@ -318,7 +318,7 @@ in }; mps = buildMps rec { - name = "mps-${version}"; + pname = "mps"; product = "MPS ${products.mps.version-major-minor}"; version = products.mps.version; description = "Create your own domain-specific language"; @@ -332,7 +332,7 @@ in }; phpstorm = buildPhpStorm rec { - name = "phpstorm-${version}"; + pname = "phpstorm"; version = products.phpstorm.version; description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; @@ -345,7 +345,7 @@ in }; pycharm-community = buildPycharm rec { - name = "pycharm-community-${version}"; + pname = "pycharm-community"; product = "PyCharm CE"; version = products.pycharm-community.version; description = "PyCharm Community Edition"; @@ -359,7 +359,7 @@ in }; pycharm-professional = buildPycharm rec { - name = "pycharm-professional-${version}"; + pname = "pycharm-professional"; product = "PyCharm"; version = products.pycharm-professional.version; description = "PyCharm Professional Edition"; @@ -373,7 +373,7 @@ in }; rider = buildRider rec { - name = "rider-${version}"; + pname = "rider"; version = products.rider.version; description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; @@ -386,7 +386,7 @@ in }; ruby-mine = buildRubyMine rec { - name = "ruby-mine-${version}"; + pname = "ruby-mine"; version = products.ruby-mine.version; description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; @@ -399,7 +399,7 @@ in }; webstorm = buildWebStorm rec { - name = "webstorm-${version}"; + pname = "webstorm"; version = products.webstorm.version; description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index d150368ca82..55ed0e6829e 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -3,30 +3,29 @@ , vmopts ? null }: -{ name, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: +{ pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: with lib; let loName = toLower productShort; hiName = toUpper productShort; - mainProgram = concatStringsSep "-" (init (splitString "-" name)); vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; in with stdenv; lib.makeOverridable mkDerivation (rec { - inherit name src; - meta = args.meta // { inherit mainProgram; }; + inherit pname version src; + meta = args.meta // { mainProgram = pname; }; desktopItem = makeDesktopItem { - name = mainProgram; - exec = mainProgram; + name = pname; + exec = pname; comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; categories = [ "Development" ]; - icon = mainProgram; + icon = pname; startupWMClass = wmClass; }; @@ -62,16 +61,16 @@ with stdenv; lib.makeOverridable mkDerivation (rec { installPhase = '' runHook preInstall - mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} - cp -a . $out/$name - ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png - mv bin/fsnotifier* $out/libexec/${name}/. + mkdir -p $out/{bin,$pname,share/pixmaps,libexec/${pname}} + cp -a . $out/$pname + ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png + mv bin/fsnotifier* $out/libexec/${pname}/. jdk=${jdk.home} item=${desktopItem} - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \ - --prefix PATH : "$out/libexec/${name}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + makeWrapper "$out/$pname/bin/${loName}.sh" "$out/bin/${pname}" \ + --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index 9db38d14448..7a1c997a7c5 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -32,7 +32,8 @@ rec { ''; sizedLogo = size: stdenv.mkDerivation { - name = ''octave-logo-${octave.version}-${size}x${size}.png''; + pname = "octave-logo-${size}x${size}.png"; + inherit (octave) version; src = octave.src; diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index d2aea1344da..35c5f644ffa 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -2,7 +2,7 @@ qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }: stdenv.mkDerivation rec { - name = "qxmledit-${version}" ; + pname = "qxmledit" ; version = "0.9.15" ; src = fetchFromGitHub ( lib.importJSON ./qxmledit.json ) ; nativeBuildInputs = [ qmake ] ; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index f13e224627a..7788b13b4ec 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgArches, callPackage, makeSetupHook, - name, version, src, mingwGccs, monos, geckos, platforms, + pname, version, src, mingwGccs, monos, geckos, platforms, bison, flex, fontforge, makeWrapper, pkg-config, autoconf, hexdump, perl, nixosTests, supportFlags, @@ -13,7 +13,7 @@ with import ./util.nix { inherit lib; }; let patches' = patches; - prevName = name; + prevName = pname; prevPlatforms = platforms; prevConfigFlags = configureFlags; setupHookDarwin = makeSetupHook { @@ -42,9 +42,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ''; }) // rec { - inherit src; + inherit version src; - name = if supportFlags.waylandSupport then "${prevName}-wayland" else prevName; + pname = prevName + lib.optionalString supportFlags.waylandSupport "wayland"; # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index bf3f57aff0f..c119feb783d 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -9,7 +9,7 @@ let vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; }; in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { - name = "wine-${version}"; + pname = "wine"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgsi686Linux ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; @@ -19,7 +19,7 @@ in with src; { platforms = [ "i686-linux" "x86_64-linux" ]; }; wine64 = callPackage ./base.nix { - name = "wine64-${version}"; + pname = "wine64"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgs ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; @@ -30,7 +30,7 @@ in with src; { platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; wineWow = callPackage ./base.nix { - name = "wine-wow-${version}"; + pname = "wine-wow"; inherit src version supportFlags patches moltenvk; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 5ca31cc0405..36664a2d49c 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "grass"; + pname = "grass"; version = "7.8.6"; src = with lib; fetchFromGitHub { diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix index 63010a19f14..08260c968cf 100644 --- a/pkgs/applications/graphics/inkscape/extensions.nix +++ b/pkgs/applications/graphics/inkscape/extensions.nix @@ -9,8 +9,8 @@ applytransforms = callPackage ./extensions/applytransforms { }; hexmap = stdenv.mkDerivation { - name = "hexmap"; - version = "2020-06-06"; + pname = "hexmap"; + version = "unstable-2020-06-06"; src = fetchFromGitHub { owner = "lifelike"; diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 3565173285b..0acc873b396 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -4,14 +4,12 @@ }: stdenv.mkDerivation rec { - p_name = "mtPaint"; - ver_maj = "3.50"; - ver_min = "01"; - name = "${p_name}-${ver_maj}.${ver_min}"; + pname = "mtPaint"; + version = "3.50.01"; src = fetchFromGitHub { owner = "wjaguar"; - repo = p_name; + repo = "mtPaint"; rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f"; sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y"; }; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9b18590817f..96a4dac173f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -114,7 +114,7 @@ let }; base = rec { - name = "${packageName}-unwrapped-${version}"; + pname = "${packageName}-unwrapped"; inherit (upstream-info) version; inherit packageName buildType buildPath; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 0202ead4605..e8d9a13f9ac 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -157,8 +157,8 @@ let else browser; in stdenv.mkDerivation { - name = lib.optionalString ungoogled "ungoogled-" - + "chromium${suffix}-${version}"; + pname = lib.optionalString ungoogled "ungoogled-" + + "chromium${suffix}"; inherit version; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 4cbccbd5181..6765c877437 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -50,7 +50,8 @@ let ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); - name = (lib.appendToName "wrapped" unwrapped).name; + pname = unwrapped.pname + "-wrapped"; + inherit (unwrapped) version; makeWrapperArgs = builtins.concatStringsSep " " ([ ] # Emulating wrapGAppsHook & wrapQtAppsHook working together @@ -59,7 +60,7 @@ let || (unwrapped.hasFeature "gr-qtgui") ) [ "--prefix" "XDG_DATA_DIRS" ":" "$out/share" - "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${name}" + "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${pname}" "--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" # Needs to run `gsettings` on startup, see: @@ -135,7 +136,7 @@ let }; self = if doWrap then stdenv.mkDerivation { - inherit name passthru; + inherit pname version passthru; buildInputs = [ makeWrapper xorg.lndir diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index 826473b38e9..ae0acb1e525 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -12,7 +12,7 @@ let configAwkScript = runCommand "why3-conf.awk" { inherit provers; } ''; in stdenv.mkDerivation { - name = "${why3.name}-with-provers"; + pname = "${why3.pname}-with-provers"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ why3 ] ++ provers; From cc8456effe723a6489b6f89fdafa7e877245742d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 23 Mar 2022 15:42:41 -0600 Subject: [PATCH 045/382] linux: common-config condition power-management to required platform --- pkgs/os-specific/linux/kernel/common-config.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ce6123a10f7..2b065151f4a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -60,16 +60,16 @@ let }; power-management = { - PM_ADVANCED_DEBUG = yes; - X86_INTEL_LPSS = yes; - X86_INTEL_PSTATE = yes; - INTEL_IDLE = yes; CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes; CPU_FREQ_GOV_SCHEDUTIL = yes; + PM_ADVANCED_DEBUG = yes; PM_WAKELOCKS = yes; - # Power-capping framework and support for INTEL RAPL POWERCAP = yes; + } // optionalAttrs (stdenv.hostPlatform.isx86) { + INTEL_IDLE = yes; INTEL_RAPL = whenAtLeast "5.3" module; + X86_INTEL_LPSS = yes; + X86_INTEL_PSTATE = yes; }; external-firmware = { From 418d3f65b619a36416d9be5d33507944f7e45ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 22:59:30 +0000 Subject: [PATCH 046/382] flat-remix-gtk: 20220310 -> 20220321 --- pkgs/data/themes/flat-remix-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index fec900a2d7e..ec76d48457c 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220310"; + version = "20220321"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-fKkqMGb1UopjM7hTTury1I3oD5AlHqKP+WLmgAZIQxo="; + sha256 = "sha256-QFG/jh3tPO0eflyDQaC1PJL/SavYD/W6rYp26Rxe/2E="; }; dontBuild = true; From 11e697c3d7f8da7f11165ff85a8db633c8724c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 23 Mar 2022 16:11:09 -0600 Subject: [PATCH 047/382] linux: common-config cleanup older options --- pkgs/os-specific/linux/kernel/common-config.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2b065151f4a..3856a223e2c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -269,8 +269,6 @@ let DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; DRM_VMWGFX_FBCON = yes; - # necessary for amdgpu polaris support - DRM_AMD_POWERPLAY = whenBetween "4.5" "4.9" yes; # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets @@ -383,7 +381,7 @@ let EXT4_FS_POSIX_ACL = yes; EXT4_FS_SECURITY = yes; - EXT4_ENCRYPTION = { optional = true; tristate = if (versionOlder version "4.8") then "m" else "y"; }; + EXT4_ENCRYPTION = option yes; REISERFS_FS_XATTR = option yes; REISERFS_FS_POSIX_ACL = option yes; @@ -461,7 +459,7 @@ let # https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html DEBUG_LIST = yes; # Detect writes to read-only module pages - DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; }; + DEBUG_SET_MODULE_RONX = whenOlder "4.11" (option yes); RANDOMIZE_BASE = option yes; STRICT_DEVMEM = mkDefault yes; # Filter access to /dev/mem IO_STRICT_DEVMEM = mkDefault yes; @@ -560,8 +558,8 @@ let PARAVIRT_SPINLOCKS = option yes; KVM_ASYNC_PF = yes; - KVM_COMPAT = { optional = true; tristate = whenBetween "4.0" "4.12" "y"; }; - KVM_DEVICE_ASSIGNMENT = { optional = true; tristate = whenBetween "3.10" "4.12" "y"; }; + KVM_COMPAT = whenOlder "4.12" (option yes); + KVM_DEVICE_ASSIGNMENT = whenOlder "4.12" (option yes); KVM_GENERIC_DIRTYLOG_READ_PROTECT = yes; KVM_GUEST = yes; KVM_MMIO = yes; @@ -769,7 +767,6 @@ let AIC79XX_DEBUG_ENABLE = no; AIC7XXX_DEBUG_ENABLE = no; AIC94XX_DEBUG = no; - B43_PCMCIA = { optional=true; tristate = whenOlder "4.4" "y";}; BLK_DEV_INTEGRITY = yes; From 1b0e116b1474b594eca801bedb231b201996359b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 23 Mar 2022 16:45:14 -0600 Subject: [PATCH 048/382] linux: condition CLEANCACHE to before 5.17 when it was removed --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3856a223e2c..92fc77128d2 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -787,7 +787,9 @@ let BT_RFCOMM_TTY = option yes; # RFCOMM TTY support BT_QCA = module; # enables QCA6390 bluetooth - CLEANCACHE = option yes; + # Removed on 5.17 as it was unused + # upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0a4ee518185e902758191d968600399f3bc2be31 + CLEANCACHE = whenOlder "5.17" (option yes); CRASH_DUMP = option no; DVB_DYNAMIC_MINORS = option yes; # we use udev From b41351d4501bf5459b501bb7c037772c59b02000 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Mar 2022 10:30:38 +0000 Subject: [PATCH 049/382] python310Packages.vertica-python: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/vertica-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index a456c5232d8..2339073f514 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "cfe1794c5ba9fdfbd470a55d82f60c2e08e129828367753bf64199a58a539bc2"; + sha256 = "sha256-IpdrR9mDG+8cNnXgSXkmXahSEP4EGnEBJqZk5SNu9pA="; }; propagatedBuildInputs = [ future python-dateutil six ]; From 7f1f6eeffb2b18ed9b2a03f2ae91727e1e615241 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Wed, 16 Mar 2022 14:09:37 -0400 Subject: [PATCH 050/382] nixos/1password-gui: init at 8.6.0 Browser Integration requires setgid and setuid programs, which needs to be done in the system configuration. This is cleaner than the ad-hoc ways we have to set things up for platforms without a global configuration file. --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/_1password-gui.nix | 69 +++++++++++++++++++ .../misc/1password-gui/default.nix | 1 + 3 files changed, 71 insertions(+) create mode 100644 nixos/modules/programs/_1password-gui.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e80c6cf90f5..c6a4627c34f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -118,6 +118,7 @@ ./misc/version.nix ./misc/wordlist.nix ./misc/nixops-autoluks.nix + ./programs/_1password-gui.nix ./programs/adb.nix ./programs/appgate-sdp.nix ./programs/atop.nix diff --git a/nixos/modules/programs/_1password-gui.nix b/nixos/modules/programs/_1password-gui.nix new file mode 100644 index 00000000000..f57de44bb9e --- /dev/null +++ b/nixos/modules/programs/_1password-gui.nix @@ -0,0 +1,69 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs._1password-gui; + +in { + options = { + programs._1password-gui = { + enable = mkEnableOption "The 1Password Desktop application with browser integration"; + + groupId = mkOption { + type = types.int; + example = literalExpression "5000"; + description = '' + The GroupID to assign to the onepassword group, which is needed for browser integration. The group ID must be 1000 or greater. + ''; + }; + + polkitPolicyOwners = mkOption { + type = types.listOf types.str; + default = []; + example = literalExpression "[\"user1\" \"user2\" \"user3\"]"; + description = '' + A list of users who should be able to integrate 1Password with polkit-based authentication mechanisms. By default, no users will have such access. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs._1password-gui; + defaultText = literalExpression "pkgs._1password-gui"; + example = literalExpression "pkgs._1password-gui"; + description = '' + The 1Password derivation to use. This can be used to upgrade from the stable release that we keep in nixpkgs to the betas. + ''; + }; + }; + }; + + config = let + package = cfg.package.override { + polkitPolicyOwners = cfg.polkitPolicyOwners; + }; + in mkIf cfg.enable { + environment.systemPackages = [ package ]; + users.groups.onepassword.gid = cfg.groupId; + + security.wrappers = { + "1Password-BrowserSupport" = + { source = "${cfg.package}/share/1password/1Password-BrowserSupport"; + owner = "root"; + group = "onepassword"; + setuid = false; + setgid = true; + }; + + "1Password-KeyringHelper" = + { source = "${cfg.package}/share/1password/1Password-KeyringHelper"; + owner = "root"; + group = "onepassword"; + setuid = true; + setgid = true; + }; + }; + + }; +} diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 15622d799a4..311ef3037bb 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -101,6 +101,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/polkit-1/actions substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}" '') + '' + # Icons cp -a resources/icons $out/share From 3f171a9e885abcf7db9762df743fae87d1d419e7 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Thu, 24 Mar 2022 10:37:13 -0400 Subject: [PATCH 051/382] wxwidgets: fix build --- pkgs/development/libraries/wxwidgets/wxGTK31.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 9deb23ffcf0..1d94ce7b7ba 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -32,8 +32,6 @@ , WebKit }: -assert withWebKit -> stdenv.isDarwin; - assert withGtk2 -> (!withWebKit); let From 1479126ac1af2751cbcefea3e13ee989ea8ed022 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Mar 2022 19:14:05 +0100 Subject: [PATCH 052/382] python3Packages.vertica-python: switch to pytestCheckHook --- .../python-modules/vertica-python/default.nix | 43 +++++++++++++++---- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 2339073f514..cd6186e574f 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -1,27 +1,52 @@ -{ lib, buildPythonPackage, fetchPypi, future, python-dateutil, six, pytest, mock, parameterized }: +{ lib +, buildPythonPackage +, fetchPypi +, future +, mock +, parameterized +, pytestCheckHook +, python-dateutil +, pythonOlder +, six +}: buildPythonPackage rec { pname = "vertica-python"; version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IpdrR9mDG+8cNnXgSXkmXahSEP4EGnEBJqZk5SNu9pA="; + hash = "sha256-IpdrR9mDG+8cNnXgSXkmXahSEP4EGnEBJqZk5SNu9pA="; }; - propagatedBuildInputs = [ future python-dateutil six ]; + propagatedBuildInputs = [ + future + python-dateutil + six + ]; - checkInputs = [ pytest mock parameterized ]; + checkInputs = [ + mock + parameterized + pytestCheckHook + ]; - # Integration tests require an accessible Vertica db - checkPhase = '' - pytest --ignore vertica_python/tests/integration_tests - ''; + disabledTestPaths = [ + # Integration tests require an accessible Vertica db + "vertica_python/tests/integration_tests" + ]; + + pythonImportsCheck = [ + "vertica_python" + ]; meta = with lib; { description = "Native Python client for Vertica database"; homepage = "https://github.com/vertica/vertica-python"; license = licenses.asl20; - maintainers = [ maintainers.arnoldfarkas ]; + maintainers = with maintainers; [ arnoldfarkas ]; }; } From f138bc197218d59e69ce99bb2c05debbe6f3431a Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Thu, 24 Mar 2022 19:31:28 +0100 Subject: [PATCH 053/382] drawio: 16.5.1 -> 17.2.1 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 57439313bf2..d77d4ffda2a 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "16.5.1"; + version = "17.2.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "a8ebf2560820d2d05677b9b16fc863f555dde8235b3e34acd7916eee3544eaa9"; + sha256 = "28019774a18f6e74c0d126346ae3551b5eb9c73aae13fe87f6d49120c183697a"; }; nativeBuildInputs = [ From 5eb5aeda14901f9bb1cc2ef91dddd23e0b326d8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Mar 2022 20:16:30 +0000 Subject: [PATCH 054/382] mcfly: 0.5.13 -> 0.6.0 --- pkgs/tools/misc/mcfly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 583e415f093..bb7ccb375ba 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.13"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-6PGh+CUQH5LEV7/qctn+ihdZgqjt888wknXTfGPS3SI="; + sha256 = "sha256-k8Z/CS1vbnQvoddos7Y0KcM1zB8QDAbXaROjNCyPEN0="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoSha256 = "sha256-dpDuM+kGuCC2xm5EdV2OoxLNbKgi8wmTGrr8K16AnpM="; + cargoSha256 = "sha256-2SKgzVJdtzH9poHx/NJba6+lj/C0PBcEgI/2ITO18Bk="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; From c764d3138eb4ab374b34c7477cc1c33a2d55636f Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 24 Mar 2022 16:46:04 -0400 Subject: [PATCH 055/382] ciscoPacketTracer8: 8.0.1 -> 8.1.1 --- pkgs/applications/networking/cisco-packet-tracer/8.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix index 1267a061429..9bc89001745 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -27,7 +27,7 @@ }: let - version = "8.0.1"; + version = "8.1.1"; ptFiles = stdenv.mkDerivation { name = "PacketTracer8Drv"; @@ -36,7 +36,7 @@ let dontUnpack = true; src = requireFile { name = "CiscoPacketTracer_${builtins.replaceStrings ["."] [""] version}_Ubuntu_64bit.deb"; - sha256 = "77a25351b016faed7c78959819c16c7013caa89c6b1872cb888cd96edd259140"; + sha256 = "08c53171aa0257a64ae7de1540f242214033cfa4f879fbc9fed5cc0d32232abf"; url = "https://www.netacad.com"; }; @@ -72,6 +72,7 @@ let libXrandr libXrender libXScrnSaver + libXtst xcbutilimage xcbutilkeysyms xcbutilrenderutil From 53c1fe6b2e78eca736370ea8900f465393317b9b Mon Sep 17 00:00:00 2001 From: Gregor Kleen <20089782+gkleen@users.noreply.github.com> Date: Thu, 24 Mar 2022 21:59:56 +0100 Subject: [PATCH 056/382] zfs: 2.1.3 -> 2.1.4 --- pkgs/os-specific/linux/zfs/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index b5260d47caa..6747d511694 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_16 ? pkgs.linuxKernel.packages.linux_5_16 +, linuxPackages_5_17 ? pkgs.linuxKernel.packages.linux_5_17 }: let @@ -216,28 +216,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17"; - latestCompatibleLinuxPackages = linuxPackages_5_16; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18"; + latestCompatibleLinuxPackages = linuxPackages_5_17; # this package should point to the latest release. - version = "2.1.3"; + version = "2.1.4"; - sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl"; + sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17"; - latestCompatibleLinuxPackages = linuxPackages_5_16; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18"; + latestCompatibleLinuxPackages = linuxPackages_5_17; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.3"; + version = "2.1.4"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl"; + sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; isUnstable = true; }; From 33cce15e42e4086ea26b5fc026a2de3ca2e07f29 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 23 Mar 2022 23:22:02 +0200 Subject: [PATCH 057/382] treewide: remove meta.repositories there's no documentation for meta.repositories and its not widely used --- pkgs/applications/audio/deadbeef/default.nix | 1 - pkgs/applications/audio/musescore/darwin.nix | 1 - pkgs/applications/audio/musescore/default.nix | 1 - pkgs/applications/graphics/gpicview/default.nix | 1 - pkgs/applications/graphics/nomacs/default.nix | 1 - pkgs/applications/misc/mupdf/1.17.nix | 1 - pkgs/applications/misc/mupdf/default.nix | 1 - pkgs/applications/misc/nut/default.nix | 1 - pkgs/applications/networking/cluster/flink/default.nix | 1 - pkgs/applications/networking/cluster/kontemplate/default.nix | 1 - pkgs/applications/networking/cluster/spark/default.nix | 1 - pkgs/applications/networking/irc/quassel/default.nix | 1 - pkgs/applications/networking/lieer/default.nix | 1 - .../version-management/git-and-tools/cgit/common.nix | 3 +-- .../version-management/git-and-tools/cgit/default.nix | 1 - .../version-management/git-and-tools/cgit/pink.nix | 1 - pkgs/data/documentation/man-pages/default.nix | 1 - pkgs/development/libraries/libass/default.nix | 1 - pkgs/development/libraries/libcec/default.nix | 1 - pkgs/development/libraries/libcec/platform.nix | 1 - pkgs/development/libraries/libgcrypt/1.5.nix | 1 - pkgs/development/libraries/libgcrypt/default.nix | 1 - pkgs/development/libraries/libidn/default.nix | 1 - pkgs/development/libraries/libidn2/default.nix | 1 - pkgs/development/libraries/liblastfm/default.nix | 1 - pkgs/development/libraries/liboauth/default.nix | 1 - pkgs/development/libraries/libotr/default.nix | 1 - pkgs/development/libraries/libusb-compat/0.1.nix | 1 - pkgs/development/libraries/libusb1/default.nix | 1 - pkgs/development/libraries/libvirt/default.nix | 1 - pkgs/development/libraries/pcg-c/default.nix | 1 - pkgs/development/libraries/taglib/default.nix | 1 - pkgs/development/python-modules/obfsproxy/default.nix | 3 +-- pkgs/development/tools/misc/cgdb/default.nix | 2 -- pkgs/development/tools/profiling/systemtap/default.nix | 1 - pkgs/games/openxcom/default.nix | 1 - pkgs/games/spring/springlobby.nix | 1 - pkgs/os-specific/darwin/m-cli/default.nix | 1 - pkgs/os-specific/linux/bluez/default.nix | 1 - pkgs/os-specific/linux/hostapd/default.nix | 1 - pkgs/os-specific/linux/i7z/default.nix | 1 - pkgs/os-specific/linux/kernel/manual-config.nix | 1 - pkgs/os-specific/linux/ldm/default.nix | 5 +---- pkgs/servers/amqp/qpid-cpp/default.nix | 2 -- pkgs/servers/memcached/default.nix | 1 - pkgs/stdenv/generic/check-meta.nix | 1 - pkgs/tools/misc/mc/default.nix | 1 - pkgs/tools/networking/chrony/default.nix | 1 - pkgs/tools/networking/obfs4/default.nix | 3 +-- pkgs/tools/networking/socat/default.nix | 1 - pkgs/tools/security/nitrokey-app/default.nix | 1 - pkgs/tools/security/tor/default.nix | 1 - pkgs/tools/security/tor/torsocks.nix | 3 +-- pkgs/tools/system/evemu/default.nix | 1 - pkgs/tools/system/gohai/default.nix | 1 - pkgs/tools/system/hardlink/default.nix | 1 - pkgs/tools/system/mq-cli/default.nix | 1 - pkgs/tools/typesetting/odpdown/default.nix | 1 - 58 files changed, 5 insertions(+), 67 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index c1cecc13ec5..e8b0ded4c00 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -112,6 +112,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.abbradar ]; - repositories.git = "https://github.com/Alexey-Yakovenko/deadbeef"; }; } diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 13141729320..2cf1b9ff68d 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.darwin; maintainers = []; - repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 7662eadc498..caa799c88f6 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -51,6 +51,5 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ vandenoever turion doronbehar ]; platforms = platforms.linux; - repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index edafa5612a2..ae1e64297bd 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and fast image viewer for X"; homepage = "http://lxde.sourceforge.net/gpicview/"; - repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 9f3c1e453f8..29b049ac55b 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -66,7 +66,6 @@ mkDerivation rec { description = "Qt-based image viewer"; maintainers = with lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; - repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index 95e9c7c3307..ec978b9fc3a 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -82,7 +82,6 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mupdf.com"; - repositories.git = "git://git.ghostscript.com/mupdf.git"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 4877051fd98..102c80f6d12 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -111,7 +111,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mupdf.com"; - repositories.git = "git://git.ghostscript.com/mupdf.git"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 4694c243b39..41f46ff1c00 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { It uses a layered approach to connect all of the parts. ''; homepage = "https://networkupstools.org/"; - repositories.git = "https://github.com/networkupstools/nut.git"; platforms = platforms.linux; maintainers = [ maintainers.pierron ]; license = with licenses; [ gpl1Plus gpl2Plus gpl3Plus ]; diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 36940d7441d..b5250a3bd7f 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ mbode ]; - repositories.git = "git://git.apache.org/flink.git"; }; } diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 87ae71f6a48..10c161f45d0 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -20,7 +20,6 @@ buildGoPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ mbode tazjin ]; platforms = platforms.unix; - repositories.git = "git://github.com/tazjin/kontemplate.git"; longDescription = '' Kontemplate is a simple CLI tool that can take sets of diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 7770f98afe5..69cdcc8d131 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -63,7 +63,6 @@ let license = lib.licenses.asl20; platforms = lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; - repositories.git = "git://git.apache.org/spark.git"; }; }; in diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index d218f114143..4bc930b12d0 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -88,7 +88,6 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ ttuegel ]; - repositories.git = "https://github.com/quassel/quassel.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 420b9b28ccf..a9bf177128d 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -33,7 +33,6 @@ python3Packages.buildPythonApplication rec { GMail account. ''; homepage = "https://lieer.gaute.vetsj.com/"; - repositories.git = "https://github.com/gauteh/lieer.git"; license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli kaiha ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/common.nix b/pkgs/applications/version-management/git-and-tools/cgit/common.nix index f0e3e4a29d8..d6b787315b8 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/common.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/common.nix @@ -1,5 +1,5 @@ { pname, version, src, gitSrc, buildInputs ? [] -, homepage, repo, description, maintainers +, homepage, description, maintainers }: { lib, stdenv, openssl, zlib, asciidoc, libxml2, libxslt @@ -70,7 +70,6 @@ stdenv.mkDerivation { meta = { inherit homepage description; - repositories.git = repo; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = maintainers ++ (with lib.maintainers; [ qyliss ]); diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 7d84b286d5f..f6a0af10230 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -20,7 +20,6 @@ callPackage (import ./common.nix rec { buildInputs = [ luajit ]; homepage = "https://git.zx2c4.com/cgit/about/"; - repo = "git://git.zx2c4.com/cgit"; description = "Web frontend for git repositories"; maintainers = with lib.maintainers; [ bjornfor ]; }) {} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/pink.nix b/pkgs/applications/version-management/git-and-tools/cgit/pink.nix index 2719bc12253..75e99a06b1d 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/pink.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/pink.nix @@ -18,7 +18,6 @@ callPackage (import ./common.nix rec { }; homepage = "https://git.causal.agency/cgit-pink/about/"; - repo = "https://git.causal.agency/cgit-pink"; description = "cgit fork aiming for better maintenance"; maintainers = with lib.maintainers; [ qyliss sternenseemann ]; }) {} diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 60a7e3f229f..5b33714fc25 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; - repositories.git = "https://git.kernel.org/pub/scm/docs/man-pages/man-pages"; license = licenses.gpl2Plus; platforms = with platforms; unix; priority = 30; # if a package comes with its own man page, prefer it diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 19f6589ec95..704dcd2c73d 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; - repositories.git = "git://github.com/libass/libass.git"; }; } diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index e03416a221c..039d3af3760 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; - repositories.git = "https://github.com/Pulse-Eight/libcec.git"; license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index cba1d0ba4c5..d9594c90b62 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Platform library for libcec and Kodi addons"; homepage = "https://github.com/Pulse-Eight/platform"; - repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = lib.licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.titanous ]; diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index b30aa89b148..918ed20efaa 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - repositories.git = "git://git.gnupg.org/libgcrypt.git"; knownVulnerabilities = [ "CVE-2014-3591" "CVE-2015-0837" diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 9195019b055..eb4e8e94862 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -78,6 +78,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; - repositories.git = "git://git.gnupg.org/libgcrypt.git"; }; } diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index e47bb070a36..a84b617e4c0 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { included. ''; - repositories.git = "git://git.savannah.gnu.org/libidn.git"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ lsix ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 2b5434e723a..d8294f56adc 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { detailed information. ''; - repositories.git = "https://gitlab.com/jas/libidn2"; license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 6b28175a9b6..0f0fec46a27 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/lastfm/liblastfm"; - repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; platforms = platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 7ca9ec5acb6..3f2f02987fb 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; description = "C library implementing the OAuth secure authentication protocol"; homepage = "http://liboauth.sourceforge.net/"; - repositories.git = "https://github.com/x42/liboauth.git"; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 53699ab7eac..bd8a521544c 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.cypherpunks.ca/otr/"; - repositories.git = "git://git.code.sf.net/p/otr/libotr"; license = licenses.lgpl21; description = "Library for Off-The-Record Messaging"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index b23123f56ea..f977d72e724 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libusb.info/"; - repositories.git = "https://github.com/libusb/libusb-compat-0.1"; description = "cross-platform user-mode USB device library"; longDescription = '' libusb is a cross-platform user-mode library that provides access to USB devices. diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 69410cf2b98..1514d270210 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libusb.info/"; - repositories.git = "https://github.com/libusb/libusb"; description = "cross-platform user-mode USB device library"; longDescription = '' libusb is a cross-platform user-mode library that provides access to USB devices. diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9e39c2fd2a6..cda7c091908 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -331,7 +331,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://libvirt.org/"; - repositories.git = "git://libvirt.org/libvirt.git"; description = '' A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes) diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 9722210b9d1..95acc77922e 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = [ maintainers.linus ]; - repositories.git = "git://github.com/imneme/pcg-c.git"; broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 5f136a5e6b6..666d013adeb 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://taglib.org/"; - repositories.git = "git://github.com/taglib/taglib.git"; description = "A library for reading and editing audio file metadata"; longDescription = '' TagLib is a library for reading and editing the meta-data of several diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 0c0781bc577..5f652cb97f3 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "0.2.13"; src = fetchgit { - url = meta.repositories.git; + url = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; rev = "refs/tags/${pname}-${version}"; sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa"; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { meta = with lib; { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; - repositories.git = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index e8136be0eb4..62d26c09e51 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://cgdb.github.io/"; - repositories.git = "git://github.com/cgdb/cgdb.git"; - license = licenses.gpl2Plus; platforms = with platforms; linux ++ cygwin; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index ac00e341878..cadf9b9eeb1 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -40,7 +40,6 @@ in runCommand "systemtap-${kernel.version}-${version}" { nativeBuildInputs = [ makeWrapper ]; meta = { homepage = "https://sourceware.org/systemtap/"; - repositories.git = url; description = "Provides a scripting language for instrumentation on a live kernel plus user-space"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 8c115e9b312..b877c3aac2f 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation { meta = { description = "Open source clone of UFO: Enemy Unknown"; homepage = "https://openxcom.org"; - repositories.git = "https://github.com/SupSuper/OpenXcom.git"; maintainers = [ lib.maintainers.cpages ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3; diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index bf603e2f530..55c61c4cbd8 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://springlobby.info/"; - repositories.git = "git://github.com/springlobby/springlobby.git"; description = "Cross-platform lobby client for the Spring RTS project"; license = licenses.gpl2; maintainers = with maintainers; [ qknight domenkozar ]; diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix index f19f5a0275b..939ff36ef0c 100644 --- a/pkgs/os-specific/darwin/m-cli/default.nix +++ b/pkgs/os-specific/darwin/m-cli/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Swiss Army Knife for macOS"; inherit (src.meta) homepage; - repositories.git = "git://github.com/rgcr/m-cli.git"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index fb75b99f03d..ab9b7055fdd 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -135,6 +135,5 @@ in stdenv.mkDerivation rec { homepage = "http://www.bluez.org/"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.linux; - repositories.git = "https://git.kernel.org/pub/scm/bluetooth/bluez.git"; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 8124da489ae..3fdbaa9149a 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://hostap.epitest.fi"; - repositories.git = "git://w1.fi/hostap.git"; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; maintainers = with maintainers; [ ninjatrappeur hexa ]; diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 7de8046483d..9af2aba3d80 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A better i7 (and now i3, i5) reporting tool for Linux"; homepage = "https://github.com/DimitryAndric/i7z"; - repositories.git = "https://github.com/DimitryAndric/i7z.git"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 ]; # broken on ARM diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 1ac9cbe00ea..220f09ed8b5 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -301,7 +301,6 @@ let + ")"); license = lib.licenses.gpl2Only; homepage = "https://www.kernel.org/"; - repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"; maintainers = lib.teams.linux-kernel.members ++ [ maintainers.thoughtpolice ]; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 072b53b02ec..f8a519de847 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -4,7 +4,6 @@ assert mountPath != ""; let version = "0.5"; - git = "https://github.com/LemonBoy/ldm.git"; in stdenv.mkDerivation rec { pname = "ldm"; @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { # There is a stable release, but we'll use the lvm branch, which # contains important fixes for LVM setups. src = fetchgit { - url = meta.repositories.git; + url = "https://github.com/LemonBoy/ldm"; rev = "refs/tags/v${version}"; sha256 = "0lxfypnbamfx6p9ar5k9wra20gvwn665l4pp2j4vsx4yi5q7rw2n"; }; @@ -36,8 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight device mounter, with libudev as only dependency"; license = lib.licenses.mit; - platforms = lib.platforms.linux; - repositories.git = git; }; } diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 434aeeb3a19..c6d66427ab2 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -12,8 +12,6 @@ let meta = with lib; { homepage = "https://qpid.apache.org"; - repositories.git = "git://git.apache.org/qpid.git"; - repositories.svn = "http://svn.apache.org/repos/asf/qpid"; description = "An AMQP message broker and a C++ messaging API"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 824e90b4869..4461930b13c 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A distributed memory object caching system"; - repositories.git = "https://github.com/memcached/memcached.git"; homepage = "http://memcached.org/"; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 40cedd713ab..8ad5fa6b89b 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -240,7 +240,6 @@ let outputsToInstall = listOf str; position = str; available = bool; - repositories = attrsOf str; isBuildPythonPackage = platforms; schedulingPriority = int; isFcitxEngine = bool; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index c2425cf94ca..a3e6ff2fd94 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -92,6 +92,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; - repositories.git = "https://github.com/MidnightCommander/mc.git"; }; } diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index cff2d4df8e8..8c8972d0cb5 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sets your computer's clock from time servers on the Net"; homepage = "https://chrony.tuxfamily.org/"; - repositories.git = "git://git.tuxfamily.org/gitroot/chrony/chrony.git"; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; maintainers = with maintainers; [ fpletz thoughtpolice ]; diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index ab13d3f4ef9..a988a14cd45 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "0.0.11"; src = fetchgit { - url = meta.repositories.git; + url = "https://git.torproject.org/pluggable-transports/obfs4.git"; rev = "refs/tags/${pname}proxy-${version}"; sha256 = "sha256-VjJ/Pc1YjNB2iLnN/5CxuaxolcaR1IMWgoESMzOXU/g="; }; @@ -17,7 +17,6 @@ buildGoModule rec { meta = with lib; { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; - repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 255455811a6..06b3cbdbe80 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; - repositories.git = "git://repo.or.cz/socat.git"; platforms = platforms.unix; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ eelco ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index d6f2e20611d..f06877b99fe 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { See https://www.nitrokey.com/ for more information. ''; homepage = "https://github.com/Nitrokey/nitrokey-app"; - repositories.git = "https://github.com/Nitrokey/nitrokey-app.git"; license = licenses.gpl3; maintainers = with maintainers; [ kaiha fpletz ]; }; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 571b4e7f4da..14e0be73f01 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.torproject.org/"; - repositories.git = "https://git.torproject.org/git/tor"; description = "Anonymizing overlay network"; longDescription = '' diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 399afe7f75c..16eeca0ffad 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3.0"; src = fetchgit { - url = meta.repositories.git; + url = "https://git.torproject.org/torsocks.git"; rev = "refs/tags/v${version}"; sha256 = "0x0wpcigf22sjxg7bm0xzqihmsrz51hl4v8xf91qi4qnmr4ny1hb"; }; @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper to safely torify applications"; homepage = "https://github.com/dgoulet/torsocks"; - repositories.git = "https://git.torproject.org/torsocks.git"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index 61ef270df79..6cb349c546b 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; homepage = "https://www.freedesktop.org/wiki/Evemu/"; - repositories.git = "git://git.freedesktop.org/git/evemu"; license = with licenses; [ lgpl3Only gpl3Only ]; maintainers = [ maintainers.amorsillo ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index 48c68f8d2f2..a4b07f112ae 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -21,7 +21,6 @@ buildGoPackage rec { license = licenses.mit; maintainers = [ maintainers.tazjin ]; platforms = platforms.unix; - repositories.git = "git://github.com/DataDog/gohai.git"; longDescription = '' Gohai is a tool which collects an inventory of system diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index a790c600a9d..a8231864849 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { meta = with lib; { description = "Consolidate duplicate files via hardlinks"; homepage = "https://pagure.io/hardlink"; - repositories.git = "https://src.fedoraproject.org/cgit/rpms/hardlink.git"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index 2c1baa24f6f..cdbff1921a7 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -19,6 +19,5 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ tazjin ]; platforms = platforms.linux; - repositories.git = "git://github.com/aprilabank/mq-cli.git"; }; } diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 252167fcea9..27053e36ffa 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -20,7 +20,6 @@ python2Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/thorstenb/odpdown"; - repositories.git = "https://github.com/thorstenb/odpdown.git"; description = "Create nice-looking slides from your favourite text editor"; longDescription = '' Have a tool like pandoc, latex beamer etc, that you can write (or From 4a9109ff20fed1331f5b609c0bd7aee18544fed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Deifu=C3=9F?= Date: Thu, 24 Mar 2022 23:54:53 +0100 Subject: [PATCH 058/382] popeye: allow to build on darwin --- pkgs/applications/networking/cluster/popeye/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index e70856ef9d9..25fa2c4adc5 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -32,6 +32,5 @@ buildGoModule rec { changelog = "https://github.com/derailed/popeye/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.bryanasdev000 ]; - platforms = platforms.linux; }; } From 377f1c73b40b14fed7c6d6576b4e00411371aa9d Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 24 Mar 2022 15:39:37 -0700 Subject: [PATCH 059/382] linuxPackages.nvidia_x11: 510.54 -> 510.60.02 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 14526501785..246295eb734 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "510.54"; - sha256_64bit = "TCDezK4/40et/Q5piaMG+QJP2t+DGtwejmCFVnUzUWE="; - settingsSha256 = "ZWz5UN6Pa69NlmerKu30G+X8WfGlAwnVerDrO7TRO6w="; - persistencedSha256 = "MgWrBjKXJeRqF+ouT72tTiLPtn+lsS/Cp3oS61AWV8Q="; + version = "510.60.02"; + sha256_64bit = "sha256-qADfwFSQeP2Mbo5ngO+47uh4cuYFXH9fOGpHaM4H4AM="; + settingsSha256 = "sha256-Voa1JZ2qqJ1t+bfwKh/mssEi/hjzLTPwef2XG/gAC+0="; + persistencedSha256 = "sha256-THgK2GpRcttqSN2WxcuJu5My++Q+Y34jG8hm7daxhAQ="; } else legacy_390; From 64848cf76ed5b76bb92a8730119618138ed14ead Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Thu, 24 Mar 2022 16:17:26 -0700 Subject: [PATCH 060/382] cargo-spellcheck: 0.10.1 -> 0.11.0 --- pkgs/development/tools/rust/cargo-spellcheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 3b579d3ef9f..39d01fd1d31 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AKk25/j9Ao7ss8+2x+A5ohZ4P1wQ8uW5DVIBCHqFSPU="; + sha256 = "sha256-g8HsxY6moTLGdD1yBpzNNV+9uNdgbc0KG46ZxqwKH9A="; }; - cargoSha256 = "sha256-6zTZXSW8poePNZy48F6u5tF1LEDQt4f9qv7W/pdIBbI="; + cargoSha256 = "sha256-ehOeussyO/0lhIN8xfbEDMvgfooC0SzJ9id/skw1sdA="; buildInputs = lib.optional stdenv.isDarwin Security; From 641c2d3b7b6c2ded28399875400ffa0f1f62acc8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 12 Mar 2022 10:11:12 -0600 Subject: [PATCH 061/382] llvmPackages_14.openmp: fix install dirs patch --- .../llvm/14/openmp/gnu-install-dirs.patch | 52 ++----------------- 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch index 352a4692311..e85fde46ca3 100644 --- a/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch @@ -1,17 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7f11a05f5622..fb90f8f6a49b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -8,6 +8,8 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S - set(OPENMP_STANDALONE_BUILD TRUE) - project(openmp C CXX) - -+ include(GNUInstallDirs) -+ - # CMAKE_BUILD_TYPE was not set, default to Release. - if (NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -@@ -19,7 +21,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S +@@ -24,7 +24,7 @@ if (OPENMP_STANDALONE_BUILD) set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING "Suffix of lib installation directory, e.g. 64 => lib64") # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. @@ -20,7 +10,7 @@ index 7f11a05f5622..fb90f8f6a49b 100644 # Group test settings. set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING -@@ -30,7 +32,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S +@@ -35,7 +35,7 @@ if (OPENMP_STANDALONE_BUILD) else() set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) # If building in tree, we honor the same install suffix LLVM uses. @@ -29,10 +19,10 @@ index 7f11a05f5622..fb90f8f6a49b 100644 if (NOT MSVC) set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) -index 0e1ce2afd154..8b3810f83713 100644 +diff --git a/libomptarget/plugins/amdgpu/CMakeLists.txt b/libomptarget/plugins/amdgpu/CMakeLists.txt --- a/libomptarget/plugins/amdgpu/CMakeLists.txt +++ b/libomptarget/plugins/amdgpu/CMakeLists.txt -@@ -80,7 +80,7 @@ add_library(omptarget.rtl.amdgpu SHARED +@@ -74,7 +74,7 @@ add_library(omptarget.rtl.amdgpu SHARED # Install plugin under the lib destination folder. # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug @@ -42,7 +32,6 @@ index 0e1ce2afd154..8b3810f83713 100644 if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt -index 16ce0891ca23..db30ee9c769f 100644 --- a/libomptarget/plugins/ve/CMakeLists.txt +++ b/libomptarget/plugins/ve/CMakeLists.txt @@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND}) @@ -54,36 +43,3 @@ index 16ce0891ca23..db30ee9c769f 100644 target_link_libraries( "omptarget.rtl.${tmachine_libname}" -diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt -index e4f4e6e1e73f..1164b3b22b0e 100644 ---- a/runtime/src/CMakeLists.txt -+++ b/runtime/src/CMakeLists.txt -@@ -346,13 +346,13 @@ add_dependencies(libomp-micro-tests libomp-test-deps) - # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib - # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include - if(${OPENMP_STANDALONE_BUILD}) -- set(LIBOMP_HEADERS_INSTALL_PATH include) -+ set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") - else() - string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) - set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") - endif() - if(WIN32) -- install(TARGETS omp RUNTIME DESTINATION bin) -+ install(TARGETS omp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") - # Create aliases (regular copies) of the library for backwards compatibility - set(LIBOMP_ALIASES "libiomp5md") -diff --git a/tools/multiplex/CMakeLists.txt b/tools/multiplex/CMakeLists.txt -index 64317c112176..4002784da736 100644 ---- a/tools/multiplex/CMakeLists.txt -+++ b/tools/multiplex/CMakeLists.txt -@@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT) - add_library(ompt-multiplex INTERFACE) - target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) - -- install(FILES ompt-multiplex.h DESTINATION include) -+ install(FILES ompt-multiplex.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - add_subdirectory(tests) - endif() From 790c4f13dd8abb78f49e7ad68151602aa58209c6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 12 Mar 2022 10:22:04 -0600 Subject: [PATCH 062/382] openmp: new fix-find-tools patch --- .../llvm/14/openmp/fix-find-tool.patch | 45 ++++++------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch index b5d0e7b4177..7cdb7412137 100644 --- a/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch +++ b/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch @@ -1,8 +1,8 @@ diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt -index 242df638f80d..a4654e96371f 100644 +index d8b9e40802b8..3a8d76ab370f 100644 --- a/libomptarget/DeviceRTL/CMakeLists.txt +++ b/libomptarget/DeviceRTL/CMakeLists.txt -@@ -25,16 +25,16 @@ endif() +@@ -25,10 +25,10 @@ endif() if (LLVM_DIR) # Builds that use pre-installed LLVM have LLVM_DIR set. @@ -13,42 +13,23 @@ index 242df638f80d..a4654e96371f 100644 - find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) + REQUIRED) + find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - libomptarget_say("Building DeviceRTL. Using clang: ${CLANG_TOOL}") - elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) - # LLVM in-tree builds may use CMake target names to discover the tools. -- set(CLANG_TOOL $) -- set(LINK_TOOL $) -- set(OPT_TOOL $) -+ set(CLANG_TOOL $ REQUIRED) -+ set(LINK_TOOL $ REQUIRED) -+ set(OPT_TOOL $ REQUIRED) - libomptarget_say("Building DeviceRTL. Using clang from in-tree build") - else() - libomptarget_say("Not building DeviceRTL. No appropriate clang found") + if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL)) + libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} or opt: ${OPT_TOOL}") + return() diff --git a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt -index 3f4c02671aeb..be9f4677d7b5 100644 +index 406013073024..7402ab1ea292 100644 --- a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +++ b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt -@@ -38,16 +38,16 @@ endif() +@@ -38,9 +38,9 @@ endif() if (LLVM_DIR) # Builds that use pre-installed LLVM have LLVM_DIR set. - find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} -- NO_DEFAULT_PATH) +- find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) - find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ REQUIRED) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) ++ find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - libomptarget_say("Building AMDGCN device RTL. Using clang: ${CLANG_TOOL}") - elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) - # LLVM in-tree builds may use CMake target names to discover the tools. -- set(CLANG_TOOL $) -- set(LINK_TOOL $) -- set(OPT_TOOL $) -+ set(CLANG_TOOL $ REQUIRED) -+ set(LINK_TOOL $ REQUIRED) -+ set(OPT_TOOL $ REQUIRED) - libomptarget_say("Building AMDGCN device RTL. Using clang from in-tree build") - else() - libomptarget_say("Not building AMDGCN device RTL. No appropriate clang found") + if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL)) + libomptarget_say("Not building AMDGCN device RTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} or opt: ${OPT_TOOL}") + return() From 5e04d64aed16e8c068f7b41d2308aa450ab29dfd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 12 Mar 2022 10:21:48 -0600 Subject: [PATCH 063/382] openmp: no longer broken --- pkgs/development/compilers/llvm/14/openmp/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/14/openmp/default.nix b/pkgs/development/compilers/llvm/14/openmp/default.nix index 2b580a9c169..7add0c7ed46 100644 --- a/pkgs/development/compilers/llvm/14/openmp/default.nix +++ b/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation rec { # "All of the code is dual licensed under the MIT license and the UIUC # License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; - broken = true; # TODO: gnu-install-dirs.patch fails to apply }; } From 7151381aab2fab8f97033681dbb4e461b1780da1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 12 Mar 2022 10:44:46 -0600 Subject: [PATCH 064/382] openmp: tests, few failures --- .../compilers/llvm/14/openmp/default.nix | 13 +++++++++---- .../compilers/llvm/14/openmp/run-lit-directly.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch diff --git a/pkgs/development/compilers/llvm/14/openmp/default.nix b/pkgs/development/compilers/llvm/14/openmp/default.nix index 7add0c7ed46..6ccfde29e28 100644 --- a/pkgs/development/compilers/llvm/14/openmp/default.nix +++ b/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -5,6 +5,7 @@ , runCommand , cmake , llvm +, lit , clang-unwrapped , perl , pkg-config @@ -26,16 +27,20 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch ./fix-find-tool.patch + ./run-lit-directly.patch ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped ]; + nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped lit ]; buildInputs = [ llvm ]; - cmakeFlags = [ - "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails - ]; + doCheck = true; + checkTarget = "check-openmp"; + + preCheck = '' + patchShebangs ../tools/archer/tests/deflake.bash + ''; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch new file mode 100644 index 00000000000..1e952fdc36a --- /dev/null +++ b/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake +--- a/cmake/OpenMPTesting.cmake ++++ b/cmake/OpenMPTesting.cmake +@@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment) + if (${OPENMP_STANDALONE_BUILD}) + set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS}) + add_custom_target(${target} +- COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} ++ COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} + COMMENT ${comment} + DEPENDS ${ARG_DEPENDS} + USES_TERMINAL From 4f3116f7542d8937f99c312a787e50a16aae9e63 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 12 Mar 2022 10:49:51 -0600 Subject: [PATCH 065/382] openmp: drop fix-find-tool patch, set *_TOOL vars directly --- .../compilers/llvm/14/openmp/default.nix | 9 +++-- .../llvm/14/openmp/fix-find-tool.patch | 35 ------------------- 2 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch diff --git a/pkgs/development/compilers/llvm/14/openmp/default.nix b/pkgs/development/compilers/llvm/14/openmp/default.nix index 6ccfde29e28..e031897c1ff 100644 --- a/pkgs/development/compilers/llvm/14/openmp/default.nix +++ b/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch - ./fix-find-tool.patch ./run-lit-directly.patch ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped lit ]; + nativeBuildInputs = [ cmake perl pkg-config lit ]; buildInputs = [ llvm ]; doCheck = true; @@ -42,6 +41,12 @@ stdenv.mkDerivation rec { patchShebangs ../tools/archer/tests/deflake.bash ''; + cmakeFlags = [ + "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" + "-DOPT_TOOL=${llvm}/bin/opt" + "-DLINK_TOOL=${llvm}/bin/llvm-link" + ]; + meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; description = "Support for the OpenMP language"; diff --git a/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch deleted file mode 100644 index 7cdb7412137..00000000000 --- a/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt -index d8b9e40802b8..3a8d76ab370f 100644 ---- a/libomptarget/DeviceRTL/CMakeLists.txt -+++ b/libomptarget/DeviceRTL/CMakeLists.txt -@@ -25,10 +25,10 @@ endif() - - if (LLVM_DIR) - # Builds that use pre-installed LLVM have LLVM_DIR set. -- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} -- NO_DEFAULT_PATH) -- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ REQUIRED) -+ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL)) - libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} or opt: ${OPT_TOOL}") - return() -diff --git a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt -index 406013073024..7402ab1ea292 100644 ---- a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt -+++ b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt -@@ -38,9 +38,9 @@ endif() - - if (LLVM_DIR) - # Builds that use pre-installed LLVM have LLVM_DIR set. -- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -- find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) -+ find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) -+ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL)) - libomptarget_say("Not building AMDGCN device RTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} or opt: ${OPT_TOOL}") - return() From 2efcc3e297affa4f3dd20e526271faf9c2082c09 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 12 Mar 2022 11:06:42 -0600 Subject: [PATCH 066/382] openmp: disable tests due to failures --- pkgs/development/compilers/llvm/14/openmp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/14/openmp/default.nix b/pkgs/development/compilers/llvm/14/openmp/default.nix index e031897c1ff..622072b53e1 100644 --- a/pkgs/development/compilers/llvm/14/openmp/default.nix +++ b/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkg-config lit ]; buildInputs = [ llvm ]; - doCheck = true; + # Unsup:Pass:XFail:Fail + # 26:267:16:8 + doCheck = false; checkTarget = "check-openmp"; preCheck = '' From bf7d13dc4f54561bb2d8b026e25bda70362b789e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 22 Mar 2022 19:53:22 +0100 Subject: [PATCH 067/382] fetchpatch: add `relative` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows restricting patches to a specific subdirectory, à la `git diff --relative=subdir`. This cannot be done (cleanly) currently because the `includes` logic happens *after* `stripLen` is applied, so we can't match on `subdir/*`. This change adds a `relative` argument that makes this possible by filtering files before doing any processing, and setting `stripLen` and `extraPrefix` accordingly. --- .../coding-conventions.chapter.md | 5 ++- pkgs/build-support/fetchpatch/default.nix | 45 ++++++++++++------- pkgs/build-support/fetchpatch/tests.nix | 16 +++++++ 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index cfe8582e514..dac6d828ac0 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -540,10 +540,11 @@ If you do need to do create this sort of patch file, one way to do so is with gi If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`: +- `relative`: Similar to using `git-diff`'s `--relative` flag, only keep changes inside the specified directory, making paths relative to it. - `stripLen`: Remove the first `stripLen` components of pathnames in the patch. - `extraPrefix`: Prefix pathnames by this string. -- `excludes`: Exclude files matching this pattern. -- `includes`: Include only files matching this pattern. +- `excludes`: Exclude files matching these patterns (applies after the above arguments). +- `includes`: Include only files matching these patterns (applies after the above arguments). - `revert`: Revert the patch. Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `sha256` argument is changed as well. diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 6e25b2d6ecc..d46162c97ff 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -9,7 +9,8 @@ let # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 patchutils = buildPackages.patchutils_0_3_3; in -{ stripLen ? 0 +{ relative ? null +, stripLen ? 0 , extraPrefix ? null , excludes ? [] , includes ? [] @@ -17,7 +18,18 @@ in , postFetch ? "" , ... }@args: - +let + args' = if relative != null then { + stripLen = 1 + lib.length (lib.splitString "/" relative) + stripLen; + extraPrefix = if extraPrefix != null then extraPrefix else ""; + } else { + inherit stripLen extraPrefix; + }; +in let + inherit (args') stripLen extraPrefix; +in +lib.throwIfNot (excludes == [] || includes == []) + "fetchpatch: cannot use excludes and includes simultaneously" fetchurl ({ postFetch = '' tmpfile="$TMPDIR/patch" @@ -27,17 +39,19 @@ fetchurl ({ exit 1 fi - "${patchutils}/bin/lsdiff" "$out" \ - | sort -u | sed -e 's/[*?]/\\&/g' \ - | xargs -I{} \ - "${patchutils}/bin/filterdiff" \ - --include={} \ - --strip=${toString stripLen} \ - ${lib.optionalString (extraPrefix != null) '' - --addoldprefix=a/${extraPrefix} \ - --addnewprefix=b/${extraPrefix} \ - ''} \ - --clean "$out" > "$tmpfile" + "${patchutils}/bin/lsdiff" \ + ${lib.optionalString (relative != null) "-p1 -i ${lib.escapeShellArg relative}/'*'"} \ + "$out" \ + | sort -u | sed -e 's/[*?]/\\&/g' \ + | xargs -I{} \ + "${patchutils}/bin/filterdiff" \ + --include={} \ + --strip=${toString stripLen} \ + ${lib.optionalString (extraPrefix != null) '' + --addoldprefix=a/${lib.escapeShellArg extraPrefix} \ + --addnewprefix=b/${lib.escapeShellArg extraPrefix} \ + ''} \ + --clean "$out" > "$tmpfile" if [ ! -s "$tmpfile" ]; then echo "error: Normalized patch '$tmpfile' is empty (while the fetched file was not)!" 1>&2 @@ -64,5 +78,6 @@ fetchurl ({ ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" mv "$tmpfile" "$out" '' + postFetch; - meta.broken = excludes != [] && includes != []; -} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "revert" "postFetch"]) +} // builtins.removeAttrs args [ + "relative" "stripLen" "extraPrefix" "excludes" "includes" "revert" "postFetch" +]) diff --git a/pkgs/build-support/fetchpatch/tests.nix b/pkgs/build-support/fetchpatch/tests.nix index 4240b325d65..ff2b81bf3a1 100644 --- a/pkgs/build-support/fetchpatch/tests.nix +++ b/pkgs/build-support/fetchpatch/tests.nix @@ -5,4 +5,20 @@ url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; sha256 = "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; }; + + relative = invalidateFetcherByDrvHash fetchpatch { + url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; + relative = "include"; + sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; + }; + + full = invalidateFetcherByDrvHash fetchpatch { + url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; + relative = "test"; + stripLen = 1; + extraPrefix = "foo/bar/"; + excludes = [ "foo/bar/bernoulli_no_atomic_mp.cpp" ]; + revert = true; + sha256 = "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM="; + }; } From 199a706cafb387fe434c71c99e72bd6877b0140d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 01:47:07 +0000 Subject: [PATCH 068/382] v2ray-geoip: 202203170039 -> 202203240042 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 7e2b12e863f..1e0d35d5200 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202203170039"; + version = "202203240042"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "0b5c94c368dc5f70ebf995e87188aa8f40d45489"; - sha256 = "sha256-iaqU6CkrewICONps43nbZaUiM2aahSwfSD5bZz1P4Zc="; + rev = "d7ff77f883216595a4b6674e9507f305195dcda3"; + sha256 = "sha256-wSm24nXz4QIM8e7Z8d08NjluLaBWEdl09FNAL3GR9so="; }; installPhase = '' From 6139e6c99d44453baac337166511ddca718373c6 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 25 Mar 2022 10:48:12 +0800 Subject: [PATCH 069/382] v2ray-domain-list-community: 20220201175515 -> 20220324104603 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 1115edabcec..d6fe1a100e7 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220201175515"; + version = "20220324104603"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-vgw6i8djBQDV+fmkVe5CuKMwES/PXGoVe8cTgB5tflo="; + sha256 = "sha256-Bd/jwHZ+6cg/cgVggyFI+Nc0FZ9qxI5Rk+y7SmGB08M="; }; vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78="; meta = with lib; { From 1c46c8f7d854fd65853bacbbcf9b8e14746b7b7d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 25 Mar 2022 10:50:53 +0800 Subject: [PATCH 070/382] gnonograms: fix build with meson 0.61 --- pkgs/games/gnonograms/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/games/gnonograms/default.nix index cfe1085ca27..21f522d3418 100644 --- a/pkgs/games/gnonograms/default.nix +++ b/pkgs/games/gnonograms/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , vala , meson , ninja @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-2uXaybpCAm9cr0o7bqfhgD7mMNPwtv1X/PgnFnSDOl0="; }; + patches = [ + # Fix build with meson 0.61, can be removed on next release + # https://github.com/jeremypw/gnonograms/pull/45 + (fetchpatch { + url = "https://github.com/jeremypw/gnonograms/commit/0e90d8ff42d64a94002ec8500889bc4d7e06c1b6.patch"; + sha256 = "sha256-G/yqsZFmOA69A3E2CROMYAS5vmok/K5l1S/M2m8DMh4="; + }) + ]; + postPatch = '' patchShebangs meson/post_install.py ''; From c359339249ed1f1b94a6710bccf7e6c9df3daa63 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 25 Mar 2022 11:24:43 +0800 Subject: [PATCH 071/382] almanah: fix build with meson 0.61 --- pkgs/applications/misc/almanah/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index a4ef9b34318..5e4f4482354 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , atk , cairo , desktop-file-utils @@ -32,6 +34,16 @@ stdenv.mkDerivation rec { sha256 = "lMpDQOxlGljP66APR49aPbTZnfrGakbQ2ZcFvmiPMFo="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:2:5: ERROR: Function does not take positional arguments. + # Patch taken from https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/13 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; + sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext From 62883c1a5f6d78bad19e958437927a60d70ce8a2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 25 Mar 2022 05:39:37 +0200 Subject: [PATCH 072/382] qmmp: remove meta.repositories missed this --- pkgs/applications/audio/qmmp/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 460b97479c6..bed02f77e7b 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -58,6 +58,5 @@ mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - repositories.svn = "https://svn.code.sf.net/p/qmmp-dev/code"; }; } From af9f2e4611802b99569d20e64ae6d53e9988f421 Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 24 Mar 2022 20:41:39 -0700 Subject: [PATCH 073/382] librewolf: 98.0-1 -> 98.0.2-1 --- .../networking/browsers/firefox/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index 9e40e459d32..f2435308948 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "98.0-1", + "packageVersion": "98.0.2-1", "source": { - "rev": "98.0-1", - "sha256": "1z42a42d6z0gyc5i0pamcqq5bak6pgg1ldvlrjdyjnpvda74s0fn" + "rev": "98.0.2-1", + "sha256": "033l6mjmhfhf7b8p652s7ziw8zz725082hhzzvr3ahi498wshkx6" }, "firefox": { - "version": "98.0", - "sha512": "5b9186dd2a5dee5f2d2a2ce156fc06e2073cf71a70891a294cf3358218592f19ec3413d33b68d6f38e3cc5f940213e590a188e2b6efc39f416e90a55f89bfd9b" + "version": "98.0.2", + "sha512": "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e" } } From 08353710a97da6de25d0a6036cf785da161cdc93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 04:04:09 +0000 Subject: [PATCH 074/382] cudatext: 1.158.2 -> 1.159.0 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 510873f200e..f22e2407cf2 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.158.2"; + version = "1.159.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-YrRG+LaG39q/6Ry3cXo9XUwtvokkBl96XuQfE22QxZI="; + sha256 = "sha256-DRVJLzAdhw+ke+B2KFlkgLXgU4+Mq3LQ0PRYg52Aq/o="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 5e0f37c78b6..732870b8997 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.03.17", - "sha256": "sha256-aJZGHodydkqfe2BJLKWUzIX6vbdiGKs4z5ZqtteM6NU=" + "rev": "2022.03.23", + "sha256": "sha256-D/pQ4TSWUaL97Nau3bGi7rc8MxnvuoDcD7HDNEDwmsk=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.03.17", - "sha256": "sha256-sWRKRhUYf07TIrVWRqtpsYPZu0dPm0EhSIqoDLmkG0Y=" + "rev": "2022.03.23", + "sha256": "sha256-QXq75VoAnYqAhe3Fvsz1szZyBz4dHEpYJZqTSCR80v8=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.03.17", - "sha256": "sha256-FndLHJuCOyFr0IGUL4zFRjkEvTyNF3tHUO/Wx5IaV2Y=" + "rev": "2022.03.23", + "sha256": "sha256-m1rkWvRC1i1nLPIhiG6g8LGU96vTuGGqLFrSzw9A9x0=" }, "Python-for-Lazarus": { "owner": "Alexey-T", From 1eae4d84686f2cf687c154605479f259e6c8faeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 04:58:49 +0000 Subject: [PATCH 075/382] flexget: 3.3.3 -> 3.3.4 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f4a2306017a..96d3e773c88 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.3"; + version = "3.3.4"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - hash = "sha256-a76x4Klad3lct2M9RxSroUYKmEX7lPqDN+dFvfjavo8="; + hash = "sha256-/nuY8+/RMM7ASke+NXb95yu+FeQHawCdgqVsBrk/KZ8="; }; postPatch = '' From a9efbe5c5e6ff88952bd007fe5d62596df04860f Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 25 Mar 2022 09:44:19 +0000 Subject: [PATCH 076/382] just: 1.1.0 -> 1.1.1 --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 29694c08ed8..c11d386d746 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-hbBAbk0n80BbbIx81427bRz4x6enBsxJ0bHJKww44oc="; + sha256 = "sha256-hgXMWQ7UlGyeb/j7V/Uw4gZjk/r1hA7lMjVL8i8st7o="; }; - cargoSha256 = "sha256-lZyFoOCWUE2ahU/lS+bIdrZXNm/sFEfLsQm1BxREg5w="; + cargoSha256 = "sha256-QJruh4voCB/q7xh5I6XnVtKA4Jbn9U84Mt2pHte7Kog="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 37e093f5f18d90cf21f1453df73917c253cfeb77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 22 Mar 2022 20:44:27 +0100 Subject: [PATCH 077/382] haskellPackages.hledger-lib: use fetchpatch's `relative` argument We can drop `includes` since there's only one file in that directory. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b95f53758fd..59e3b34a4e0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -859,9 +859,8 @@ self: super: { (pkgs.fetchpatch { name = "hledger-properly-escape-quotes-csv.patch"; url = "https://github.com/simonmichael/hledger/commit/c9a72e1615e2ddc2824f2e248456e1042eb31e1d.patch"; - sha256 = "10knvrd5bl9nrmi27i0pm82sfr64jy04xgbjp228qywyijpr3pqv"; - includes = [ "Hledger/Read/CsvReader.hs" ]; - stripLen = 1; + relative = "hledger-lib"; + sha256 = "sha256-gjYYo0eq1gWNAAFF3dKt9QDq0VpLnN5/648r/NXEPVE="; }) super.hledger-lib; From 92cb4fc15b05502e5228a09f47dafac5bbb819d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 22 Mar 2022 20:47:46 +0100 Subject: [PATCH 078/382] haskellPackages.yi-language: use fetchpatch's `relative` argument We can drop `includes` since there's only one file in that directory. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 59e3b34a4e0..25b80f8c25d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1818,10 +1818,8 @@ self: super: { # Presumably to be removed at the next release yi-language = appendPatch (pkgs.fetchpatch { url = "https://github.com/yi-editor/yi/commit/0d3bcb5ba4c237d57ce33a3dc39b63c56d890765.patch"; - sha256 = "0r4mzngs0x1akqpajzx7ssa9rax977fvj5ra8d3grfbpx6z0nm01"; - includes = [ "yi-language.cabal" ]; - stripLen = 2; - extraPrefix = ""; + relative = "yi-language"; + sha256 = "sha256-AVQLvul3ufxGQyoXud05qauclNanf6kunip0oJ/9lWQ="; }) super.yi-language; # https://github.com/ghcjs/jsaddle/issues/123 From 9e7ec276c6822847cd25a515bff2e1bae6b6a286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 22 Mar 2022 20:56:40 +0100 Subject: [PATCH 079/382] cgal_4: use fetchpatch's `relative` argument The `gcc-12-prereq.patch` patch now includes the entire `CGAL_Core` subdirectory, but the patch only fixes warnings so this is fine. --- pkgs/development/libraries/CGAL/4.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index 7380a85248f..9c0305ec077 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -18,18 +18,14 @@ stdenv.mkDerivation rec { (fetchpatch { name = "gcc-12-prereq.patch"; url = "https://github.com/CGAL/cgal/commit/4581f1b7a8e97d1a136830e64b77cdae3546c4bf.patch"; - sha256 = "1gzrvbrwxylv80v0m3j2s1znlysmr69lp3ggagnh38lp6423i6pq"; - # Upstream slightly reordered directory structure since. - stripLen = 1; - # Fill patch does not apply: touches too many parts of the source. - includes = [ "include/CGAL/CORE/BigFloatRep.h" ]; + relative = "CGAL_Core"; # Upstream slightly reordered directory structure since. + sha256 = "sha256-4+7mzGSBwAv5RHBQPAecPPKNN/LQBgvYq5mq+fHAteo="; }) (fetchpatch { name = "gcc-12.patch"; url = "https://github.com/CGAL/cgal/commit/6680a6e6f994b2c5b9f068eb3014d12ee1134d53.patch"; - sha256 = "1c0h1lh8zng60yx78qc8wx714b517mil8mac87v6xr21q0b11wk7"; - # Upstream slightly reordered directory structure since. - stripLen = 1; + relative = "CGAL_Core"; # Upstream slightly reordered directory structure since. + sha256 = "sha256-8kxJDT47jXI9kQNFI/ARWl9JBNS4AfU57/D0tYlgW0M="; }) ]; From a6bc988f00aab57694d8db53284617a34a7f8d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 22 Mar 2022 21:01:00 +0100 Subject: [PATCH 080/382] boost177: use fetchpatch's `relative` argument We can drop `includes` since there's only one file in that directory. --- pkgs/development/libraries/boost/generic.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index bad87fba8c6..d729602b9d5 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -130,10 +130,8 @@ stdenv.mkDerivation { ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch ++ optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; + relative = "include"; sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; - stripLen = 2; - extraPrefix = ""; - includes = [ "boost/math/special_functions/detail/bernoulli_details.hpp" ]; }); meta = { From 7d0e21c77e3c8b1d6dcd26a3710922087fe99df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 25 Mar 2022 11:36:29 +0100 Subject: [PATCH 081/382] nixos/test-runner: Allow writing to qemu stdin --- .../writing-nixos-tests.section.md | 13 ++++++++ .../writing-nixos-tests.section.xml | 28 +++++++++++++++++ nixos/lib/test-driver/test_driver/machine.py | 30 ++++++++++++++++++- 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 7de57d0d2a3..433e1906f77 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -158,6 +158,12 @@ The following methods are available on machine objects: e.g., `send_chars("foobar\n")` will type the string `foobar` followed by the Enter key. +`send_console` + +: Send keys to the kernel console. This allows interaction with the systemd + emergency mode, for example. Takes a string that is sent, e.g., + `send_console("\n\nsystemctl default\n")`. + `execute` : Execute a shell command, returning a list `(status, stdout)`. @@ -272,6 +278,13 @@ The following methods are available on machine objects: Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends the guest session. +`console_interact` + +: Allows you to directly interact with QEMU's stdin. This should + only be used during test development, not in production tests. + Output from QEMU is only read line-wise. `Ctrl-c` kills QEMU and + `Ctrl-d` closes console and returns to the test runner. + To test user units declared by `systemd.user.services` the optional `user` argument can be used: diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml index 45c9c40c609..4f856f98f2a 100644 --- a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -261,6 +261,19 @@ start_all() + + + send_console + + + + Send keys to the kernel console. This allows interaction + with the systemd emergency mode, for example. Takes a string + that is sent, e.g., + send_console("\n\nsystemctl default\n"). + + + execute @@ -502,6 +515,21 @@ machine.systemctl("list-jobs --no-pager", "any-user") # spaw + + + console_interact + + + + Allows you to directly interact with QEMU’s stdin. This + should only be used during test development, not in + production tests. Output from QEMU is only read line-wise. + Ctrl-c kills QEMU and + Ctrl-d closes console and returns to the + test runner. + + + To test user units declared by diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 569a0f3c61e..f3e615fe5bf 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -198,7 +198,7 @@ class StartCommand: ) -> subprocess.Popen: return subprocess.Popen( self.cmd(monitor_socket_path, shell_socket_path), - stdin=subprocess.DEVNULL, + stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, @@ -558,6 +558,28 @@ class Machine: pass_fds=[self.shell.fileno()], ) + def console_interact(self) -> None: + """Allows you to interact with QEMU's stdin + + The shell can be exited with Ctrl+D. Note that Ctrl+C is not allowed to be used. + QEMU's stdout is read line-wise. + + Should only be used during test development, not in the production test.""" + self.log("Terminal is ready (there is no prompt):") + + assert self.process + assert self.process.stdin + + while True: + try: + char = sys.stdin.buffer.read(1) + except KeyboardInterrupt: + break + if char == b"": # ctrl+d + self.log("Closing connection to the console") + break + self.send_console(char.decode()) + def succeed(self, *commands: str, timeout: Optional[int] = None) -> str: """Execute each command and check that it succeeds.""" output = "" @@ -834,6 +856,12 @@ class Machine: self.send_monitor_command("sendkey {}".format(key)) time.sleep(0.01) + def send_console(self, chars: str) -> None: + assert self.process + assert self.process.stdin + self.process.stdin.write(chars.encode()) + self.process.stdin.flush() + def start(self) -> None: if self.booted: return From e440c8b3c3d55570d46f54a7382b304f31fdb7f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 11:19:56 +0000 Subject: [PATCH 082/382] python310Packages.asyncsleepiq: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/asyncsleepiq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix index 93b4aca2aa7..7eaac649064 100644 --- a/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bE9eOjOLERnioOunIBN7Hc/Nvs1zDXMSMzqZsVRg6Jo="; + sha256 = "sha256-pIfEdNmtnwA+PE3lXVd7Qd8Igj+/aqZmuDqFs60PxgY="; }; propagatedBuildInputs = [ From 28a3079831a92096b1fd45c18ad55453f14695dd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 21 Mar 2022 14:33:25 +0800 Subject: [PATCH 083/382] airshipper: add libGL to get gfx debug output --- pkgs/games/airshipper/default.nix | 7 ++- pkgs/games/airshipper/default.nix.orig | 84 ++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 pkgs/games/airshipper/default.nix.orig diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 4474d09659e..4fc37b0ca25 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -3,6 +3,7 @@ , fetchFromGitLab , fetchpatch , openssl +, libGL , vulkan-loader , wayland , wayland-protocols @@ -49,14 +50,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; postInstall = '' - mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" - cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" - cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" + install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop" + install -Dm444 "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" ''; postFixup = let libPath = lib.makeLibraryPath [ + libGL vulkan-loader wayland wayland-protocols diff --git a/pkgs/games/airshipper/default.nix.orig b/pkgs/games/airshipper/default.nix.orig new file mode 100644 index 00000000000..4474d09659e --- /dev/null +++ b/pkgs/games/airshipper/default.nix.orig @@ -0,0 +1,84 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, fetchpatch +, openssl +, vulkan-loader +, wayland +, wayland-protocols +, libxkbcommon +, libX11 +, libXrandr +, libXi +, libXcursor +, pkg-config +, makeWrapper +}: + +rustPlatform.buildRustPackage rec { + pname = "airshipper"; + version = "0.7.0"; + + src = fetchFromGitLab { + owner = "Veloren"; + repo = "airshipper"; + rev = "v${version}"; + sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug="; + }; + + patches = [ + # this *should* be merged in time for the release following 0.7.0 + (fetchpatch { + url = "https://github.com/veloren/Airshipper/commit/97fc986ab4cbf59f2c764f647710f19db86031b4.patch"; + hash = "sha256-Sg5et+yP6Z44wV/t9zqKLpg1C0cq6rV+3WrzAH4Za3U="; + }) + ]; + + cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw="; + + buildInputs = [ + openssl + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + + postInstall = '' + mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" + cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" + cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" + ''; + + postFixup = + let + libPath = lib.makeLibraryPath [ + vulkan-loader + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + in + '' + patchelf --set-rpath "${libPath}" "$out/bin/airshipper" + ''; + + doCheck = false; + cargoBuildFlags = [ "--package" "airshipper" ]; + cargoTestFlags = [ "--package" "airshipper" ]; + + meta = with lib; { + description = "Provides automatic updates for the voxel RPG Veloren."; + homepage = "https://www.veloren.net"; + license = licenses.gpl3; + maintainers = with maintainers; [ yusdacra ]; + }; +} From 8d2df0f499865996db4a8b1819b20afd37d2e7bc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 23 Mar 2022 15:27:39 +0800 Subject: [PATCH 084/382] remove junk --- pkgs/games/airshipper/default.nix.orig | 84 -------------------------- 1 file changed, 84 deletions(-) delete mode 100644 pkgs/games/airshipper/default.nix.orig diff --git a/pkgs/games/airshipper/default.nix.orig b/pkgs/games/airshipper/default.nix.orig deleted file mode 100644 index 4474d09659e..00000000000 --- a/pkgs/games/airshipper/default.nix.orig +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitLab -, fetchpatch -, openssl -, vulkan-loader -, wayland -, wayland-protocols -, libxkbcommon -, libX11 -, libXrandr -, libXi -, libXcursor -, pkg-config -, makeWrapper -}: - -rustPlatform.buildRustPackage rec { - pname = "airshipper"; - version = "0.7.0"; - - src = fetchFromGitLab { - owner = "Veloren"; - repo = "airshipper"; - rev = "v${version}"; - sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug="; - }; - - patches = [ - # this *should* be merged in time for the release following 0.7.0 - (fetchpatch { - url = "https://github.com/veloren/Airshipper/commit/97fc986ab4cbf59f2c764f647710f19db86031b4.patch"; - hash = "sha256-Sg5et+yP6Z44wV/t9zqKLpg1C0cq6rV+3WrzAH4Za3U="; - }) - ]; - - cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw="; - - buildInputs = [ - openssl - wayland - wayland-protocols - libxkbcommon - libX11 - libXrandr - libXi - libXcursor - ]; - nativeBuildInputs = [ pkg-config makeWrapper ]; - - postInstall = '' - mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" - cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" - cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" - ''; - - postFixup = - let - libPath = lib.makeLibraryPath [ - vulkan-loader - wayland - wayland-protocols - libxkbcommon - libX11 - libXrandr - libXi - libXcursor - ]; - in - '' - patchelf --set-rpath "${libPath}" "$out/bin/airshipper" - ''; - - doCheck = false; - cargoBuildFlags = [ "--package" "airshipper" ]; - cargoTestFlags = [ "--package" "airshipper" ]; - - meta = with lib; { - description = "Provides automatic updates for the voxel RPG Veloren."; - homepage = "https://www.veloren.net"; - license = licenses.gpl3; - maintainers = with maintainers; [ yusdacra ]; - }; -} From c08900703de57dbe9e551e2dedaf3b8d292559da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 11:54:29 +0000 Subject: [PATCH 085/382] python310Packages.azure-mgmt-containerservice: 17.0.0 -> 18.0.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 57fe4655aee..b8f8f493421 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "17.0.0"; + version = "18.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8="; + sha256 = "sha256-b4AwcnSp6JOtG8VaBbUN7d/NIhHN2TPnyjzCUVhMOzg="; }; propagatedBuildInputs = [ From 1abf65b169051381ef1f131b947fc12de46571cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Mar 2022 13:45:30 +0100 Subject: [PATCH 086/382] python3Packages.azure-mgmt-containerservice: disable on older Python releases --- .../azure-mgmt-containerservice/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index b8f8f493421..00e24a2d9f1 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -6,12 +6,15 @@ , azure-common , azure-mgmt-core , azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; version = "18.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -24,14 +27,14 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.containerservice" ]; + pythonImportsCheck = [ + "azure.mgmt.containerservice" + ]; meta = with lib; { description = "This is the Microsoft Azure Container Service Management Client Library"; From 661ee6b46824286320843905569061c4a5a2594b Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Fri, 4 Mar 2022 11:30:58 +0100 Subject: [PATCH 087/382] ocamlPackages treewide: Add missing inputs --- pkgs/development/ocaml-modules/batteries/default.nix | 4 ++-- pkgs/development/ocaml-modules/conduit/default.nix | 3 +-- pkgs/development/ocaml-modules/elina/default.nix | 4 ++-- pkgs/development/ocaml-modules/gmetadom/default.nix | 4 ++-- pkgs/development/ocaml-modules/hack_parallel/default.nix | 2 +- pkgs/development/ocaml-modules/mccs/default.nix | 2 +- pkgs/development/ocaml-modules/mirage-logs/default.nix | 4 ++-- pkgs/development/ocaml-modules/mirage-profile/default.nix | 4 ++-- pkgs/development/ocaml-modules/mlgmpidl/default.nix | 5 ++--- pkgs/development/ocaml-modules/odoc-parser/default.nix | 2 +- pkgs/development/ocaml-modules/opium_kernel/default.nix | 3 ++- pkgs/development/ocaml-modules/pcap-format/default.nix | 3 ++- pkgs/development/ocaml-modules/pipebang/default.nix | 2 +- pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 4 +++- pkgs/development/ocaml-modules/ppx_cstubs/default.nix | 8 +++++--- .../ocaml-modules/ppx_deriving_protobuf/default.nix | 6 ++++-- .../ocaml-modules/shared-memory-ring/default.nix | 2 ++ pkgs/development/ocaml-modules/ulex/default.nix | 1 + 18 files changed, 36 insertions(+), 27 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 184f10a52be..865518ec29c 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, num, ounit +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, ounit , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - checkInputs = [ qtest ounit ]; + checkInputs = [ qtest ounit qcheck ]; propagatedBuildInputs = [ num ]; strictDeps = !doCheck; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 1dc28b2b5f7..6261ba2801b 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -15,8 +15,7 @@ buildDunePackage rec { sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537"; }; - buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ]; + propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ppx_sexp_conv ]; meta = { description = "A network connection establishment library"; diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index df7f140e545..ec4199cc06e 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc"; }; - nativeBuildInputs = [ perl ocaml findlib ]; + nativeBuildInputs = [ perl ocaml findlib camlidl ]; - propagatedBuildInputs = [ apron camlidl gmp mpfr ]; + propagatedBuildInputs = [ apron gmp mpfr ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 50be2adcb38..fe4f85a0024 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ocaml findlib ]; - buildInputs = [ gdome2 libxslt]; - propagatedBuildInputs = [gdome2]; + buildInputs = [ libxslt ]; + propagatedBuildInputs = [ gdome2 ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix index f9bc6777212..122ee2149f3 100644 --- a/pkgs/development/ocaml-modules/hack_parallel/default.nix +++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ core core_kernel sqlite ]; + propagatedBuildInputs = [ core core_kernel sqlite ]; meta = { description = diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix index beadceff02b..50abdf631db 100644 --- a/pkgs/development/ocaml-modules/mccs/default.nix +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { useDune2 = true; - buildInputs = [ + propagatedBuildInputs = [ cudf ]; diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix index 2a7670ce372..7aabd51b819 100644 --- a/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, buildDunePackage , logs, lwt, mirage-clock, mirage-profile, ptime -, alcotest +, alcotest, stdlib-shims }: buildDunePackage rec { @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1"; }; - propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime ]; + propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix index c6ca730bf3c..ef856e02127 100644 --- a/pkgs/development/ocaml-modules/mirage-profile/default.nix +++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage -, ppx_cstruct +, ppx_cstruct, stdlib-shims , cstruct, lwt }: @@ -15,7 +15,7 @@ buildDunePackage rec { }; buildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ cstruct lwt ]; + propagatedBuildInputs = [ cstruct lwt stdlib-shims ]; meta = with lib; { description = "Collect runtime profiling information in CTF format"; diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index d12329b811e..33f9f2d8e6b 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza"; }; - nativeBuildInputs = [ perl ocaml findlib mpfr camlidl ]; + nativeBuildInputs = [ perl ocaml findlib camlidl ]; buildInputs = [ gmp mpfr ]; strictDeps = true; @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { ]; postConfigure = '' - sed -i Makefile \ - -e 's|/bin/rm|rm|' + substituteInPlace Makefile --replace "/bin/rm" "rm" mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; diff --git a/pkgs/development/ocaml-modules/odoc-parser/default.nix b/pkgs/development/ocaml-modules/odoc-parser/default.nix index 7a2b5abd974..9e4e4bc8d1d 100644 --- a/pkgs/development/ocaml-modules/odoc-parser/default.nix +++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { useDune2 = true; - buildInputs = [ astring result ]; + propagatedBuildInputs = [ astring result ]; meta = { description = "Parser for Ocaml documentation comments"; diff --git a/pkgs/development/ocaml-modules/opium_kernel/default.nix b/pkgs/development/ocaml-modules/opium_kernel/default.nix index c7bfe1e7306..6b51443df23 100644 --- a/pkgs/development/ocaml-modules/opium_kernel/default.nix +++ b/pkgs/development/ocaml-modules/opium_kernel/default.nix @@ -9,6 +9,7 @@ , ezjsonm , hmap , sexplib +, fieldslib }: buildDunePackage rec { @@ -31,7 +32,7 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ - hmap cohttp-lwt ezjsonm sexplib + hmap cohttp-lwt ezjsonm sexplib fieldslib ]; meta = { diff --git a/pkgs/development/ocaml-modules/pcap-format/default.nix b/pkgs/development/ocaml-modules/pcap-format/default.nix index f8bb6f4f6b2..ae093cc7817 100644 --- a/pkgs/development/ocaml-modules/pcap-format/default.nix +++ b/pkgs/development/ocaml-modules/pcap-format/default.nix @@ -1,6 +1,6 @@ { lib, buildDunePackage, fetchurl , ppx_cstruct, ppx_tools -, cstruct, ounit, mmap +, cstruct, ounit, mmap, stdlib-shims }: buildDunePackage rec { @@ -24,6 +24,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct + stdlib-shims ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix index 251aeb8de8e..e2bd4d3ec5c 100644 --- a/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -15,7 +15,7 @@ buildOcaml rec { strictDeps = true; - buildInputs = [ camlp4 ]; + propagatedBuildInputs = [ camlp4 ]; meta = with lib; { homepage = "https://github.com/janestreet/pipebang"; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 4f2e4693357..8c0276bc9a7 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims, num }: stdenv.mkDerivation rec { version = "0.7.7"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ piqi stdlib-shims ]; + checkInputs = [ num ]; + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index f4794eea76e..f2c844ea048 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -27,17 +27,19 @@ buildDunePackage rec { sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w"; }; - nativeBuildInputs = [ cppo ]; + nativeBuildInputs = [ cppo findlib ]; buildInputs = [ bigarray-compat containers - ctypes integers num ppxlib re - findlib + ]; + + propagatedBuildInputs = [ + ctypes ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix index 6f23af44b94..43cc2992c2a 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage, cppo, ppx_deriving -, ppxlib +, ppxlib, dune-configurator }: buildDunePackage rec { @@ -13,7 +13,9 @@ buildDunePackage rec { sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj"; }; - buildInputs = [ cppo ppxlib ppx_deriving ]; + nativeBuildInputs = [ cppo ]; + buildInputs = [ ppxlib dune-configurator ]; + propagatedBuildInputs = [ ppx_deriving ]; meta = with lib; { homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 3a96d4adee4..17dd6183c0d 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -5,6 +5,7 @@ , mirage-profile , cstruct , ounit +, stdlib-shims }: buildDunePackage rec { @@ -25,6 +26,7 @@ buildDunePackage rec { propagatedBuildInputs = [ mirage-profile cstruct + stdlib-shims ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 9a5848db3f7..d08f2c4c0ae 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + propagatedBuildInputs = [ camlp4 ]; strictDeps = true; From d6e2e39a6e5998e4ad4cbd9d422835b365dfa763 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Fri, 4 Mar 2022 11:34:13 +0100 Subject: [PATCH 088/382] ocamlPackages.nonstd,facile: run `dune upgrade` for newer ocaml versions This allows us to build the packages on OCaml >=4.12 Co-authored-by: Sandro --- pkgs/development/ocaml-modules/facile/default.nix | 7 ++++--- pkgs/development/ocaml-modules/nonstd/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix index df228603e9f..3eab7d3417f 100644 --- a/pkgs/development/ocaml-modules/facile/default.nix +++ b/pkgs/development/ocaml-modules/facile/default.nix @@ -1,11 +1,9 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, ocaml }: buildDunePackage rec { pname = "facile"; version = "1.1.4"; - useDune2 = false; - src = fetchurl { url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz"; sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp"; @@ -13,6 +11,9 @@ buildDunePackage rec { doCheck = true; + useDune2 = lib.versionAtLeast ocaml.version "4.12"; + postPatch = lib.optionalString useDune2 "dune upgrade"; + meta = { homepage = "http://opti.recherche.enac.fr/facile/"; license = lib.licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index 82b1feed540..696cdff5219 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -1,11 +1,9 @@ -{ lib, fetchzip, buildDunePackage }: +{ lib, fetchzip, buildDunePackage, ocaml }: buildDunePackage rec { pname = "nonstd"; version = "0.0.3"; - useDune2 = false; - minimalOCamlVersion = "4.02"; src = fetchzip { @@ -13,6 +11,8 @@ buildDunePackage rec { sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46"; }; + useDune2 = lib.versionAtLeast ocaml.version "4.12"; + postPatch = lib.optionalString useDune2 "dune upgrade"; doCheck = true; meta = with lib; { From 7d2ded8c0fa007233be1a76f192fbd389ac41f80 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Mar 2022 22:16:40 +0100 Subject: [PATCH 089/382] gnome-desktop: Move into top-level --- pkgs/applications/accessibility/squeekboard/default.nix | 3 ++- pkgs/applications/misc/eos-installer/default.nix | 4 ++-- pkgs/applications/misc/lutris/fhsenv.nix | 2 +- pkgs/applications/misc/phoc/default.nix | 3 ++- .../networking/instant-messengers/chatty/default.nix | 4 ++-- .../mailreaders/evolution/evolution/default.nix | 3 ++- pkgs/applications/video/pitivi/default.nix | 3 ++- pkgs/applications/window-managers/phosh/default.nix | 3 ++- pkgs/desktops/gnome/default.nix | 5 ++--- pkgs/desktops/gnome/misc/gnome-tweaks/default.nix | 3 ++- pkgs/desktops/pantheon/default.nix | 8 ++------ .../libraries}/gnome-desktop/bubblewrap-paths.patch | 0 .../libraries}/gnome-desktop/default.nix | 1 - pkgs/development/libraries/libhandy/0.x.nix | 4 ++-- .../libraries/xdg-desktop-portal-gtk/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 3 ++- 16 files changed, 27 insertions(+), 25 deletions(-) rename pkgs/{desktops/gnome/core => development/libraries}/gnome-desktop/bubblewrap-paths.patch (100%) rename pkgs/{desktops/gnome/core => development/libraries}/gnome-desktop/default.nix (97%) diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index db139ab39d0..94129d05288 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , gnome +, gnome-desktop , glib , gtk3 , wayland @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome.gnome-desktop + gnome-desktop wayland wayland-protocols libxml2 diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix index 02d629412a3..8234a77ba14 100644 --- a/pkgs/applications/misc/eos-installer/default.nix +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config -, gnome, gnupg, gtk3, udisks +, gnome-desktop, gnupg, gtk3, udisks }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf autoconf-archive automake glib intltool libtool pkg-config ]; - buildInputs = [ gnome.gnome-desktop gtk3 udisks ]; + buildInputs = [ gnome-desktop gtk3 udisks ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 88b3d253114..0ff5b4a6a62 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop gnome.libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 7acdcdf02c4..e1dd464edbc 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -9,6 +9,7 @@ , wrapGAppsHook , libinput , gnome +, gnome-desktop , glib , gtk3 , wayland @@ -68,7 +69,7 @@ in stdenv.mkDerivation rec { libinput glib gtk3 - gnome.gnome-desktop + gnome-desktop # For keybindings settings schemas gnome.mutter wayland diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index f9cec37a506..97282c76d04 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -11,7 +11,7 @@ , evolution-data-server , feedbackd , glibmm -, gnome +, gnome-desktop , gspell , gtk3 , json-glib @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { evolution-data-server feedbackd glibmm - gnome.gnome-desktop + gnome-desktop gspell gtk3 json-glib diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 9aac3db3594..677ad7c8b49 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -25,6 +25,7 @@ , gcr , sqlite , gnome +, gnome-desktop , librsvg , gdk-pixbuf , libsecret @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib glib-networking - gnome.gnome-desktop + gnome-desktop gsettings-desktop-schemas gst_all_1.gst-plugins-base gst_all_1.gstreamer diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index f22dd77b332..7ae463b9873 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -12,6 +12,7 @@ , libpeas , librsvg , gnome +, gnome-desktop , libnotify , gsound , meson @@ -52,7 +53,7 @@ python3Packages.buildPythonApplication rec { gtk3 libpeas librsvg - gnome.gnome-desktop + gnome-desktop gsound gnome.adwaita-icon-theme gsettings-desktop-schemas diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 2c01a37aa43..90155fbca1f 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -14,6 +14,7 @@ , glib , gtk3 , gnome +, gnome-desktop , gcr , pam , systemd @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { networkmanager polkit gnome.gnome-control-center - gnome.gnome-desktop + gnome-desktop gnome.gnome-session gtk3 pam diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 9e02b80d9f7..729a6bd16ca 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -58,8 +58,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-common = callPackage ./core/gnome-common { }; - gnome-desktop = callPackage ./core/gnome-desktop { }; - gnome-dictionary = callPackage ./core/gnome-dictionary { }; gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; @@ -281,6 +279,7 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16 libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19 bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26 @@ -289,7 +288,7 @@ lib.makeScope pkgs.newScope (self: with self; { glib_networking = throw "The ‘gnome.glib_networking’ alias was removed on 2022-01-13. Please use ‘pkgs.glib-networking’ directly."; # added 2018-02-25 gnome_common = throw "The ‘gnome.gnome_common’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-common’ directly."; # added 2018-02-25 gnome_control_center = throw "The ‘gnome.gnome_control_center’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-control-center’ directly."; # added 2018-02-25 - gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-desktop’ directly."; # added 2018-02-25 + gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use pkgs.gnome-desktop’ directly."; # added 2018-02-25 gnome_keyring = throw "The ‘gnome.gnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-keyring’ directly."; # added 2018-02-25 gnome_online_accounts = throw "The ‘gnome.gnome_online_accounts’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-online-accounts’ directly."; # added 2018-02-25 gnome_session = throw "The ‘gnome.gnome_session’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-session’ directly."; # added 2018-02-25 diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index 0725af81c0a..88678ff0113 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -6,6 +6,7 @@ , gettext , glib , gnome +, gnome-desktop , gobject-introspection , gsettings-desktop-schemas , gtk3 @@ -43,7 +44,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome.gnome-desktop + gnome-desktop gnome.gnome-settings-daemon gnome.gnome-shell # Makes it possible to select user themes through the `user-theme` extension diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 29192a4dd80..09ccf8d8f71 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -109,9 +109,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (gnome) file-roller; }; - gala = callPackage ./desktop/gala { - inherit (gnome) gnome-desktop; - }; + gala = callPackage ./desktop/gala { }; gnome-bluetooth-contract = callPackage ./desktop/gnome-bluetooth-contract { inherit (gnome) gnome-bluetooth; @@ -199,9 +197,7 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { }; - switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { - inherit (gnome) gnome-desktop; - }; + switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { }; switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { }; diff --git a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch rename to pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix similarity index 97% rename from pkgs/desktops/gnome/core/gnome-desktop/default.nix rename to pkgs/development/libraries/gnome-desktop/default.nix index 302d201f234..85a414e540a 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-desktop"; - attrPath = "gnome.gnome-desktop"; }; }; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index 7597aee697a..2c2b09b4492 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome +, gtk3, gnome-desktop , dbus, xvfb-run, libxml2 , hicolor-icon-theme }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ]; + buildInputs = [ gnome-desktop gtk3 libxml2 ]; checkInputs = [ dbus xvfb-run hicolor-icon-theme ]; mesonFlags = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index c54cdeca6c3..13a16f111ea 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -7,6 +7,7 @@ , xdg-desktop-portal , gtk3 , gnome +, gnome-desktop , glib , wrapGAppsHook , gsettings-desktop-schemas @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas # settings exposed by settings portal gtk3 - gnome.gnome-desktop + gnome-desktop gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d679f018d0e..78fbd57c383 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6100,6 +6100,8 @@ with pkgs; gnome-builder = callPackage ../applications/editors/gnome-builder { }; + gnome-desktop = callPackage ../development/libraries/gnome-desktop { }; + gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; gnome-keysign = callPackage ../tools/security/gnome-keysign { }; @@ -27405,7 +27407,6 @@ with pkgs; luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome) gnome-desktop; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { From 0193debd1c7f4ceb82253c038ee186f5d922e7f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:33:55 +0000 Subject: [PATCH 090/382] =?UTF-8?q?glib:=202.70.3=20=E2=86=92=202.71.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.70.3...2.71.2 --- pkgs/development/libraries/glib/default.nix | 9 ++++----- .../libraries/glib/link-with-coreservices.patch | 11 ----------- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/libraries/glib/link-with-coreservices.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c98058768b2..22458153a3e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,16 +45,15 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.70.3"; + version = "2.71.2"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Iz+khBweGeOW23YH1Y9rdbozE8UL8Pzgey41MtXrfUY="; + sha256 = "33BYdnULlS6ygqjPFdvXfcYJFSo2aXS0klqSskT+Y+E="; }; patches = optionals stdenv.isDarwin [ ./darwin-compilation.patch - ./link-with-coreservices.patch ] ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch @@ -142,8 +141,8 @@ stdenv.mkDerivation rec { chmod +x docs/reference/gio/concat-files-helper.py patchShebangs docs/reference/gio/concat-files-helper.py patchShebangs glib/gen-unicode-tables.pl - patchShebangs tests/gen-casefold-txt.py - patchShebangs tests/gen-casemap-txt.py + patchShebangs glib/tests/gen-casefold-txt.py + patchShebangs glib/tests/gen-casemap-txt.py '' + lib.optionalString stdenv.hostPlatform.isWindows '' substituteInPlace gio/win32/meson.build \ --replace "libintl, " "" diff --git a/pkgs/development/libraries/glib/link-with-coreservices.patch b/pkgs/development/libraries/glib/link-with-coreservices.patch deleted file mode 100644 index dcc0a8998cc..00000000000 --- a/pkgs/development/libraries/glib/link-with-coreservices.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build.orig 2020-11-25 13:47:38.499149252 +0900 -+++ b/meson.build 2020-11-25 13:48:47.098444800 +0900 -@@ -742,7 +742,7 @@ - - if glib_have_carbon - glib_conf.set('HAVE_CARBON', true) -- osx_ldflags += '-Wl,-framework,Carbon' -+ osx_ldflags += ['-Wl,-framework,Carbon', '-Wl,-framework,CoreServices'] - glib_have_os_x_9_or_later = objcc.compiles('''#include - #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 - #error Compiling for minimum OS X version before 10.9 From a411a7f9bda1017fe4c7ff7e2bcb6852813f94b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 Feb 2022 01:38:37 +0100 Subject: [PATCH 091/382] =?UTF-8?q?libical:=203.0.11=20=E2=86=92=203.0.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/libical/libical/releases/tag/v3.0.12 https://github.com/libical/libical/releases/tag/v3.0.13 https://github.com/libical/libical/releases/tag/v3.0.13 https://github.com/libical/libical/releases/tag/v3.0.14 --- pkgs/development/libraries/libical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index f4a1959a512..77c595c9184 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.11"; + version = "3.0.14"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-9kMYqWITZ2LlBDebJUZFWyVclAjfIZtc3Dm7lii9ZMc="; + sha256 = "sha256-gZ6IBjG5pNKJ+hWcTzXMP7yxL4he4LTklZGoC9vXra8="; }; nativeBuildInputs = [ From 32f38e997f8ddf8f2a842b5de107069ab69c20fc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:33:55 +0000 Subject: [PATCH 092/382] =?UTF-8?q?glib-networking:=202.70.1=20=E2=86=92?= =?UTF-8?q?=202.72.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib-networking/-/compare/2.70.1...2.72.beta --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 1a693e0e045..97de614912d 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.70.1"; + version = "2.72.beta"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Kha/wtJxzNMmbj+0YryKQQPALoG7szmqktb7BgWS17w="; + sha256 = "dOcEz5prXwCxzc9bKb+Fnt8dN1+HM2YDxxjHBj0eI1U="; }; patches = [ From a225002f3e13b567608a936b19e6317b9eef5200 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:33:52 +0000 Subject: [PATCH 093/382] =?UTF-8?q?gjs:=201.70.1=20=E2=86=92=201.71.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.70.1...1.71.1 --- pkgs/development/libraries/gjs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 07c97ea6e0d..7cf700768a1 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -8,7 +8,7 @@ , gtk3 , atk , gobject-introspection -, spidermonkey_78 +, spidermonkey_91 , pango , cairo , readline @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.70.1"; + version = "1.71.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-u9wO7HzyX7xTR2n2ofssehjhe4ce/bDKWOmr8IsoAD8="; + sha256 = "sha256-8VrQ1Fp9MaGsTgdHkDjAU2cTzKPFSSyi8nMcBKOl8ek="; }; patches = [ @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { gobject-introspection cairo readline - spidermonkey_78 + spidermonkey_91 dbus # for dbus-run-session ]; @@ -77,7 +77,8 @@ in stdenv.mkDerivation rec { "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; - doCheck = true; + # TODO: Cairo test fails + doCheck = false; postPatch = '' patchShebangs build/choose-tests-locale.sh From 0a4072ce23489f4ab63621d53356ddfc736b764e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 16:35:41 +0000 Subject: [PATCH 094/382] =?UTF-8?q?vte:=200.64.2=20=E2=86=92=200.67.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.64.2...0.66.0 https://gitlab.gnome.org/GNOME/vte/-/compare/0.66.0...0.67.90 Need to switch to clangStdenv since aarch6 is stuck on GCC 9 but vte requires at least GCC 10. I also tried gcc11Stdenv but that failed with linking issues. --- pkgs/development/libraries/vte/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index aae30390ee4..9e944208290 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.64.2"; + version = "0.67.90"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg="; + sha256 = "sha256-RkCe1x/DqkfX3DkCSaU+i4E6xsCYvawVFuEL23wg2zg="; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78fbd57c383..729654a23f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20614,7 +20614,10 @@ with pkgs; vsqlite = callPackage ../development/libraries/vsqlite { }; - vte = callPackage ../development/libraries/vte { }; + vte = callPackage ../development/libraries/vte { + # Needs GCC ≥10 but aarch64 defaults to GCC 9. + stdenv = clangStdenv; + }; vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; From 82a6c5b16232cd5fb64a6b7d9d46325b4cf4b4f0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 02:52:52 +0100 Subject: [PATCH 095/382] vala_0_56: init at 0.55.3 https://gitlab.gnome.org/GNOME/vala/-/blob/0.55.3/NEWS --- pkgs/development/compilers/vala/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 72512a1202f..3bb0f4c9a4b 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -20,6 +20,8 @@ let "0.54" = ./disable-graphviz-0.46.1.patch; + "0.55" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -68,7 +70,10 @@ let passthru = { updateScript = gnome.updateScript { - attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; + attrPath = + let + roundUpToEven = num: num + lib.mod num 2; + in "${pname}_${lib.versions.major version}_${builtins.toString (roundUpToEven (lib.toInt (lib.versions.minor version)))}"; packageName = pname; freeze = true; }; @@ -94,5 +99,10 @@ in rec { sha256 = "Ygecof8C5dF65yqppa3GGuav3P67DZ8GBjo2776soMc="; }; + vala_0_56 = generic { + version = "0.55.3"; + sha256 = "wWGF59HyF4NqfOvGSar+g1ULt7GS+9Mn7eOIzSwtUEk="; + }; + vala = vala_0_54; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 729654a23f7..4d6d51ed5fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13604,6 +13604,7 @@ with pkgs; inherit (callPackage ../development/compilers/vala { }) vala_0_48 vala_0_54 + vala_0_56 vala; vyper = with python3Packages; toPythonApplication vyper; From dde7232802a10dd4fea2f1880078eeb087521e28 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:33:42 +0000 Subject: [PATCH 096/382] =?UTF-8?q?evolution-data-server:=203.42.3=20?= =?UTF-8?q?=E2=86=92=203.43.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.42.3...3.43.2 Replaced intltool with gettext. Also formatted the expression. --- .../0001-M-93-Port-to-libgweather4.patch | 140 ++++++++++++++++++ .../core/evolution-data-server/default.nix | 98 ++++++++++-- 2 files changed, 225 insertions(+), 13 deletions(-) create mode 100644 pkgs/desktops/gnome/core/evolution-data-server/0001-M-93-Port-to-libgweather4.patch diff --git a/pkgs/desktops/gnome/core/evolution-data-server/0001-M-93-Port-to-libgweather4.patch b/pkgs/desktops/gnome/core/evolution-data-server/0001-M-93-Port-to-libgweather4.patch new file mode 100644 index 00000000000..7b00a8023e8 --- /dev/null +++ b/pkgs/desktops/gnome/core/evolution-data-server/0001-M-93-Port-to-libgweather4.patch @@ -0,0 +1,140 @@ +From 4adf9032fd820414d9ebd12cc746fee1895cc910 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Javier=20Jard=C3=B3n?= +Date: Sat, 8 Jan 2022 15:30:52 +0000 +Subject: [PATCH] M!93 - Port to libgweather4 + +Adds support for linking against gweather4 (pass -DWITH_GWEATHER4=ON). + +Co-Authored-By: Jan Tojnar +Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/93 +--- + CMakeLists.txt | 9 ++++++++- + config.h.in | 3 +++ + .../backends/weather/e-cal-backend-weather.c | 8 ++++++++ + .../backends/weather/e-weather-source.c | 17 +++++++++++++++-- + 4 files changed, 34 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 234f605be..5182a4792 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,6 +119,7 @@ set(sqlite_minimum_version 3.7.17) + # Optional Packages + set(goa_minimum_version 3.8) + set(gweather_minimum_version 3.10) ++set(gweather4_minimum_version 3.91.0) + set(libaccounts_glib_minimum_version 1.4) + set(libsignon_glib_minimum_version 1.8) + set(json_glib_minimum_version 1.0.4) +@@ -755,7 +756,13 @@ endif(NOT have_addrinfo) + add_printable_option(ENABLE_WEATHER "Build the weather calendar backend" ON) + + if(ENABLE_WEATHER) +- pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar backend" LIBGWEATHER gweather-3.0>=${gweather_minimum_version}) ++ add_printable_variable(WITH_GWEATHER4 "Use GWeather 4 instead of 3" OFF) ++ ++ if(WITH_GWEATHER4) ++ pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar backend" LIBGWEATHER gweather4>=${gweather4_minimum_version}) ++ else(WITH_GWEATHER4) ++ pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar backend" LIBGWEATHER gweather-3.0>=${gweather_minimum_version}) ++ endif(WITH_GWEATHER4) + + set(CMAKE_REQUIRED_INCLUDES ${LIBGWEATHER_INCLUDE_DIRS}) + set(CMAKE_REQUIRED_LIBRARIES ${LIBGWEATHER_LDFLAGS}) +diff --git a/config.h.in b/config.h.in +index 4e79549ab..c087d2b04 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -197,6 +197,9 @@ + /* gweather_info_new() has only one argument */ + #cmakedefine HAVE_ONE_ARG_GWEATHER_INFO_NEW 1 + ++/* Defined when linking against gweather4. Cannot just use GWEATHER_CHECK_VERSION because 40.0 made the versions non-monotonic. */ ++#cmakedefine WITH_GWEATHER4 1 ++ + /* evolution-alarm-notify - Define if using Canberra-GTK for sound */ + #cmakedefine HAVE_CANBERRA 1 + +diff --git a/src/calendar/backends/weather/e-cal-backend-weather.c b/src/calendar/backends/weather/e-cal-backend-weather.c +index 72faccd62..c4999671f 100644 +--- a/src/calendar/backends/weather/e-cal-backend-weather.c ++++ b/src/calendar/backends/weather/e-cal-backend-weather.c +@@ -464,7 +464,11 @@ create_weather (ECalBackendWeather *cbw, + time_t update_time; + ICalTimezone *update_zone = NULL; + const GWeatherLocation *location; ++ #ifdef WITH_GWEATHER4 ++ GTimeZone *w_timezone; ++ #else + const GWeatherTimezone *w_timezone; ++ #endif + gdouble tmin = 0.0, tmax = 0.0, temp = 0.0; + + g_return_val_if_fail (E_IS_CAL_BACKEND_WEATHER (cbw), NULL); +@@ -484,7 +488,11 @@ create_weather (ECalBackendWeather *cbw, + /* use timezone of the location to determine date for which this is set */ + location = gweather_info_get_location (report); + if (location && (w_timezone = gweather_location_get_timezone ((GWeatherLocation *) location))) ++ #ifdef WITH_GWEATHER4 ++ update_zone = i_cal_timezone_get_builtin_timezone (g_time_zone_get_identifier (w_timezone)); ++ #else + update_zone = i_cal_timezone_get_builtin_timezone (gweather_timezone_get_tzid ((GWeatherTimezone *) w_timezone)); ++ #endif + + if (!update_zone) + update_zone = i_cal_timezone_get_utc_timezone (); +diff --git a/src/calendar/backends/weather/e-weather-source.c b/src/calendar/backends/weather/e-weather-source.c +index 3052d034c..031b7a6ad 100644 +--- a/src/calendar/backends/weather/e-weather-source.c ++++ b/src/calendar/backends/weather/e-weather-source.c +@@ -39,8 +39,11 @@ weather_source_dispose (GObject *object) + EWeatherSourcePrivate *priv; + + priv = E_WEATHER_SOURCE (object)->priv; ++ #ifdef WITH_GWEATHER4 ++ g_clear_object (&priv->location); ++ #else + g_clear_pointer (&priv->location, gweather_location_unref); +- ++ #endif + g_clear_object (&priv->info); + + /* Chain up to parent's dispose() method. */ +@@ -85,7 +88,11 @@ weather_source_find_location_by_coords (GWeatherLocation *start, + gweather_location_get_coords (location, &lat, &lon); + + if (lat == latitude && lon == longitude) { ++ #ifdef WITH_GWEATHER4 ++ g_object_ref (location); ++ #else + gweather_location_ref (location); ++ #endif + return location; + } + } +@@ -96,7 +103,11 @@ weather_source_find_location_by_coords (GWeatherLocation *start, + + result = weather_source_find_location_by_coords (child, latitude, longitude); + if (result) { ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (child); ++ #else + gweather_location_unref (child); ++ #endif + return result; + } + } +@@ -159,7 +170,9 @@ e_weather_source_new (const gchar *location) + } + } + +-#if GWEATHER_CHECK_VERSION(3, 39, 0) ++#ifdef WITH_GWEATHER4 ++ g_object_unref (world); ++#elif GWEATHER_CHECK_VERSION(3, 39, 0) + gweather_location_unref (world); + #endif + g_strfreev (tokens); +-- +2.35.1 + diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index b7ba12be135..409b7a0762a 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -1,18 +1,57 @@ -{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome, python3, gobject-introspection -, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit -, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja -, libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber -, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }: +{ stdenv +, lib +, fetchurl +, substituteAll +, pkg-config +, gnome +, python3 +, gobject-introspection +, gettext +, libsoup +, libxml2 +, libsecret +, icu +, sqlite +, tzdata +, libcanberra-gtk3 +, gcr +, p11-kit +, db +, nspr +, nss +, libical +, gperf +, wrapGAppsHook +, glib-networking +, pcre +, vala +, cmake +, ninja +, libkrb5 +, openldap +, webkitgtk +, libaccounts-glib +, json-glib +, glib +, gtk3 +, libphonenumber +, gnome-online-accounts +, libgweather +, libgdata +, gsettings-desktop-schemas +, boost +, protobuf +}: stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.42.4"; + version = "3.43.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "fftBs+bAWBHUSajeTfx3q5sZ+O3yCzL92FeRhmIm0lI="; + sha256 = "jmV4HGQPoNm0+AEP9Q6Cpo11VTZWrVDZPxMRJ1y7RBw="; }; patches = [ @@ -20,22 +59,54 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tzdata; }) + + # Fix build with gweather4 + # https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/93 + ./0001-M-93-Port-to-libgweather4.patch ]; prePatch = '' - substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ + --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas} patches="$patches $PWD/hardcode-gsettings.patch" ''; nativeBuildInputs = [ - cmake ninja pkg-config intltool python3 gperf wrapGAppsHook gobject-introspection vala + cmake + ninja + pkg-config + gettext + python3 + gperf + wrapGAppsHook + gobject-introspection + vala ]; + buildInputs = [ - glib libsoup libxml2 gtk3 gnome-online-accounts - gcr p11-kit libgweather libgdata libaccounts-glib json-glib - icu sqlite libkrb5 openldap webkitgtk glib-networking - libcanberra-gtk3 pcre libphonenumber boost protobuf + glib + libsoup + libxml2 + gtk3 + gnome-online-accounts + gcr + p11-kit + libgweather + libgdata + libaccounts-glib + json-glib + icu + sqlite + libkrb5 + openldap + webkitgtk + glib-networking + libcanberra-gtk3 + pcre + libphonenumber + boost + protobuf ]; propagatedBuildInputs = [ @@ -55,6 +126,7 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" "-DWITH_PHONENUMBER=ON" + "-DWITH_GWEATHER4=ON" ]; passthru = { From 6d2d6f9594b46a2e13cdcb13c8bcc451deee85e6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:35 +0000 Subject: [PATCH 097/382] =?UTF-8?q?gnome.gnome-desktop:=2041.3=20=E2=86=92?= =?UTF-8?q?=2042.alpha.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/41.3...42.alpha.1 --- pkgs/development/libraries/gnome-desktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 85a414e540a..f3f221745b6 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -7,6 +7,7 @@ , ninja , gnome , gtk3 +, gtk4 , glib , gettext , libxml2 @@ -26,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "41.3"; + version = "42.alpha.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-jNHKq5MRgowEUkaMalBnqbxEY4NbI6FL5E6P2bAwAcY="; + sha256 = "sha256-lxUTBDVAeqgptNWdwDb/XKOSTytO4X7FMBf2ar2gX+w="; }; patches = [ @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { isocodes wayland gtk3 + gtk4 glib libseccomp systemd From 47d3cf39e0743f40cf2764cdf6c53804fe937b44 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:13 +0000 Subject: [PATCH 098/382] =?UTF-8?q?gnome.gvfs:=201.48.1=20=E2=86=92=201.49?= =?UTF-8?q?.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gvfs/-/compare/1.48.1...1.49.90 Switches http/dav module to libsoup3, which is lighter, allowing us to enable it everywhere. This means we now depend on both libsoup3 and libsoup2 but they are used by different programs (the latter, transitively via libgdata, by the google module) so it should be fine. --- pkgs/development/libraries/gvfs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index c79f849d22f..c61d75bd250 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -17,6 +18,7 @@ , fuse3 , libcdio , libxml2 +, libsoup_3 , libxslt , docbook_xsl , docbook_xml_dtd_42 @@ -41,11 +43,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.48.1"; + version = "1.49.90"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj"; + sha256 = "Pj1lT6TWqASzppLPYHCdyop8HtlSMDakLYv3U5WLm2w="; }; postPatch = '' @@ -89,9 +91,8 @@ stdenv.mkDerivation rec { libnfs openssh gsettings-desktop-schemas - # TODO: a ligther version of libsoup to have FTP/HTTP support? + libsoup_3 ] ++ lib.optionals gnomeSupport [ - gnome.libsoup gcr glib-networking # TLS support gnome-online-accounts @@ -106,7 +107,6 @@ stdenv.mkDerivation rec { "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" - "-Dhttp=false" "-Dgoogle=false" ] ++ lib.optionals (avahi == null) [ "-Ddnssd=false" From 70f28eca054f45316db532d4be1cf1b30dd84a8f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 14:38:17 +0100 Subject: [PATCH 099/382] libgnome-games-support_2_0: init at 2.0.beta.2 https://gitlab.gnome.org/GNOME/libgnome-games-support/-/compare/1.8.2...2.0.beta.2 --- .../libraries/libgnome-games-support/2.0.nix | 59 +++++++++++++++++++ .../libgnome-games-support/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 3 files changed, 61 insertions(+) create mode 100644 pkgs/development/libraries/libgnome-games-support/2.0.nix diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/development/libraries/libgnome-games-support/2.0.nix new file mode 100644 index 00000000000..bc1d795c010 --- /dev/null +++ b/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, glib +, gtk4 +, libgee +, gettext +, vala +, gnome +, libintl +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "libgnome-games-support"; + version = "2.0.beta.2"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "jB7lF4q8wppOgUJnuMXvo6DvmwkxbAAgCQ4Ex6OYxNw="; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + libintl + ]; + + propagatedBuildInputs = [ + # Required by libgnome-games-support-2.pc + glib + gtk4 + libgee + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "${pname}_2_0"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Small library intended for internal use by GNOME Games, but it may be used by others"; + homepage = "https://wiki.gnome.org/Apps/Games"; + license = licenses.lgpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libgnome-games-support/default.nix b/pkgs/development/libraries/libgnome-games-support/default.nix index 80c76ea980f..e63d7f8fe65 100644 --- a/pkgs/development/libraries/libgnome-games-support/default.nix +++ b/pkgs/development/libraries/libgnome-games-support/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d6d51ed5fe..a6675d1d5e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18141,6 +18141,7 @@ with pkgs; libgnome-keyring3 = gnome.libgnome-keyring; libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; + libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { }; libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; From 3a9cac50e172ae67563e5fc37040cd2149e04bae Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:47 +0000 Subject: [PATCH 100/382] =?UTF-8?q?gnome-online-accounts:=203.40.1=20?= =?UTF-8?q?=E2=86=92=203.43.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.40.1...3.43.1 --- pkgs/development/libraries/gnome-online-accounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 9337a8e93d6..f58e87b2f7e 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.40.1"; + version = "3.43.1"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-q4bLGOOGoGH/Et3hu7/372tjNMouX9ePTanIo0c4Jbw="; + sha256 = "sha256-Dpq5bQwU0ZAxmEllpbLnS1Jz3F0rxtFMKZcIvAteObU="; }; outputs = [ "out" "man" "dev" "devdoc" ]; From 533adf2e55778b2d8e67a42ef9ffbfc3633c4695 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:53 +0000 Subject: [PATCH 101/382] =?UTF-8?q?gobject-introspection:=201.70.0=20?= =?UTF-8?q?=E2=86=92=201.71.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gobject-introspection/-/compare/1.70.0...1.71.0 --- .../absolute_shlib_path.patch | 22 +++++++++++++------ .../gobject-introspection/default.nix | 16 ++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch index c02330adf6d..b6dc66fc66b 100644 --- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch +++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch @@ -1,3 +1,5 @@ +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py +index 64575557..1eb0a2b4 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -95,6 +95,39 @@ def get_windows_option_group(parser): @@ -41,16 +43,18 @@ parser = optparse.OptionParser('%prog [options] sources', version='%prog ' + giscanner.__version__) @@ -214,6 +247,10 @@ match the namespace prefix.""") - parser.add_option("", "--filelist", - action="store", dest="filelist", default=[], - help="file containing headers and sources to be scanned") + parser.add_option("", "--c-include", + action="append", dest="c_includes", default=[], + help="headers which should be included in C programs") + parser.add_option("", "--fallback-library-path", + action="store", dest="fallback_libpath", + default=_get_default_fallback_libpath(), + help="Path to prepend to unknown shared libraries") - - group = get_preprocessor_option_group(parser) - parser.add_option_group(group) + parser.add_option("", "--filelist", + action="store", dest="filelist", default=[], + help="file containing headers and sources to be scanned") +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index 9f8ab5df..af325022 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): @@ -115,9 +119,11 @@ if m: del patterns[library] shlibs.append(m.group()) +diff --git a/giscanner/utils.py b/giscanner/utils.py +index 31c7ea48..630002a8 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py -@@ -113,16 +113,11 @@ def extract_libtool_shlib(la_file): +@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None @@ -139,6 +145,8 @@ # Returns arguments for invoking libtool, if applicable, otherwise None +diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py +index a8337c60..72789d76 100644 --- a/tests/scanner/test_shlibs.py +++ b/tests/scanner/test_shlibs.py @@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 667d50ca4d8..eceed463a3c 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , glib , flex @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.70.0"; + version = "1.71.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jpwraip7pwl9bf9s59am3r7074p34fasvfb5ym1fb8hwc34jawh"; + sha256 = "VV3DmXwokiKFQwKfWGELg/wdpzPk49GOk2PXtagRZN0="; }; patches = [ @@ -46,15 +47,6 @@ stdenv.mkDerivation rec { src = ./absolute_shlib_path.patch; inherit nixStoreDir; }) - # Fix build with meson 0.61.0 - (fetchurl { - url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/827494d6415b696a98fa195cbd883b50cc893bfc.patch"; - sha256 = "sha256-imVWzU760FRsX+eXREQDQ6mDcmzZ5ASLT9rBf4oyBGQ="; - }) - (fetchurl { - url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2.patch"; - sha256 = "sha256-o7a0qDT5IYcYcz8toeZu+nPj3SwS52sNgmxgzsmlp4Q="; - }) ] ++ lib.optionals x11Support [ # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080 From 3852b7117ae0f996f65377d3efda04a33de1ca4e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:36:01 +0000 Subject: [PATCH 102/382] =?UTF-8?q?gsettings-desktop-schemas:=2041.0=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/compare/41.0...42.beta --- .../libraries/gsettings-desktop-schemas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 483ee0b0849..2c0ba0a01de 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dyiZcuWW0ERYPwwFYwbY8dvYrc+RKRClDaCmY+ZTMu0="; + sha256 = "LwNwYJ8+mqCdoCkzkSACT4B0k0ZnPRH2UdXM/HbkrzY="; }; strictDeps = true; From 8212afc323c2c0974707bcd29f4294374313b1d6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:36:13 +0000 Subject: [PATCH 103/382] =?UTF-8?q?gtksourceview5:=205.2.0=20=E2=86=92=205?= =?UTF-8?q?.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.2.0...5.3.2 --- .../development/libraries/gtksourceview/5.x.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index e6ad0f1ae36..411f9c24700 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -10,6 +10,7 @@ , pango , fribidi , vala +, gi-docgen , libxml2 , perl , gettext @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.2.0"; + version = "5.3.2"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ybNPoCZU9WziL6CIJ9idtLqBYxsubX0x6mXRPHKUMOk="; + sha256 = "r3c24u4828EBMJDoyvNfuJ1lz0HJw5nKxdiZLZVd7TA="; }; patches = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { perl gobject-introspection vala + gi-docgen ]; buildInputs = [ @@ -68,6 +70,10 @@ stdenv.mkDerivation rec { dbus ]; + mesonFlags = [ + "-Dgtk_doc=true" + ]; + doCheck = stdenv.isLinux; checkPhase = '' @@ -81,6 +87,11 @@ stdenv.mkDerivation rec { runHook postCheck ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gtksourceview"; From 3b7f73443eeb3215e50d8b2ee53fc41a755d1f56 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:36:20 +0000 Subject: [PATCH 104/382] =?UTF-8?q?jsonrpc-glib:=203.40.0=20=E2=86=92=203.?= =?UTF-8?q?41.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/jsonrpc-glib/-/compare/3.40.0...3.41.0 --- pkgs/development/libraries/jsonrpc-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 7618110e86c..4f5821ad254 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.40.0"; + version = "3.41.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wuPRYlfHJmzTkBiE4iN1V1v2Go4fZ1lsiODYeucNDvQ="; + sha256 = "fE5qW4w3KWMs7MMS3BFjxNACQ9MukFKOVOxQOKI6fCE="; }; mesonFlags = [ From 7a3e89c7f5fd806875c66a9c57f84f4e6f4717a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:36:35 +0000 Subject: [PATCH 105/382] =?UTF-8?q?libhandy:=201.5.0=20=E2=86=92=201.5.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libhandy/-/compare/1.5.0...1.5.90 --- .../libraries/libhandy/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 63c494999a9..6c58d68341f 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -6,16 +6,13 @@ , pkg-config , gobject-introspection , vala -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 +, gi-docgen , glib , gsettings-desktop-schemas , gtk3 , enableGlade ? false , glade , xvfb-run -, libxml2 , gdk-pixbuf , librsvg , hicolor-icon-theme @@ -28,7 +25,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.5.0"; + version = "1.5.90"; outputs = [ "out" @@ -41,15 +38,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-RmueAmwfnrO2WWb1MNl3A6ghLar5EXSMFF6cuEPb1v4="; + sha256 = "sha256-acE3tXgik1OTcbzb0VuRzB8PSi9U2b3jszmGB6WIkKI="; }; nativeBuildInputs = [ - docbook_xml_dtd_43 - docbook-xsl-nons gobject-introspection - gtk-doc - libxml2 + gi-docgen meson ninja pkg-config @@ -59,7 +53,6 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf gtk3 - libxml2 ] ++ lib.optionals enableGlade [ glade ]; @@ -106,6 +99,11 @@ stdenv.mkDerivation rec { runHook postCheck ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 5f5078bea988e67ebac5be6f26116b0bbf34f0b4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 Feb 2022 00:58:00 +0000 Subject: [PATCH 106/382] =?UTF-8?q?libadwaita:=201.0.2=20=E2=86=92=201.1.b?= =?UTF-8?q?eta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.0.2...1.1.beta --- pkgs/development/libraries/libadwaita/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 856ec30bccb..bd19c79a302 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.0.2"; + version = "1.1.beta"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-D7Qq8yAWkr/G5I4k8G1+viJkEJSrCBAg31Q+g3U9FcQ="; + hash = "sha256-D1hJMidnGtCC+6gz6lqp+qL+9UVzIRL7IjGptwk/X+M="; }; nativeBuildInputs = [ @@ -91,6 +91,12 @@ stdenv.mkDerivation rec { mv $out/share/{doc,gtk-doc} ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + meta = with lib; { description = "Library to help with developing UI for mobile devices using GTK/GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; From 5003674a9fc1b22f3f58c6196995860d8b2c9409 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:36:42 +0000 Subject: [PATCH 107/382] =?UTF-8?q?librsvg:=202.52.6=20=E2=86=92=202.53.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/librsvg/-/compare/2.52.6...2.53.1 --- pkgs/development/libraries/librsvg/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 81cad37351a..e9b7a67e558 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -16,6 +16,8 @@ , rustc , rust , cargo +, gi-docgen +, python3 , gnome , vala , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform @@ -25,13 +27,15 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.52.6"; + version = "2.53.1"; - outputs = [ "out" "dev" "installedTests" ]; + outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ + "devdoc" + ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "o/k5oeajpgQIJEYy0DI/jDsg60t7AAU24uW9k7jv+q0="; + sha256 = "uo4EAHR0nzhFRFxWAuCQLzAHoYsHTPDMahDI3cWmUyI="; }; cargoVendorDir = "vendor"; @@ -45,10 +49,12 @@ stdenv.mkDerivation rec { pkg-config rustc cargo + python3.pkgs.docutils vala rustPlatform.cargoSetupHook ] ++ lib.optionals withIntrospection [ gobject-introspection + gi-docgen ]; buildInputs = [ @@ -119,6 +125,11 @@ stdenv.mkDerivation rec { mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 52396f0c870e76ab826af15ed1730c23d4d88f06 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:37:16 +0000 Subject: [PATCH 108/382] =?UTF-8?q?tracker:=203.2.1=20=E2=86=92=203.3.0.be?= =?UTF-8?q?ta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.2.1...3.3.0.beta Increase test timeouts for “tracker:functional / ontology-changes” --- pkgs/development/libraries/tracker/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 68a29919f0a..1fd66ea9c61 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , gettext , meson , ninja @@ -31,13 +30,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.2.1"; + version = "3.3.0.beta"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "GEfgiznm5h2EhzWqH5f32WwDggFlP6DXy56Bs365wDo="; + sha256 = "JvOoH1FOWsz8mBcpWAOK9Mw421rdp2u7yaB8gnorGjs="; }; patches = [ @@ -45,13 +44,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit asciidoc; }) - - # Filter out hidden (wrapped) subcommands - # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/481 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/8c28c24e447f13da8cf804cd7a00f9b909c5d3f9.patch"; - sha256 = "EYo1nOtEr4semaPC5wk6A7bliRXu8qsBHaltd0DEI6Y="; - }) ]; nativeBuildInputs = [ @@ -119,7 +111,9 @@ stdenv.mkDerivation rec { dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - meson test --print-errorlogs + meson test \ + --timeout-multiplier 2 \ + --print-errorlogs runHook postCheck ''; From f3e6896063f73b133f2acfece1e4d0fcda6807b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:37:17 +0000 Subject: [PATCH 109/382] =?UTF-8?q?tracker-miners:=203.2.2=20=E2=86=92=203?= =?UTF-8?q?.3.0.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker-miners/-/compare/3.2.2...3.3.0.beta --- pkgs/development/libraries/tracker-miners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 4df448d08f4..877609fd179 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.2.2"; + version = "3.3.0.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/YTHHmIbwrgcrLX5CJMkNiRtG4pPw6Y1PiuNuuvAI2w="; + sha256 = "a0spkyekdk5H0d9bJTiBbr5LhMsyX9nlrloHMQexAcU="; }; nativeBuildInputs = [ From 97aa2a6d1bb5eef919d5c120a5249132bf10d49d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:37:25 +0000 Subject: [PATCH 110/382] =?UTF-8?q?yelp-tools:=2041.0=20=E2=86=92=2042.bet?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp-tools/-/compare/41.0...42.beta --- pkgs/development/misc/yelp-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index d6864b80f9e..e78c73c4168 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "41.0"; + version = "42.beta"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "N/GswCvL5ooxuG4HwSmoOb0yduZW3Inrf8CpJ0bv8nI="; + sha256 = "dJkLKTKhUOHsKN6QLiZGqli6VlCu18l51orichtpOtk="; }; nativeBuildInputs = [ From 9649427f1c7a108d243cb20daed997a04e950c67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 20:17:33 +0100 Subject: [PATCH 111/382] =?UTF-8?q?gi-docgen:=202021.8=20=E2=86=92=202022.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gi-docgen/-/tags/2022.1 --- .../tools/documentation/gi-docgen/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 05b7aac82c1..85836f435cb 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitLab -, fetchpatch , meson , ninja , python3 @@ -8,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2021.8"; + version = "2022.1"; format = "other"; @@ -17,18 +16,9 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "Y1IdCH6bytxbKIj48IAw/3XUQhoqwPshvdj/d1hRS3o="; + sha256 = "35pL/2TQRVgPfAcfOGCLlSP1LIh4r95mFC+UoXQEEHo="; }; - patches = [ - # Fix building docs of some packages (e.g. gnome-builder) - # https://gitlab.gnome.org/GNOME/gi-docgen/-/issues/111 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/72f3c5dbe27aabb5f7a376afda23f3dfc3c2e212.patch"; - sha256 = "iVXc3idmcjmFVZQdE2QX2V53YZ79lqxZid9nWdxAZ/Q="; - }) - ]; - depsBuildBuild = [ python3 ]; From 4be046c3cf06276fb2e119213014416a772a6f29 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 23:49:47 +0100 Subject: [PATCH 112/382] =?UTF-8?q?libgweather:=2040.0=20=E2=86=92=203.91.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Yes, this is an upgrade. https://gitlab.gnome.org/GNOME/libgweather/-/tags/3.90.0 https://gitlab.gnome.org/GNOME/libgweather/-/tags/3.91.0 --- .../libraries/libgweather/default.nix | 33 +++++++++++-------- .../libraries/libgweather/fix-pkgconfig.patch | 14 ++++++++ 2 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/libraries/libgweather/fix-pkgconfig.patch diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index fbab67e0865..f8ac8da7fc4 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -6,12 +6,9 @@ , pkg-config , libxml2 , glib -, gtk3 , gettext , libsoup -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 +, gi-docgen , gobject-introspection , python3 , tzdata @@ -22,24 +19,29 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "40.0"; + version = "3.91.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "cls+s0/G0h7cgLbmhHKLMIix+hRPCipNPpYFx6jz3Pg="; }; + patches = [ + # Headers depend on glib but it is only listed in Requires.private, + # which does not influence Cflags on non-static builds in nixpkgs’s + # pkg-config. Let’s add it to Requires to ensure Cflags are set correctly. + ./fix-pkgconfig.patch + ]; + nativeBuildInputs = [ meson ninja pkg-config gettext vala - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 + gi-docgen gobject-introspection python3 python3.pkgs.pygobject3 @@ -47,7 +49,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 libsoup libxml2 geocode-glib @@ -60,9 +61,13 @@ stdenv.mkDerivation rec { ]; postPatch = '' - chmod +x meson/meson_post_install.py - patchShebangs meson/meson_post_install.py - patchShebangs data/gen_locations_variant.py + patchShebangs build-aux/meson/meson_post_install.py + patchShebangs build-aux/meson/gen_locations_variant.py + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { diff --git a/pkgs/development/libraries/libgweather/fix-pkgconfig.patch b/pkgs/development/libraries/libgweather/fix-pkgconfig.patch new file mode 100644 index 00000000000..b118a3bc9dd --- /dev/null +++ b/pkgs/development/libraries/libgweather/fix-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/libgweather/meson.build b/libgweather/meson.build +index b5d0b4d4..10010d70 100644 +--- a/libgweather/meson.build ++++ b/libgweather/meson.build +@@ -269,6 +269,9 @@ pkgconfig.generate( + description: 'Gather weather information from online services', + version: meson.project_version(), + subdirs: libgweather_full_version, ++ requires: [ ++ 'glib-2.0', ++ ], + variables: [ + 'soupapiversion=' + libsoup_api_version, + ] From 390e4670f66c21bf42224643bac8b25158d7552e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:59 +0000 Subject: [PATCH 113/382] =?UTF-8?q?gnome.gnome-settings-daemon:=2041.0=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/41.0...42.beta --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 307de72cc4f..4bc6deae723 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "5spjYfvR3qst4aHjkNTxQWfPR7HFR9u4tlpdielmOIQ="; + sha256 = "8ZRFgIrGSYdkMwxbAqnAer70tj7/1G0HX85IjZ4Ahl8="; }; patches = [ From a6bcf76c7f032c9e469bab7396ec2ef6d4255ee2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 07:44:47 +0100 Subject: [PATCH 114/382] gnome.gnome-settings-daemon338: port to gweather4 --- .../gnome/core/gnome-settings-daemon/3.38/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix index b043883a492..8ab848a7dfa 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix @@ -83,6 +83,16 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff"; sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY="; }) + + # Port to gweather4 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/66cae69ad82cfc59435016fba737ce046ffb7e66.patch"; + sha256 = "zf8/rkKdQQFNV/qx/jo4kx1KoLl7SUSu4/T1OBGrZ4c="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch"; + sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM="; + }) ]; nativeBuildInputs = [ From ed76538fc1b1c94fe68bbfd13c20e3a19fd721f2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 Feb 2022 00:54:24 +0000 Subject: [PATCH 115/382] =?UTF-8?q?gnome.gnome-bluetooth:=203.34.5=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/3.34.5...42.beta --- .../gnome/core/gnome-bluetooth/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 901dbc21e9e..f4c655472b3 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -5,15 +5,17 @@ , meson , ninja , pkg-config -, gtk3 +, gtk4 +, libadwaita , gettext , glib , udev +, upower , itstool , libxml2 , wrapGAppsHook , libnotify -, libcanberra-gtk3 +, gsound , gobject-introspection , gtk-doc , docbook-xsl-nons @@ -24,14 +26,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "3.34.5"; + version = "42.beta"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1Qn47dpsMIU7kx3M4y4km9SdvKuLxFSUHqmP/fHuvao="; }; nativeBuildInputs = [ @@ -51,11 +53,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 + gtk4 + libadwaita udev + upower libnotify - libcanberra-gtk3 - gnome.adwaita-icon-theme + gsound gsettings-desktop-schemas ]; @@ -67,6 +70,10 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py + + # https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/merge_requests/117 + substituteInPlace lib/bluetooth-utils.c \ + --replace "/* fallthrough */" "break;" ''; passthru = { @@ -77,7 +84,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-bluetooth"; description = "Application that lets you manage Bluetooth in the GNOME desktop"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; From 26e552ee1992c44a228ccb88a0f435e54716310e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 19 Feb 2022 14:05:26 +0100 Subject: [PATCH 116/382] blueberry: use old version of gnome-bluetooth for the time being The new version is incompatible (see https://github.com/linuxmint/blueberry/issues/123) This re-adds the old one, but just for blueberry, until the compatibility issue is fully resolved --- pkgs/tools/bluetooth/blueberry/default.nix | 7 +- .../bluetooth/blueberry/gnome-bluetooth.nix | 86 +++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 5616560108c..bbc3babbd13 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -3,15 +3,18 @@ , fetchFromGitHub , bluez-tools , cinnamon -, gnome , gobject-introspection , intltool , pavucontrol , python3Packages , util-linux , wrapGAppsHook +, callPackage }: +let + gnome-bluetooth = callPackage ./gnome-bluetooth.nix {}; +in stdenv.mkDerivation rec { pname = "blueberry"; version = "1.4.7"; @@ -32,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools cinnamon.xapps - gnome.gnome-bluetooth + gnome-bluetooth python3Packages.python util-linux ]; diff --git a/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix b/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix new file mode 100644 index 00000000000..07b77c04994 --- /dev/null +++ b/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchurl +, gnome +, meson +, ninja +, pkg-config +, gtk3 +, gettext +, glib +, udev +, itstool +, libxml2 +, wrapGAppsHook +, libnotify +, libcanberra-gtk3 +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-bluetooth"; + version = "3.34.5"; + + # TODO: split out "lib" + outputs = [ "out" "dev" "devdoc" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 + ]; + + buildInputs = [ + glib + gtk3 + udev + libnotify + libcanberra-gtk3 + gnome.adwaita-icon-theme + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dicon_update=false" + "-Dgtk_doc=true" + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; + description = "Application that let you manage Bluetooth in the GNOME destkop"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} From 0e1489ae3b0970022369fbe4e2f690cb31f7f279 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 Feb 2022 04:55:49 +0100 Subject: [PATCH 117/382] librest_1_0: init at 0.9.0 https://gitlab.gnome.org/GNOME/librest/-/compare/0.8.1...0.9.0 --- pkgs/development/libraries/librest/1.0.nix | 74 +++++++++++++++++++ .../development/libraries/librest/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 77 insertions(+) create mode 100644 pkgs/development/libraries/librest/1.0.nix diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/development/libraries/librest/1.0.nix new file mode 100644 index 00000000000..d51f9e31b17 --- /dev/null +++ b/pkgs/development/libraries/librest/1.0.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gi-docgen +, glib +, json-glib +, libsoup +, gobject-introspection +, gnome +}: + +stdenv.mkDerivation rec { + pname = "rest"; + version = "0.9.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "hbK8k0ESgTlTm1PuU/BTMxC8ljkv1kWGOgQEELgevmY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gi-docgen + gobject-introspection + ]; + + buildInputs = [ + glib + json-glib + libsoup + ]; + + mesonFlags = [ + "-Dexamples=false" + + # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. + "-Dca_certificates=true" + "-Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt" + ]; + + postPatch = '' + # https://gitlab.gnome.org/GNOME/librest/-/merge_requests/19 + substituteInPlace meson.build \ + --replace "con." "conf." + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "librest_1_0"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Helper library for RESTful services"; + homepage = "https://wiki.gnome.org/Projects/Librest"; + license = licenses.lgpl21Only; + platforms = platforms.unix; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index ce2df9cc9a8..abe53ff3692 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "librest"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6675d1d5e1..e3d3549d69f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7726,6 +7726,8 @@ with pkgs; librest = callPackage ../development/libraries/librest { }; + librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { }; + inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 From fbaee683875b06bc0bbc75ade62cb0b6481d1a67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:33:30 +0000 Subject: [PATCH 118/382] =?UTF-8?q?baobab:=2041.0=20=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/41.0...42.beta --- pkgs/desktops/gnome/core/baobab/default.nix | 26 +++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 40ea18b1af1..188b83e5912 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -8,22 +8,22 @@ , ninja , pkg-config , python3 -, gtk3 -, libhandy +, gtk4 +, libadwaita , glib , libxml2 -, wrapGAppsHook +, wrapGAppsHook4 , itstool , gnome }: stdenv.mkDerivation rec { pname = "baobab"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ytYnjS3MgMhLVxBapbtY2KMM6Y1vq9dnUZ3bhshX6FU="; + sha256 = "iVtRFak12WbKJo7yrLwYd9jfZFZ9uNAlTC4qerRnGCY="; }; nativeBuildInputs = [ @@ -37,21 +37,27 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook - # Prevents “error: Package `libhandy-1' not found in specified Vala API + wrapGAppsHook4 + # Prevents “error: Package `libadwaita-1' not found in specified Vala API # directories or GObject-Introspection GIR directories” with strictDeps, # even though it should only be a runtime dependency. - libhandy + libadwaita ]; buildInputs = [ - gtk3 - libhandy + gtk4 + libadwaita glib ]; doCheck = true; + postPatch = '' + # https://gitlab.gnome.org/GNOME/baobab/-/merge_requests/40 + substituteInPlace build-aux/post-install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From d2552f2cb6938a5028fc5656c2ab524e9dffac02 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:33:38 +0000 Subject: [PATCH 119/382] =?UTF-8?q?epiphany:=2041.3=20=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/41.3...42.beta --- pkgs/desktops/gnome/core/epiphany/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index eb8caa4f1ef..594b9ef7d2f 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "41.3"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ugEmjuVPMY39rC4B66OKP8lpQMHL9kDtJhOuKfi8ua0="; + sha256 = "vNVCkd+N9wm3W/0Xu+CQWVrag8vbFmMj6B9B/PiVjDI="; }; patches = lib.optionals withPantheon [ @@ -65,13 +65,6 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/navigation-buttons.patch"; sha256 = "sha256-G1/JUjn/8DyO9sgL/5Kq205KbTOs4EMi4Vf3cJ8FHXU="; }) - ] ++ [ - # Fix build with latest libportal - # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1051 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/84474398f6e59266b73170838219aa896729ce93.patch"; - sha256 = "SeiLTo3FcOxuml5sJX9GqyGdyGf1jm1A76SOI0JJvoo="; - }) ]; nativeBuildInputs = [ From 15eadc4cdd00f07f60f64fd00569fc95b2fbbc98 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:33:42 +0000 Subject: [PATCH 120/382] =?UTF-8?q?evolution:=203.42.3=20=E2=86=92=203.43.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.42.3...3.43.2 --- .../0001-M-102-Port-to-libgweather4.patch | 379 ++++++++++++++++++ .../evolution/evolution/default.nix | 18 +- 2 files changed, 394 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/mailreaders/evolution/evolution/0001-M-102-Port-to-libgweather4.patch diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/0001-M-102-Port-to-libgweather4.patch b/pkgs/applications/networking/mailreaders/evolution/evolution/0001-M-102-Port-to-libgweather4.patch new file mode 100644 index 00000000000..22e7e4a9ff1 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/0001-M-102-Port-to-libgweather4.patch @@ -0,0 +1,379 @@ +From b90091b403c10266e56b2724c8d7f9749fa60807 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Sat, 19 Feb 2022 01:52:52 +0100 +Subject: [PATCH] M!102 - Port to libgweather4 + +Adds support for linking against gweather4 (pass -DWITH_GWEATHER4=ON). + +Closes https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/102 +--- + CMakeLists.txt | 10 ++- + config.h.in | 3 + + .../e-weather-location-entry.c | 80 +++++++++++++++++-- + .../evolution-cal-config-weather.c | 41 +++++++++- + 4 files changed, 123 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7247d65f16..1ba2165b4d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,6 +92,7 @@ set(geocode_glib_minimum_version 3.10) + set(gladeui_minimum_version 3.10.0) + set(gnome_autoar_minimum_version 0.1.1) + set(gweather_minimum_version 3.10) ++set(gweather4_minimum_version 3.91.0) + set(libcanberra_gtk_minimum_version 0.25) + set(libnotify_minimum_version 0.7) + set(libunity_minimum_version 7.1.4) +@@ -668,7 +669,14 @@ endif(ENABLE_TEXT_HIGHLIGHT) + add_printable_option(ENABLE_WEATHER "Enable weather calendars" ON) + + if(ENABLE_WEATHER) +- pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GWEATHER gweather-3.0>=${gweather_minimum_version}) ++ add_printable_variable(WITH_GWEATHER4 "Use GWeather 4 instead of 3" OFF) ++ ++ if(WITH_GWEATHER4) ++ pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GWEATHER gweather4>=${gweather4_minimum_version}) ++ else(WITH_GWEATHER4) ++ pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GWEATHER gweather-3.0>=${gweather_minimum_version}) ++ endif(WITH_GWEATHER4) ++ + pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GEO geocode-glib-1.0>=${geocode_glib_minimum_version}) + endif(ENABLE_WEATHER) + +diff --git a/config.h.in b/config.h.in +index 881641355a..2b520a96bd 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -93,6 +93,9 @@ + /* When defined GSpell usage is enabled */ + #cmakedefine HAVE_GSPELL 1 + ++/* Defined when linking against gweather4. Cannot just use GWEATHER_CHECK_VERSION because 40.0 made the versions non-monotonic. */ ++#cmakedefine WITH_GWEATHER4 1 ++ + /* Source code highlighting utility */ + #cmakedefine HIGHLIGHT_COMMAND "@HIGHLIGHT_COMMAND@" + +diff --git a/src/modules/cal-config-weather/e-weather-location-entry.c b/src/modules/cal-config-weather/e-weather-location-entry.c +index f4fb48c403..f4ff276633 100644 +--- a/src/modules/cal-config-weather/e-weather-location-entry.c ++++ b/src/modules/cal-config-weather/e-weather-location-entry.c +@@ -125,9 +125,17 @@ finalize (GObject *object) + priv = entry->priv; + + if (priv->location) ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (priv->location); ++ #else + gweather_location_unref (priv->location); ++ #endif + if (priv->top) ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (priv->top); ++ #else + gweather_location_unref (priv->top); ++ #endif + if (priv->model) + g_object_unref (priv->model); + +@@ -214,11 +222,15 @@ e_weather_location_entry_class_init (EWeatherLocationEntryClass *location_entry_ + + g_object_class_install_property ( + object_class, PROP_TOP, ++ #ifdef WITH_GWEATHER4 ++ g_param_spec_object ("top", ++ #else + g_param_spec_boxed ("top", +- "Top Location", +- "The GWeatherLocation whose children will be used to fill in the entry", +- GWEATHER_TYPE_LOCATION, +- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); ++ #endif ++ "Top Location", ++ "The GWeatherLocation whose children will be used to fill in the entry", ++ GWEATHER_TYPE_LOCATION, ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + + g_object_class_install_property ( + object_class, PROP_SHOW_NAMED_TIMEZONES, +@@ -230,11 +242,15 @@ e_weather_location_entry_class_init (EWeatherLocationEntryClass *location_entry_ + + g_object_class_install_property ( + object_class, PROP_LOCATION, ++ #ifdef WITH_GWEATHER4 ++ g_param_spec_object ("location", ++ #else + g_param_spec_boxed ("location", +- "Location", +- "The selected GWeatherLocation", +- GWEATHER_TYPE_LOCATION, +- G_PARAM_READWRITE)); ++ #endif ++ "Location", ++ "The selected GWeatherLocation", ++ GWEATHER_TYPE_LOCATION, ++ G_PARAM_READWRITE)); + } + + static void +@@ -247,14 +263,22 @@ set_property (GObject *object, + + switch (prop_id) { + case PROP_TOP: ++ #ifdef WITH_GWEATHER4 ++ entry->priv->top = g_value_dup_object (value); ++ #else + entry->priv->top = g_value_dup_boxed (value); ++ #endif + break; + case PROP_SHOW_NAMED_TIMEZONES: + entry->priv->show_named_timezones = g_value_get_boolean (value); + break; + case PROP_LOCATION: + e_weather_location_entry_set_location (E_WEATHER_LOCATION_ENTRY (object), ++ #ifdef WITH_GWEATHER4 ++ g_value_get_object (value)); ++ #else + g_value_get_boxed (value)); ++ #endif + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +@@ -275,7 +299,11 @@ get_property (GObject *object, + g_value_set_boolean (value, entry->priv->show_named_timezones); + break; + case PROP_LOCATION: ++ #ifdef WITH_GWEATHER4 ++ g_value_set_object (value, entry->priv->location); ++ #else + g_value_set_boxed (value, entry->priv->location); ++ #endif + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +@@ -321,7 +349,11 @@ set_location_internal (EWeatherLocationEntry *entry, + priv = entry->priv; + + if (priv->location) ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (priv->location); ++ #else + gweather_location_unref (priv->location); ++ #endif + + g_return_if_fail (iter == NULL || loc == NULL); + +@@ -334,7 +366,11 @@ set_location_internal (EWeatherLocationEntry *entry, + priv->custom_text = FALSE; + g_free (name); + } else if (loc) { ++ #ifdef WITH_GWEATHER4 ++ priv->location = g_object_ref (loc); ++ #else + priv->location = gweather_location_ref (loc); ++ #endif + gtk_entry_set_text (GTK_ENTRY (entry), gweather_location_get_name (loc)); + priv->custom_text = FALSE; + } else { +@@ -384,11 +420,19 @@ e_weather_location_entry_set_location (EWeatherLocationEntry *entry, + -1); + if (gweather_location_equal (loc, cmploc)) { + set_location_internal (entry, model, &iter, NULL); ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (cmploc); ++ #else + gweather_location_unref (cmploc); ++ #endif + return; + } + ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (cmploc); ++ #else + gweather_location_unref (cmploc); ++ #endif + } while (gtk_tree_model_iter_next (model, &iter)); + + set_location_internal (entry, model, NULL, loc); +@@ -411,7 +455,11 @@ e_weather_location_entry_get_location (EWeatherLocationEntry *entry) + g_return_val_if_fail (E_WEATHER_IS_LOCATION_ENTRY (entry), NULL); + + if (entry->priv->location) ++ #ifdef WITH_GWEATHER4 ++ return g_object_ref (entry->priv->location); ++ #else + return gweather_location_ref (entry->priv->location); ++ #endif + else + return NULL; + } +@@ -474,14 +522,22 @@ e_weather_location_entry_set_city (EWeatherLocationEntry *entry, + + cmpcode = gweather_location_get_code (cmploc); + if (!cmpcode || strcmp (cmpcode, code) != 0) { ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (cmploc); ++ #else + gweather_location_unref (cmploc); ++ #endif + continue; + } + + if (city_name) { + cmpname = gweather_location_get_city_name (cmploc); + if (!cmpname || strcmp (cmpname, city_name) != 0) { ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (cmploc); ++ #else + gweather_location_unref (cmploc); ++ #endif + g_free (cmpname); + continue; + } +@@ -489,7 +545,11 @@ e_weather_location_entry_set_city (EWeatherLocationEntry *entry, + } + + set_location_internal (entry, model, &iter, NULL); ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (cmploc); ++ #else + gweather_location_unref (cmploc); ++ #endif + return TRUE; + } while (gtk_tree_model_iter_next (model, &iter)); + +@@ -611,7 +671,11 @@ fill_location_entry_model (GtkListStore *store, + break; + } + ++ #ifdef WITH_GWEATHER4 ++ g_clear_object (&child); ++ #else + g_clear_pointer (&child, gweather_location_unref); ++ #endif + } + + static gchar * +diff --git a/src/modules/cal-config-weather/evolution-cal-config-weather.c b/src/modules/cal-config-weather/evolution-cal-config-weather.c +index 423d6e2357..454cde5e05 100644 +--- a/src/modules/cal-config-weather/evolution-cal-config-weather.c ++++ b/src/modules/cal-config-weather/evolution-cal-config-weather.c +@@ -72,10 +72,18 @@ cal_config_weather_location_to_string (GBinding *binding, + GWeatherLocation *location; + gchar *string = NULL; + ++ #ifdef WITH_GWEATHER4 ++ location = g_value_get_object (source_value); ++ #else + location = g_value_get_boxed (source_value); ++ #endif + #if GWEATHER_CHECK_VERSION(3, 39, 0) + if (location) ++ #ifdef WITH_GWEATHER4 ++ g_object_ref (location); ++ #else + gweather_location_ref (location); ++ #endif + #endif + + while (location && !gweather_location_has_coords (location)) { +@@ -83,7 +91,11 @@ cal_config_weather_location_to_string (GBinding *binding, + GWeatherLocation *child = location; + + location = gweather_location_get_parent (child); ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (child); ++ #else + gweather_location_unref (child); ++ #endif + #else + location = gweather_location_get_parent (location); + #endif +@@ -101,7 +113,9 @@ cal_config_weather_location_to_string (GBinding *binding, + + string = g_strdup_printf ("%s/%s", lat_str, lon_str); + +- #if GWEATHER_CHECK_VERSION(3, 39, 0) ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (location); ++ #elif GWEATHER_CHECK_VERSION(3, 39, 0) + gweather_location_unref (location); + #endif + } +@@ -134,7 +148,11 @@ cal_config_weather_find_location_by_coords (GWeatherLocation *start, + gweather_location_get_coords (location, &lat, &lon); + + if (lat == latitude && lon == longitude) { ++ #ifdef WITH_GWEATHER4 ++ g_object_ref (location); ++ #else + gweather_location_ref (location); ++ #endif + return location; + } + } +@@ -145,7 +163,11 @@ cal_config_weather_find_location_by_coords (GWeatherLocation *start, + + result = cal_config_weather_find_location_by_coords (child, latitude, longitude); + if (result) { ++ #ifdef WITH_GWEATHER4 ++ g_object_unref (child); ++ #else + gweather_location_unref (child); ++ #endif + return result; + } + } +@@ -154,7 +176,11 @@ cal_config_weather_find_location_by_coords (GWeatherLocation *start, + for (ii = 0; children[ii]; ii++) { + location = cal_config_weather_find_location_by_coords (children[ii], latitude, longitude); + if (location) { ++ #ifdef WITH_GWEATHER4 ++ g_object_ref (location); ++ #else + gweather_location_ref (location); ++ #endif + return location; + } + } +@@ -194,7 +220,11 @@ cal_config_weather_string_to_location (GBinding *binding, + + match = cal_config_weather_find_location_by_coords (world, latitude, longitude); + ++ #ifdef WITH_GWEATHER4 ++ g_value_take_object (target_value, match); ++ #else + g_value_take_boxed (target_value, match); ++ #endif + + g_strfreev (tokens); + +@@ -320,8 +350,13 @@ cal_config_weather_insert_widgets (ESourceConfigBackend *backend, + G_BINDING_SYNC_CREATE, + cal_config_weather_string_to_location, + cal_config_weather_location_to_string, ++ #ifdef WITH_GWEATHER4 ++ g_object_ref (world), ++ g_object_unref); ++ #else + gweather_location_ref (world), + (GDestroyNotify) gweather_location_unref); ++ #endif + + e_binding_bind_property ( + extension, "units", +@@ -329,7 +364,9 @@ cal_config_weather_insert_widgets (ESourceConfigBackend *backend, + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); + +-#if GWEATHER_CHECK_VERSION(3, 39, 0) ++#ifdef WITH_GWEATHER4 ++ g_object_unref (world); ++#elif GWEATHER_CHECK_VERSION(3, 39, 0) + gweather_location_unref (world); + #endif + } +-- +2.35.1 + diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 677ad7c8b49..fdd0f0e292c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , cmake , ninja , intltool @@ -33,6 +34,8 @@ , nspr , icu , libcanberra-gtk3 +, geocode-glib +, cmark , bogofilter , gst_all_1 , procps @@ -43,13 +46,19 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.42.4"; + version = "3.43.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+oprem1GsinbXfIv3nZCVFIjV/4b7NexjlNt/piJCmU="; + sha256 = "nBAQtBOGT5fE4VB96MWaNR9LMXT3DSIiig+dXjmz3pg="; }; + patches = [ + # Fix build with gweather4 + # https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/102 + ./0001-M-102-Port-to-libgweather4.patch + ]; + nativeBuildInputs = [ cmake intltool @@ -78,6 +87,8 @@ stdenv.mkDerivation rec { highlight icu libcanberra-gtk3 + geocode-glib + cmark libgdata libgweather libical @@ -107,6 +118,7 @@ stdenv.mkDerivation rec { "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn" "-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter" "-DWITH_OPENLDAP=${openldap}" + "-DWITH_GWEATHER4=ON" ]; requiredSystemFeatures = [ From e409cb6d6081a3bdf03f1492637007a49ef815f4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:33:43 +0000 Subject: [PATCH 121/382] =?UTF-8?q?evolution-ews:=203.42.3=20=E2=86=92=203?= =?UTF-8?q?.43.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.42.3...3.43.2 --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 4d4e33c6373..3ae1f5933b0 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.42.4"; + version = "3.43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "gpIW4GBXT0GCtV7Q8EfdEeK56gCACi+PJ/jbwQkVQbk="; + sha256 = "m6P26aa3DgK0hHXQLaoj5b2iEQZQcuOYBlL1ngeGxf8="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; From 717e78789f0d02f3ef84435de93fca3768b839ec Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:02 +0000 Subject: [PATCH 122/382] =?UTF-8?q?gnome.adwaita-icon-theme:=2041.0=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/compare/41.0...42.beta --- pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index c7c85779d3f..830c25efa5f 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "71M52MNfytXRBIG3BICAPw+iCz08vDOSOPys7q7gHro="; + sha256 = "lAk3ccnZPNh+5rQaNkoH99eRGNXZzpwGATBWJ3scCAU="; }; # For convenience, we can specify adwaita-icon-theme only in packages From 9c7e716ffa08a5a7b5c0163cac00bf4afcd2755d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:07 +0000 Subject: [PATCH 123/382] =?UTF-8?q?gnome.eog:=2041.1=20=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/41.1...42.beta --- pkgs/desktops/gnome/core/eog/default.nix | 41 +++++++++++------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index cdde96ae43b..3c8489128ae 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , meson , ninja , gettext @@ -12,9 +12,9 @@ , libportal-gtk3 , gnome , gtk3 +, libhandy , glib , gsettings-desktop-schemas -, adwaita-icon-theme , gnome-desktop , lcms2 , gdk-pixbuf @@ -24,27 +24,20 @@ , librsvg , libexif , gobject-introspection -, python3 +, gi-docgen }: stdenv.mkDerivation rec { pname = "eog"; - version = "41.1"; + version = "42.beta"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-huG5ujnaz3QiavpFermDtBJTuJ9he/VBOcrQiS0C2Kk="; + sha256 = "sha256-NeArN4a67hTUfPIH23+7krbIcTZEt80UZTcu5KKRuBo="; }; - patches = [ - # Fix build with latest libportal - # https://gitlab.gnome.org/GNOME/eog/-/merge_requests/115 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/eog/-/commit/a06e6325907e136678b0bbe7058c25d688034afd.patch"; - sha256 = "ttcsfHubfmIbxA51YLnxXDagLLNutXYmoQyMQ4sHRak="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -52,15 +45,16 @@ stdenv.mkDerivation rec { gettext itstool wrapGAppsHook - libxml2 + libxml2 # for xmllint for xml-stripblanks gobject-introspection - python3 + gi-docgen ]; buildInputs = [ libjpeg libportal-gtk3 gtk3 + libhandy gdk-pixbuf glib libpeas @@ -71,13 +65,11 @@ stdenv.mkDerivation rec { exempi gsettings-desktop-schemas shared-mime-info - adwaita-icon-theme ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; + mesonFlags = [ + "-Dgtk_doc=true" + ]; preFixup = '' gappsWrapperArgs+=( @@ -88,6 +80,11 @@ stdenv.mkDerivation rec { ) ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From f99d67d09c24b3a7ebf10ac62538f0cc3c3101cf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:19 +0000 Subject: [PATCH 124/382] =?UTF-8?q?gnome.gnome-backgrounds:=2041.0=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/41.0...42.beta --- pkgs/desktops/gnome/core/gnome-backgrounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 89a49e4cecb..c2cfaa630b6 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HaGsDSYb7fD80shbSAvGVQXiPPUfEUMSbA03cX5pMUU="; + sha256 = "jbnaBtzxXiduvbiarUPzk9AKahd8MYj+XQuLXnrhX6U="; }; passthru = { From 1d56ed221e45e442c6ec82af1926d85321c5eeec Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:21 +0000 Subject: [PATCH 125/382] =?UTF-8?q?gnome.gnome-boxes:=2041.3=20=E2=86=92?= =?UTF-8?q?=2042.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/41.3...42.alpha --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 29b08aa3c1e..3c5af219e76 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "41.3"; + version = "42.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "m4QGgNHnOG/d/WoVrU3Q8s2ljv6BjPVHg3tGrovw4Yk="; + sha256 = "z9hnCCvXmiSc9ZhykhpZUNUUDD7ZSucME8cODVSXEgQ="; }; doCheck = true; From 59364999db51973408035e5582c01a303ba8a531 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:25 +0000 Subject: [PATCH 126/382] =?UTF-8?q?gnome.gnome-calculator:=2041.1=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/41.1...42.beta --- .../gnome/core/gnome-calculator/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 6a7a8ccec06..66383fbf9ec 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -8,9 +8,9 @@ , fetchurl , pkg-config , libxml2 -, gtk3 +, gtk4 , glib -, gtksourceview4 +, gtksourceview5 , wrapGAppsHook , gobject-introspection , python3 @@ -19,18 +19,18 @@ , gmp , libsoup , libmpc -, libhandy +, libadwaita , gsettings-desktop-schemas , libgee }: stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "41.1"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AmdhSv2yXTi3hBG0Lrq3vFDBtjQMxJu2jA5DLX3fijQ="; + sha256 = "9nruUc/Ql9pdJ7uU/o0JCkpopfd90boL5fN4X6KFKu0="; }; nativeBuildInputs = [ @@ -46,18 +46,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 + gtk4 glib libxml2 - gtksourceview4 + gtksourceview5 mpfr gmp - gnome.adwaita-icon-theme libgee gsettings-desktop-schemas libsoup libmpc - libhandy + libadwaita ]; doCheck = true; From 2781e6a32b8e2e175be81f4800b512128483a516 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:25 +0000 Subject: [PATCH 127/382] =?UTF-8?q?gnome.gnome-calendar:=2041.2=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/41.2...42.beta --- .../gnome/apps/gnome-calendar/default.nix | 81 +++++++++---------- .../gtk_image_reset_crash.patch | 17 ---- 2 files changed, 38 insertions(+), 60 deletions(-) delete mode 100644 pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index db353165c28..a4327fa760c 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , pkg-config -, wrapGAppsHook -, libdazzle +, wrapGAppsHook4 , libgweather , geoclue2 , geocode-glib @@ -12,29 +13,53 @@ , gettext , libxml2 , gnome -, gtk3 +, gtk4 , evolution-data-server +, libical , libsoup , glib -, gnome-online-accounts , gsettings-desktop-schemas -, libhandy -, adwaita-icon-theme +, libadwaita }: stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "41.2"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lWsvGQMiZRxn/mZyI4lviqWs8ztwraWjsFpTYb2mYRo="; + sha256 = "TTNcGt7tjqLjSuHmt5uVtlFpaHsmjjlsek4l9+rZdlE="; }; patches = [ - # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 - # A refactor has caused the PR patch to drift enough to need rebasing - ./gtk_image_reset_crash.patch + # Fix postinstall referring to gtk-update-icon-cache + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/b7e84c432664f76f10680c04781ab5c3cafdd247.patch"; + sha256 = "ahJwspsnU6uT0mc1W+aWPWgp/9+lVF8H+dAK/IV7qgM="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + libxml2 + wrapGAppsHook4 + python3 + ]; + + buildInputs = [ + gtk4 + evolution-data-server # waiting for GTK4 port + libical + libsoup + glib + libgweather + geoclue2 + geocode-glib + gsettings-desktop-schemas + libadwaita ]; passthru = { @@ -44,41 +69,11 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - libxml2 - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - evolution-data-server - libsoup - glib - gnome-online-accounts - libdazzle - libgweather - geoclue2 - geocode-glib - gsettings-desktop-schemas - adwaita-icon-theme - libhandy - ]; - - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file - patchShebangs build-aux/meson/meson_post_install.py - ''; - meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Calendar"; description = "Simple and beautiful calendar application for GNOME"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch b/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch deleted file mode 100644 index 5065295b57b..00000000000 --- a/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c -index ac32a8f9..532425c1 100644 ---- a/src/gui/views/gcal-year-view.c -+++ b/src/gui/views/gcal-year-view.c -@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self) - if (!updated) - { - gtk_label_set_text (self->temp_label, ""); -- gtk_image_clear (self->weather_icon); -+ /* FIXME: This should never be NULL, but it somehow is. -+ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299 -+ */ -+ if (self->weather_icon != NULL) -+ gtk_image_clear (self->weather_icon); - } - } - From be6dd33ba456a1f8bfa58dbe9cdae7f9b0fa7688 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:26 +0000 Subject: [PATCH 128/382] =?UTF-8?q?gnome.gnome-characters:=2041.0=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/41.0...42.beta Background service was merged into the main executable https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/68 --- .../gnome/apps/gnome-characters/default.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 960a3320472..48254c22a71 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -7,26 +7,26 @@ , gettext , gnome , glib -, gtk3 +, gtk4 , pango -, wrapGAppsHook +, wrapGAppsHook4 , python3 +, desktop-file-utils , gobject-introspection , gjs , libunistring -, libhandy +, libadwaita , gsettings-desktop-schemas -, adwaita-icon-theme , gnome-desktop }: stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0yw6mimfwn0fij8zncjb4rg8bnazd1z47rmzq85lk6807nlyqag1"; + sha256 = "ytMfo5JAI1hhi+aY9GeQmyF1Sp//9Mq4hSPwmiwqGxI="; }; nativeBuildInputs = [ @@ -36,39 +36,39 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + desktop-file-utils + wrapGAppsHook4 ]; buildInputs = [ - adwaita-icon-theme gjs glib gnome-desktop # for typelib gsettings-desktop-schemas - gtk3 + gtk4 libunistring - libhandy + libadwaita pango ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py + + # https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/70 + substituteInPlace meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; dontWrapGApps = true; - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 postFixup = '' - for file in $out/share/org.gnome.Characters/org.gnome.Characters \ - $out/share/org.gnome.Characters/org.gnome.Characters.BackgroundService - do - sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ - -i $file - - wrapGApp "$file" - done + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + file="$out/share/org.gnome.Characters/org.gnome.Characters" + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + wrapGApp "$file" ''; passthru = { From c88681ec730ebaa6dba917aff14bbeec1e157a90 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:29 +0000 Subject: [PATCH 129/382] =?UTF-8?q?gnome.gnome-chess:=2041.1=20=E2=86=92?= =?UTF-8?q?=2042.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-chess/-/compare/41.1...42.alpha --- pkgs/desktops/gnome/games/gnome-chess/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index e47e77d9c0a..3834839de7e 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -14,16 +14,17 @@ , gnome , glib , gtk4 +, libadwaita , librsvg }: stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "41.1"; + version = "42.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "62GYhlljlrQDOj8oo8LjAEtU6+Gzi0DWQiwXufLMF9A="; + sha256 = "53vLHtI+o0Xb/qP3Z0RM29aHTxYohOG81n1OLKaOx1k="; }; nativeBuildInputs = [ @@ -42,8 +43,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk4 + libadwaita librsvg - gnome.adwaita-icon-theme ]; postPatch = '' From 0e3949a77798e51e419cb736c71cf054cd8a0864 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:30 +0000 Subject: [PATCH 130/382] =?UTF-8?q?gnome.gnome-clocks:=2041.0=20=E2=86=92?= =?UTF-8?q?=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/compare/41.0...42.beta --- .../gnome/apps/gnome-clocks/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 2e8ec02bd84..662e21e5455 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -7,35 +8,34 @@ , wrapGAppsHook , itstool , desktop-file-utils -, vala +, vala_0_56 , gobject-introspection , libxml2 -, gtk3 +, gtk4 , glib , gsound , sound-theme-freedesktop , gsettings-desktop-schemas -, adwaita-icon-theme , gnome-desktop , geocode-glib , gnome , gdk-pixbuf , geoclue2 , libgweather -, libhandy +, libadwaita }: stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "34yLBKuS+mGPXe5RGFce+fyeilt5XqAKNcbcZ3ywLaw="; + sha256 = "gZriRRfuGnNe4w5ntHgp1x3b40eC1lyIPJxj0+xwW9g="; }; nativeBuildInputs = [ - vala + vala_0_56 meson ninja pkg-config @@ -48,17 +48,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 + gtk4 glib gsettings-desktop-schemas gdk-pixbuf - adwaita-icon-theme gnome-desktop geocode-glib geoclue2 libgweather gsound - libhandy + libadwaita ]; preFixup = '' @@ -81,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From 133d326efdb7f1f0f98d58c3dc0bdb0a7fa0dd3d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:30 +0000 Subject: [PATCH 131/382] =?UTF-8?q?gnome.gnome-color-manager:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-color-manager/-/compare/3.32.0...3.36.0 --- pkgs/desktops/gnome/core/gnome-color-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index dae367f1d5b..65a9daa5745 100644 --- a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-color-manager"; - version = "3.32.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; + sha256 = "nduea2Ry4RmAE4H5CQUzLsHUJYmBchu6gxyiRs6zrTs="; }; nativeBuildInputs = [ From f603e3eda86ded396f7721ef547807255791480c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:34 +0000 Subject: [PATCH 132/382] =?UTF-8?q?gnome.gnome-contacts:=2041.0=20?= =?UTF-8?q?=E2=86=92=2042.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/41.0...42.alpha - Maps were removed in https://gitlab.gnome.org/GNOME/gnome-contacts/-/commit/de836febcd677d3283438f286727af96b19f305a - Switch to GTK 4 (removes Cheese support for now) https://gitlab.gnome.org/GNOME/gnome-contacts/-/commit/0733806c026504db7f644abd2d04385f54161773 --- .../gnome/core/gnome-contacts/default.nix | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 1c16c3dd35e..1fd94c14784 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -1,18 +1,16 @@ -{ lib, stdenv +{ lib +, stdenv , gettext , fetchurl , evolution-data-server , pkg-config , libxslt -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_42 , python3 -, gtk3 +, gtk4 , glib -, cheese -, libchamplain -, clutter-gtk -, geocode-glib +, libportal , gnome-desktop , gnome-online-accounts , wrapGAppsHook @@ -23,17 +21,17 @@ , vala , meson , ninja -, libhandy +, libadwaita , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "41.0"; + version = "42.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Y+MUm10UdbeiaYAFu191DzyApzVxcWDjnfjP3+v8zfA="; + sha256 = "nTMBGn3/FW/zCNwgGiFSE6vV3x7lyZxKnmc4atwoTA8="; }; propagatedUserEnvPkgs = [ @@ -47,34 +45,25 @@ stdenv.mkDerivation rec { vala gettext libxslt - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_42 python3 wrapGAppsHook ]; buildInputs = [ - gtk3 + gtk4 glib + libportal evolution-data-server gsettings-desktop-schemas folks gnome-desktop - libhandy + libadwaita libxml2 gnome-online-accounts - cheese - gnome.adwaita-icon-theme - libchamplain - clutter-gtk - geocode-glib ]; - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - doCheck = true; passthru = { From e5438a9bf48b3e6f0779a8e4a47ffe248cea2c97 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:36 +0000 Subject: [PATCH 133/382] =?UTF-8?q?gnome.gnome-control-center:=2041.2=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/41.2...42.beta - Cheese removed in https://gitlab.gnome.org/GNOME/gnome-control-center/commit/5ca53a0a78108019bf37ba01b07ac25a123db34a - libsoup removed in https://gitlab.gnome.org/GNOME/gnome-control-center/commit/a9c398e5d9d45fb4638b38d6bb3f677a2b12b249 - libcanberra-gtk3 has been removed in https://gitlab.gnome.org/GNOME/gnome-control-center/commit/652dd8bfc827685a5f5a02889c19dd8db790307c - clutter has been removed in https://gitlab.gnome.org/GNOME/gnome-control-center/commit/697789083db6085798a0324a1237d3b93c1d3a01 --- .../core/gnome-control-center/default.nix | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index f68977e52dd..e4e023ed144 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -4,11 +4,8 @@ , substituteAll , accountsservice , adwaita-icon-theme -, cheese -, clutter -, clutter-gtk , colord -, colord-gtk +, colord-gtk4 , cups , docbook-xsl-nons , fontconfig @@ -26,19 +23,17 @@ , gnome , gsettings-desktop-schemas , gsound -, gtk3 +, gtk4 , ibus -, libcanberra-gtk3 , libgnomekbd , libgtop , libgudev -, libhandy +, libadwaita , libkrb5 , libpulseaudio , libpwquality , librsvg , libsecret -, libsoup , libwacom , libxml2 , libxslt @@ -47,7 +42,7 @@ , mutter , networkmanager , networkmanagerapplet -, libnma +, libnma-gtk4 , ninja , pkg-config , polkit @@ -68,11 +63,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "41.4"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1tsMTLcIV77PSKxQB/ErX2O51dfoDqfuV9O+USZp98k="; + sha256 = "sha256-973QoT+FLQsQyU8oT54wmYuHDZBkfn3TftfvebJQEt0="; }; patches = [ @@ -100,11 +95,8 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice adwaita-icon-theme - cheese - clutter - clutter-gtk colord - colord-gtk + colord-gtk4 libepoxy fontconfig gdk-pixbuf @@ -119,19 +111,17 @@ stdenv.mkDerivation rec { gnome-user-share # optional, sharing panel gsettings-desktop-schemas gsound - gtk3 + gtk4 ibus - libcanberra-gtk3 libgtop libgudev - libhandy + libadwaita libkrb5 - libnma + libnma-gtk4 libpulseaudio libpwquality librsvg libsecret - libsoup libwacom libxml2 modemmanager @@ -145,9 +135,19 @@ stdenv.mkDerivation rec { upower ]; - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file - patchShebangs build-aux/meson/meson_post_install.py + # postPatch = '' + # scriptsToPatch=( + # build-aux/meson/meson_post_install.py + # build-aux/meson/find_xdg_file.py + # ) + # # # patchShebangs requires executable file + # # chmod +x "''${scriptsToPatch[@]}" + # # patchShebangs "''${scriptsToPatch[@]}" + # ''; + + preConfigure = '' + # For ITS rules + addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" ''; preFixup = '' From fcdbc9744702f74a93950131400bacead8e76873 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:40 +0000 Subject: [PATCH 134/382] =?UTF-8?q?gnome.gnome-disk-utility:=2041.0=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/compare/41.0...42.beta --- pkgs/desktops/gnome/core/gnome-disk-utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index 5f3ef81d905..7b3f3f952e4 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-h0PJj9ZWBi74YpM+/jDFvkxrMi7ALu4VTscNCO0Ild8="; + sha256 = "sha256-+032WUvsL4VBncDlNaUZprPJ2H/mSCqh0emLSwKgMdk="; }; nativeBuildInputs = [ From 33c71ed6bb4cd5eeb28e6548d828c6918ae02d43 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:41 +0000 Subject: [PATCH 135/382] =?UTF-8?q?gnome.gnome-font-viewer:=2041.0=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/compare/41.0...42.beta --- .../gnome/core/gnome-font-viewer/default.nix | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 4ba915df2db..fe007c3581d 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -1,20 +1,47 @@ -{ lib, stdenv, meson, ninja, gettext, fetchurl -, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy -, wrapGAppsHook, gnome, harfbuzz }: +{ lib +, stdenv +, meson +, ninja +, gettext +, fetchurl +, pkg-config +, gtk4 +, glib +, libxml2 +, gnome-desktop +, libadwaita +, wrapGAppsHook4 +, gnome +, harfbuzz +}: stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XdQQMxvgcOTgNDl/J1SYDgc4UdUKIRny+/lq3G/i6HY="; + sha256 = "aNUBFJ63k+T8a7lqnYZZdja98Q6eKCA+LmT2QUPNSmk="; }; doCheck = true; - nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz libhandy ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + wrapGAppsHook4 + libxml2 + ]; + + buildInputs = [ + gtk4 + glib + gnome-desktop + harfbuzz + libadwaita + ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; @@ -28,8 +55,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Program that can preview fonts and create thumbnails for fonts"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-font-viewer"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From 25bcef9c8a0dc47f03548974904cfcf22a614207 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:44 +0000 Subject: [PATCH 136/382] =?UTF-8?q?gnome.gnome-initial-setup:=2041.4=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/41.4...42.beta --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 2d5be438c3e..d5e6130b005 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "41.4"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "luzS2252xROxjGBtwmK7UjIoxKrtvtageBHlaP1dtkI="; + sha256 = "ZE3If6EVfL1AQx3ZMuouZc7oHb8X0hiTAK0enqOsPT0="; }; patches = [ From 887a9a9e688210b21e4a325ea28bfc9ec18faef9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:48 +0000 Subject: [PATCH 137/382] =?UTF-8?q?gnome.gnome-maps:=2041.4=20=E2=86=92=20?= =?UTF-8?q?42.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/41.4...42.beta --- .../gnome/apps/gnome-maps/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 5d90cefdff3..56874df59f5 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , gettext @@ -29,13 +31,22 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "41.4"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-40CxP0b+C31bD48BQTKR3c2HDHSlw4+iTKwfWF5wOT4="; + sha256 = "sha256-LuEQu6nDjs4ebdNGmyjWCD/soMvGNRFaGU1nBp1MM4Y="; }; + patches = [ + # Do not pin to GWeather 3.0, the used API did not change in 4.0. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/759d3087b70341b2c5f1af575ce44338d926690e.patch"; + sha256 = "Qp9Hta00TLf2lOb9+g9vnPoK17mP3eHpCG2i1ewaw+w="; + revert = true; + }) + ]; + doCheck = true; nativeBuildInputs = [ @@ -78,7 +89,7 @@ stdenv.mkDerivation rec { # entry point to the wrapped binary we get back to a wrapped # binary. substituteInPlace "data/org.gnome.Maps.service.in" \ - --replace "Exec=@pkgdatadir@/org.gnome.Maps" \ + --replace "Exec=@pkgdatadir@/@app-id@" \ "Exec=$out/bin/gnome-maps" ''; From 1de0e97b3721f5361c738d13308123e02f563515 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:55 +0000 Subject: [PATCH 138/382] =?UTF-8?q?gnome.gnome-remote-desktop:=2041.2=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/41.2...42.beta --- .../core/gnome-remote-desktop/default.nix | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 0f35b15bee9..8068da4dfda 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -7,6 +7,8 @@ , python3 , wrapGAppsHook , glib +, libepoxy +, libdrm , nv-codec-headers-11 , pipewire , systemd @@ -17,16 +19,20 @@ , gdk-pixbuf , freerdp , fuse3 +, mesa +, libgudev +, xvfb-run +, dbus , gnome }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "41.2"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-EBUeabZIwiR8XjPZou9Bn04DfuWyuuSebtasp36xulg="; + hash = "sha256-0T+EE/jdFdjGEHWWfuDtAvkfG61+xBKK4LwWqCZqalw="; }; nativeBuildInputs = [ @@ -43,6 +49,8 @@ stdenv.mkDerivation rec { fuse3 gdk-pixbuf # For libnotify glib + libepoxy + libdrm nv-codec-headers-11 libnotify libsecret @@ -50,17 +58,35 @@ stdenv.mkDerivation rec { libxkbcommon pipewire systemd - ]; + ] ++ checkInputs; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; + checkInputs = [ + mesa # for gbm + libgudev + xvfb-run + python3.pkgs.dbus-python + python3.pkgs.pygobject3 + dbus # for dbus-run-session + ]; mesonFlags = [ "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" ]; + # Too deep of a rabbit hole. + doCheck = false; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs \ + tests/vnc-test-runner.sh \ + tests/run-vnc-tests.py \ + meson_post_install.py + + substituteInPlace tests/vnc-test-runner.sh \ + --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 4e2857a1256a1c8dacfc9fe15e077c72444bf835 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:21 +0000 Subject: [PATCH 139/382] =?UTF-8?q?gnome.mutter:=2041.3=20=E2=86=92=2042.b?= =?UTF-8?q?eta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/41.3...42.beta Co-Authored-By: Bobby Rong --- pkgs/desktops/gnome/core/mutter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index d0b8a7537e2..6fa9fc70b69 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -46,13 +46,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "41.4"; + version = "42.beta"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VYgmlQZKpvA4XNH39/qywqLtLJrsePV4+qB/UgnKUpw="; + sha256 = "Nz3ZZtoUmh8qi2suTxsYIelEkUyaUd5A+0UTCNVD7UQ="; }; patches = [ @@ -136,7 +136,7 @@ let self = stdenv.mkDerivation rec { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; passthru = { - libdir = "${self}/lib/mutter-9"; + libdir = "${self}/lib/mutter-10"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' From 657d2f8f7e13ca2f7c0793a9f977311908442a07 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:34:59 +0000 Subject: [PATCH 140/382] =?UTF-8?q?gnome.gnome-shell:=2041.3=20=E2=86=92?= =?UTF-8?q?=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/41.3...42.beta --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 15 +++++++-------- .../gnome/core/gnome-shell/wrap-services.patch | 10 +++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 3b89ceb7817..07ccb0f516c 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -46,6 +46,7 @@ , evolution-data-server , gtk3 , gtk4 +, libadwaita , sassc , systemd , pipewire @@ -66,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "41.4"; + version = "42.beta"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "x+73SvMEZJwDuG25m9C6x1oBH7/2d0yO41WD282tivQ="; + sha256 = "2jVPkpxtq0gK/7GpzpFyVRc5CuIfV0R/TB8QW/HR0Rc="; }; patches = [ @@ -118,7 +119,6 @@ stdenv.mkDerivation rec { sassc desktop-file-utils libxslt.bin - python3 asciidoc ]; @@ -142,6 +142,7 @@ stdenv.mkDerivation rec { libical gtk3 gtk4 + libadwaita gdm geoclue2 adwaita-icon-theme @@ -169,6 +170,9 @@ stdenv.mkDerivation rec { bash-completion gnome-autoar json-glib + + # for tools + pythonEnv ]; mesonFlags = [ @@ -177,14 +181,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs src/data-to-c.pl - chmod +x meson/postinstall.py - patchShebangs meson/postinstall.py # We can generate it ourselves. rm -f man/gnome-shell.1 - - substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" - substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" ''; preFixup = '' diff --git a/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch index bc494caea9d..5ce4a2fd46d 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch @@ -1,7 +1,7 @@ diff --git a/js/dbusServices/dbus-service.in b/js/dbusServices/dbus-service.in old mode 100644 new mode 100755 -index 524166102..100b81a63 +index 524166102..6d0722a1c --- a/js/dbusServices/dbus-service.in +++ b/js/dbusServices/dbus-service.in @@ -1,3 +1,9 @@ @@ -24,18 +24,18 @@ index 3b0d09abe..4fd4bb66d 100644 -Exec=@gjs@ @pkgdatadir@/@service@ +Exec=@pkgdatadir@/@service@ diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build -index c749f45dc..11bcb0c9e 100644 +index eb941ed90..552051e5a 100644 --- a/js/dbusServices/meson.build +++ b/js/dbusServices/meson.build @@ -2,6 +2,7 @@ launcherconf = configuration_data() launcherconf.set('PACKAGE_NAME', meson.project_name()) launcherconf.set('prefix', prefix) launcherconf.set('libdir', libdir) -+launcherconf.set('gjs', gjs.path()) ++launcherconf.set('gjs', gjs.full_path()) dbus_services = { 'org.gnome.Shell.Extensions': 'extensions', -@@ -11,16 +12,17 @@ dbus_services = { +@@ -18,16 +19,17 @@ endif config_dir = '@0@/..'.format(meson.current_build_dir()) foreach service, dir : dbus_services @@ -51,7 +51,7 @@ index c749f45dc..11bcb0c9e 100644 serviceconf = configuration_data() serviceconf.set('service', service) -- serviceconf.set('gjs', gjs.path()) +- serviceconf.set('gjs', gjs.full_path()) serviceconf.set('pkgdatadir', pkgdatadir) configure_file( From 11cdccbabc257dc408b43988f45d1efd0d1d086f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:00 +0000 Subject: [PATCH 141/382] =?UTF-8?q?gnome.gnome-shell-extensions:=2041.1=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/41.1...42.beta --- pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index aa61bd91c29..0a34495908f 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "41.2"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rZuoL0y9BHJpc7XoevrRiv2qMjhgoK8+ckDzp00iLxk="; + sha256 = "QtHztEMRGe344a66JKAMgC9ixQBn4j2xKIynwSWsIu8="; }; patches = [ From 598947ae72113db41d7283a7c4a97858d15236fc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:00 +0000 Subject: [PATCH 142/382] =?UTF-8?q?gnome.gnome-software:=2041.3=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/41.3...42.beta --- .../desktops/gnome/core/gnome-software/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index aa9058ad410..6c956bb4f11 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -13,7 +13,7 @@ , glib , appstream , libsoup -, libhandy +, libadwaita , polkit , isocodes , gspell @@ -21,7 +21,7 @@ , gobject-introspection , flatpak , fwupd -, gtk3 +, gtk4 , gsettings-desktop-schemas , gnome-desktop , libxmlb @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "41.4"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "evhzzkcs8racUbyevGG4Nt+8z9b0Jwbj7TqpCaruxGU="; + sha256 = "vGxp+8L0IMjQA604lu6Coe8GpIFWS5E69StzFxf7TXY="; }; patches = [ @@ -73,12 +73,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 + gtk4 glib packagekit appstream libsoup - libhandy + libadwaita gsettings-desktop-schemas gnome-desktop gspell @@ -97,6 +97,8 @@ stdenv.mkDerivation rec { "-Dgudev=false" # FIXME: package malcontent parental controls "-Dmalcontent=false" + # Needs flatpak to upgrade + "-Dsoup2=true" ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ]; From f06dbfae4331f48b383afa4073074fbc4d755e75 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:04 +0000 Subject: [PATCH 143/382] =?UTF-8?q?gnome.gnome-sound-recorder:=2040.0=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sound-recorder/-/compare/40.0...42.beta --- .../gnome/apps/gnome-sound-recorder/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index 29f7aa6e9ee..d18992c1434 100644 --- a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , pkg-config , gettext @@ -6,7 +7,7 @@ , wrapGAppsHook , gjs , glib -, gtk3 +, gtk4 , gdk-pixbuf , gst_all_1 , gnome @@ -14,16 +15,16 @@ , ninja , python3 , desktop-file-utils -, libhandy +, libadwaita }: stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "40.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "00b55vsfzx877b7mj744abzjws7zclz71wbvh0axsrbl9l84ranl"; + sha256 = "wKXhOnuXryq4aZechRketErQ6l9Iqc56ORGnsKZVwpA="; }; nativeBuildInputs = [ @@ -40,9 +41,9 @@ stdenv.mkDerivation rec { buildInputs = [ gjs glib - gtk3 + gtk4 gdk-pixbuf - libhandy + libadwaita ] ++ (with gst_all_1; [ gstreamer gst-plugins-base From 4414fcd6fb31ced6e9acd7db9d583f376ce9ef87 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:05 +0000 Subject: [PATCH 144/382] =?UTF-8?q?gnome.gnome-system-monitor:=2041.0=20?= =?UTF-8?q?=E2=86=92=2042.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/41.0...42.alpha --- pkgs/desktops/gnome/core/gnome-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index d373d6f358c..a3dea632291 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "41.0"; + version = "42.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "x/xExhlJt5SwKJlo67vMDBX4z8PZ5Fv6qB7UXBITnl8="; + sha256 = "puK3mIgkm/YQpVaOCvjq2gFNiQ1PwXxWb2Gk21lHqMo="; }; nativeBuildInputs = [ From 45c999dc44054a4a7a7924ea8096dbd97665117c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:07 +0000 Subject: [PATCH 145/382] =?UTF-8?q?gnome.gnome-terminal:=203.42.2=20?= =?UTF-8?q?=E2=86=92=203.43.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-terminal/-/compare/3.42.2...3.43.90 --- pkgs/desktops/gnome/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 588d6e3ced3..719c0eabce1 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.42.2"; + version = "3.43.90"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ipyOXvejpzskapR+EZC7COyYk1r4YM8LOqL79GBoF6A="; + sha256 = "pQpyOodNNkoP78GfmU2IVUWqYKUdaBimL/kPgv9TydY="; }; nativeBuildInputs = [ From 2564d3eb9216101b6397211941d602adfbc6a775 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:12 +0000 Subject: [PATCH 146/382] =?UTF-8?q?gnome.gnome-weather:=2041.0=20=E2=86=92?= =?UTF-8?q?=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/41.0...42.beta --- .../gnome/apps/gnome-weather/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index aa192a6a3b6..88495c9a237 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -3,8 +3,8 @@ , fetchurl , pkg-config , gnome -, gtk3 -, libhandy +, gtk4 +, libadwaita , wrapGAppsHook , gjs , gobject-introspection @@ -12,18 +12,17 @@ , meson , ninja , geoclue2 -, gnome-desktop , python3 , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1vidwq768xnrnr24jcfbpwjczz7vm5zmaiv41nb75q4p8avlwqg5"; + sha256 = "veAxQbZcSq4qofvOdH7zmkAvbOMrQXzw4dYXC3jxfho="; }; nativeBuildInputs = [ @@ -35,11 +34,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 - libhandy + gtk4 + libadwaita gjs gobject-introspection - gnome-desktop libgweather gnome.adwaita-icon-theme geoclue2 @@ -70,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Weather"; description = "Access current weather conditions and forecasts"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From 9f425475035365e7ece80ff3fde6a2d726c1a100 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:21 +0000 Subject: [PATCH 147/382] =?UTF-8?q?gnome.nautilus:=2041.2=20=E2=86=92=2042?= =?UTF-8?q?.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/41.2...42.beta --- pkgs/desktops/gnome/core/nautilus/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 3f61f55db1d..50aec269f97 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "41.2"; + version = "42.beta"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hyKFscQKbuQYzile0RX1Qn2nCQfYItlbz1FnXVSYgis="; + sha256 = "z6TYKgbtYMvsB3i2d7wi7gaws/vfwTLKhwoL8LJmQjE="; }; patches = [ @@ -53,17 +53,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tracker; }) - - # Fix build with latest libportal - # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/749 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/55cfd66ccca391fc144f5863ff6bfc1f3b137e2d.patch"; - sha256 = "xSb9l7xxEYpAwmdmeWT/t7Z9Ck3DPtsODzbReQW/Q70="; - excludes = [ - "build-aux/flatpak/org.gnome.Nautilus.json" - "build-aux/flatpak/org.gnome.Nautilus.yml" - ]; - }) ]; nativeBuildInputs = [ From 46fc39901c7255feda3db7efe428524d8c6d1f9c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:35 +0000 Subject: [PATCH 148/382] =?UTF-8?q?gnome.yelp:=2041.2=20=E2=86=92=2042.bet?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp/-/compare/41.2...42.beta --- pkgs/desktops/gnome/core/yelp/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index be858a19487..2eea34ed3a4 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -5,6 +5,7 @@ , webkitgtk , pkg-config , gtk3 +, libhandy , glib , gnome , sqlite @@ -17,11 +18,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "41.2"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sAvwM/At15ttPyVQMccd+NbtOOVSyHC485GjdHJMQ8U="; + sha256 = "sha256-cT187uTnI9ECP6Ox4HN4MUcZKRctNGhC/tBHFO6zkK8="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 + libhandy glib webkitgtk sqlite From 75b20869b1b133845f759d9e60fdf84af15c2700 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:35 +0000 Subject: [PATCH 149/382] =?UTF-8?q?gnome.yelp-xsl:=2041.1=20=E2=86=92=2042?= =?UTF-8?q?.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp-xsl/-/compare/41.1...42.beta --- pkgs/desktops/gnome/core/yelp-xsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 6fac906e4ba..ab4a0959ff8 100644 --- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "41.1"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DW2zesLvgSSD4BBHA/H6nPAy6eCVal8cOvvMI3kfilQ="; + sha256 = "sha256-yhd6HPx+NhYfr8gVYJcuQiA6o+hgbfWXlL8D7ez3Vsw="; }; nativeBuildInputs = [ From 316d1c2e9a23f1ab97eebf2008e43b9102821dcc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:39 +0000 Subject: [PATCH 150/382] =?UTF-8?q?gnome-builder:=2041.3=20=E2=86=92=2042.?= =?UTF-8?q?alpha1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/41.3...42.alpha1 --- .../editors/gnome-builder/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 0e2ffe46d20..28f2225248a 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -4,8 +4,8 @@ , cmark , appstream-glib , desktop-file-utils -, fetchurl , fetchpatch +, fetchurl , flatpak , gnome , libgit2-glib @@ -40,21 +40,21 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "41.3"; + version = "42.alpha1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "4iUPyOnp8gAsRS5ZUNgmhXNNPESAs1Fnq1CKyHAlCeE="; + sha256 = "AtJ+Op2ChWWgcREWFb3zqyp1CzBb/469BwJXK3DuWnc="; }; patches = [ - # Fix build with latest libportal - # https://gitlab.gnome.org/GNOME/gnome-builder/-/merge_requests/486 + # Fix building docs + # https://gitlab.gnome.org/GNOME/gnome-builder/-/merge_requests/530 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1.patch"; - sha256 = "B/uCcYavFvOAPhLHZ4MRNENDd6VytILiGYwDZRUSxTE="; + url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/e2b369ec056ff43701803c5e5185fa2ac391d238.patch"; + sha256 = "OI2CMtA0M9u6/5xmWm4i+bXOKDXmtYprCONNCU2aOj0="; }) ]; @@ -103,10 +103,6 @@ stdenv.mkDerivation rec { xvfb-run ]; - prePatch = '' - patchShebangs build-aux/meson/post_install.py - ''; - mesonFlags = [ "-Ddocs=true" @@ -122,6 +118,10 @@ stdenv.mkDerivation rec { # understand why. Somebody should look into fixing this. doCheck = true; + postPatch = '' + patchShebangs build-aux/meson/post_install.py + ''; + checkPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ From cef91bab63859c3ad0316ba5ca3533a4d83a5e88 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:45 +0000 Subject: [PATCH 151/382] =?UTF-8?q?gnome-text-editor:=2041.1=20=E2=86=92?= =?UTF-8?q?=2042.alpha2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/41.1...42.alpha2 --- .../gnome/apps/gnome-text-editor/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 22f9ac176aa..3a8dde63190 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "41.1"; + version = "42.alpha2"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YZ7FINbgkF1DEWcCTkPc4Nv2o0Xy1IaTUB1w3HYm+GE="; + sha256 = "sha256-EN0zMEv/ij3fBwHaU5gB5s0SmVJ5rw4kWNI3P90LXoo="; }; nativeBuildInputs = [ @@ -53,14 +53,6 @@ stdenv.mkDerivation rec { pcre ]; - postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py - substituteInPlace build-aux/meson/postinstall.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - - passthru = { updateScript = gnome.updateScript { packageName = "gnome-text-editor"; From 449331be09c568ec241cf1d351d10aafb177dd31 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:35:47 +0000 Subject: [PATCH 152/382] =?UTF-8?q?gnome-tour:=2040.0=20=E2=86=92=2042.bet?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-tour/-/compare/40.0...42.beta --- pkgs/desktops/gnome/core/gnome-tour/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index c496ceee6ed..633ad5b9385 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -6,7 +6,7 @@ , ninja , fetchurl , pkg-config -, gtk3 +, gtk4 , glib , gdk-pixbuf , desktop-file-utils @@ -14,7 +14,7 @@ , wrapGAppsHook , python3 , gnome -, libhandy +, libadwaita , librsvg , rustc , cargo @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "40.1"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-rYYS110B7qY8WcmY65KOvm75mEZgYbn8H97IKF02M5g="; + hash = "sha256-c8NnZvWcqnnYXKuooveqaize81fBT6JZHgXck7Fbx+I="; }; cargoVendorDir = "vendor"; @@ -49,16 +49,11 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf glib - gtk3 - libhandy + gtk4 + libadwaita librsvg ]; - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; From 30f4cad09d7b83efa921b9d84f68d311d070c169 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 18:37:02 +0000 Subject: [PATCH 153/382] =?UTF-8?q?orca:=2041.2=20=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/41.2...42.beta --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index d0b2c85f107..3de74635349 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "41.2"; + version = "42.beta"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1/Jy6ps3+9ZFTkAh5GU4okcibhwKxXDW4rhOlxmqKv4="; + sha256 = "lhL6XiigaN4lAi0d5/OWrBRjArySLTTvGG5YeEJR96M="; }; patches = [ From 1ced655c916fa4de70b92a3b03a21cefb17e1453 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 21:42:04 +0100 Subject: [PATCH 154/382] nixos/gnome: switch from gedit to gnome-text-editor This is the new editor. https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1321 --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index e2323785149..4bbf59c0d15 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -513,7 +513,7 @@ in cheese eog epiphany - gedit + pkgs.gnome-text-editor gnome-calculator gnome-calendar gnome-characters From 47dbd9f99a44e728f12058ce6c95874954ba30e3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 Feb 2022 03:39:30 +0100 Subject: [PATCH 155/382] =?UTF-8?q?gnome.ghex:=203.41.1=20=E2=86=92=204.be?= =?UTF-8?q?ta.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/3.41.1...4.beta.1 https://gitlab.gnome.org/GNOME/ghex/-/blob/4.beta.1/NEWS --- pkgs/desktops/gnome/apps/ghex/default.nix | 44 ++++++++++++++++++----- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index d12c8f61017..1ec3c9dfdf2 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -1,7 +1,9 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config +, gi-docgen , meson , ninja , python3 @@ -11,23 +13,38 @@ , gettext , itstool , libxml2 -, gtk3 +, gtk4 , glib , atk +, gobject-introspection , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "ghex"; - version = "3.41.1"; + version = "4.beta.1"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "i3nPAJ6uXEfK0KtT4hmcOm+y86thh381m+1SR3DuYfc="; + url = "mirror://gnome/sources/ghex/${version}/${pname}-${version}.tar.xz"; + sha256 = "sBS/9cY++uHLGCbLeex8ZW697JJn3dK+HaM6tHBdwJ4="; }; + patches = [ + # Fix build with -Werror=format-security + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/3d35359f3a12b6abb4a3d8a12a0f39b7221be408.patch"; + sha256 = "4z9nUd+/eBOUGwl3MErse+FKLzGqtWKwkIzej57CnYk="; + }) + # Build devhelp index. + # https://gitlab.gnome.org/GNOME/ghex/-/merge_requests/25 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/b26a7b1135ea2fe956a9bc0669b3b6ed818716c3.patch"; + sha256 = "nYjjxds9GNWkW/RhXEe5zJzPF4TnLMsCELEqYR4dXTk="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext @@ -35,12 +52,14 @@ stdenv.mkDerivation rec { meson ninja pkg-config + gi-docgen python3 + gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 + gtk4 atk glib ]; @@ -50,9 +69,18 @@ stdenv.mkDerivation rec { desktop-file-utils ]; + mesonFlags = [ + "-Dgtk_doc=true" + ]; + postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { From 185522691f5cd562a80a511b3560844780a58953 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 07:03:02 +0100 Subject: [PATCH 156/382] nixos/gnome: Remove realtime scheduling option It is now accomplished using rtkit rather than setcap wrapper: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060 Replace the option with `security.rtkit.enable`. Closes: https://github.com/NixOS/nixpkgs/issues/90201 Closes: https://github.com/NixOS/nixpkgs/issues/86730 --- .../from_md/release-notes/rl-2205.section.xml | 10 ++++ .../manual/release-notes/rl-2205.section.md | 2 + .../services/x11/desktop-managers/gnome.nix | 59 ++----------------- 3 files changed, 16 insertions(+), 55 deletions(-) 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 0b01c4e0884..51184ba0a2c 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 @@ -670,6 +670,16 @@ 6.x and renamed to gnome-secrets. + + + services.gnome.experimental-features.realtime-scheduling + option has been removed, as GNOME Shell now + uses + rtkit. Use + security.rtkit.enable = true; instead. As + before, you will need to have it enabled using GSettings. + + If you previously used diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 5b93b644eea..9caec0ac07f 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -275,6 +275,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`. +- `services.gnome.experimental-features.realtime-scheduling` option has been removed, as GNOME Shell now [uses rtkit](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060). Use `security.rtkit.enable = true;` instead. As before, you will need to have it enabled using GSettings. + - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. - Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected. diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 4bbf59c0d15..98e240f6610 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -132,6 +132,10 @@ in [ "environment" "gnome3" "excludePackages" ] [ "environment" "gnome" "excludePackages" ] ) + (mkRemovedOptionModule + [ "services" "gnome" "experimental-features" "realtime-scheduling" ] + "Set `security.rtkit.enable = true;` to make realtime scheduling possible. (Still needs to be enabled using GSettings.)" + ) ]; options = { @@ -142,38 +146,6 @@ in core-utilities.enable = mkEnableOption "GNOME core utilities"; core-developer-tools.enable = mkEnableOption "GNOME core developer tools"; games.enable = mkEnableOption "GNOME games"; - - experimental-features = { - realtime-scheduling = mkOption { - type = types.bool; - default = false; - description = '' - Makes mutter (which propagates to gnome-shell) request a low priority real-time - scheduling which is only available on the wayland session. - To enable this experimental feature it requires a restart of the compositor. - Note that enabling this option only enables the capability - for realtime-scheduling to be used. It doesn't automatically set the gsetting - so that mutter actually uses realtime-scheduling. This would require adding - rt-scheduler to /org/gnome/mutter/experimental-features - with dconf-editor. You cannot use extraGSettingsOverrides because that will only - change the default value of the setting. - - Please be aware of these known issues with the feature in nixos: - - - - NixOS/nixpkgs#90201 - - - - - NixOS/nixpkgs#86730 - - - - ''; - }; - }; }; services.xserver.desktopManager.gnome = { @@ -480,29 +452,6 @@ in ]; }) - # Enable soft realtime scheduling, only supported on wayland - (mkIf serviceCfg.experimental-features.realtime-scheduling { - security.wrappers.".gnome-shell-wrapped" = { - source = "${pkgs.gnome.gnome-shell}/bin/.gnome-shell-wrapped"; - owner = "root"; - group = "root"; - capabilities = "cap_sys_nice=ep"; - }; - - systemd.user.services.gnome-shell-wayland = let - gnomeShellRT = with pkgs.gnome; pkgs.runCommand "gnome-shell-rt" {} '' - mkdir -p $out/bin/ - cp ${gnome-shell}/bin/gnome-shell $out/bin - sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell - ''; - in { - # Note we need to clear ExecStart before overriding it - serviceConfig.ExecStart = ["" "${gnomeShellRT}/bin/gnome-shell"]; - # Do not use the default environment, it provides a broken PATH - environment = mkForce {}; - }; - }) - # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst (mkIf serviceCfg.core-utilities.enable { environment.systemPackages = From f828b189d9d270b834fa181d41a5383c526e3120 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 08:02:28 +0100 Subject: [PATCH 157/382] nixos/gnome: do not install gnome-screenshot It has been replaced by a tool built into GNOME Shell: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/commit/b281beb124e878cfa381a3a4a0aa616ee530cd7c --- nixos/modules/services/x11/desktop-managers/gnome.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 98e240f6610..82ed5615de5 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -473,7 +473,6 @@ in gnome-maps gnome-music pkgs.gnome-photos - gnome-screenshot gnome-system-monitor gnome-weather nautilus From fa13ab6e1fe1a1bbf21b2520d86e6a97d6d60704 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 08:11:27 +0100 Subject: [PATCH 158/382] gnome-console: rename from kgx --- .../terminal-emulators/{kgx => gnome-console}/default.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/applications/terminal-emulators/{kgx => gnome-console}/default.nix (100%) diff --git a/pkgs/applications/terminal-emulators/kgx/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix similarity index 100% rename from pkgs/applications/terminal-emulators/kgx/default.nix rename to pkgs/applications/terminal-emulators/gnome-console/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2731c0bd3fc..edc3d6ba479 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -549,6 +549,7 @@ mapAliases ({ keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived"; # Added 2019-12-10 keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 + kgx = gnome-console; # Added 2022-02-19 kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 kicad-with-packages3d = kicad; # Added 2019-11-25 kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download"; # Added 2021-03-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3d3549d69f..f4968f37edc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33508,7 +33508,7 @@ with pkgs; keynav = callPackage ../tools/X11/keynav { }; - kgx = callPackage ../applications/terminal-emulators/kgx { }; + gnome-console = callPackage ../applications/terminal-emulators/gnome-console { }; kmon = callPackage ../tools/system/kmon { }; From 184fe6a337f362dfe4354f5e073478181c81b07c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 08:13:38 +0100 Subject: [PATCH 159/382] =?UTF-8?q?gnome-console:=20unstable-2021-03-13=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/console/-/compare/105adb6a8d09418a3ce622442aef6ae623dee787...42.beta --- .../gnome-console/default.nix | 38 +++++++------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 1be9412e8da..9b4b460550f 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, genericBranding ? false -, fetchFromGitLab +, fetchurl , gettext , gnome , libgtop @@ -21,16 +20,13 @@ , nixosTests }: -stdenv.mkDerivation { - pname = "kgx"; - version = "unstable-2021-03-13"; +stdenv.mkDerivation rec { + pname = "gnome-console"; + version = "42.beta"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "ZanderBrown"; - repo = "kgx"; - rev = "105adb6a8d09418a3ce622442aef6ae623dee787"; - sha256 = "0m34y0nbcfkyicb40iv0iqaq6f9r3f66w43lr803j3351nxqvcz2"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "Lq/shyAhDcwB5HqpihvGx2+xwVU2Xax7/NerFwR36DQ="; }; buildInputs = [ @@ -55,25 +51,19 @@ stdenv.mkDerivation { wrapGAppsHook ]; - mesonFlags = lib.optional genericBranding "-Dgeneric=true"; - - postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py - ''; - - preFixup = '' - substituteInPlace $out/share/applications/org.gnome.zbrown.KingsCross.desktop \ - --replace "Exec=kgx" "Exec=$out/bin/kgx" - ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; passthru.tests.test = nixosTests.terminal-emulators.kgx; meta = with lib; { description = "Simple user-friendly terminal emulator for the GNOME desktop"; - homepage = "https://gitlab.gnome.org/ZanderBrown/kgx"; + homepage = "https://gitlab.gnome.org/GNOME/console"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ zhaofengli ]; + maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]); platforms = platforms.linux; }; } From 7addb1c0ec2507b7ba69137e49a5ca5a16c03250 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 08:31:07 +0100 Subject: [PATCH 160/382] nixos/gnome: install gnome-console (kgx) instead of gnome-terminal https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/457 --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 82ed5615de5..4a54de5e766 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -467,6 +467,7 @@ in gnome-calendar gnome-characters gnome-clocks + pkgs.gnome-console gnome-contacts gnome-font-viewer gnome-logs @@ -495,7 +496,6 @@ in programs.file-roller.enable = notExcluded pkgs.gnome.file-roller; programs.geary.enable = notExcluded pkgs.gnome.geary; programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility; - programs.gnome-terminal.enable = notExcluded pkgs.gnome.gnome-terminal; programs.seahorse.enable = notExcluded pkgs.gnome.seahorse; services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi; From 03c41ef772b9bd4aad949d4ea76ef0bf0b232dad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 09:26:49 +0100 Subject: [PATCH 161/382] doc/release-notes: Mention GNOME 42 --- .../manual/from_md/release-notes/rl-2205.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 12 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 51184ba0a2c..645397ac5fb 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 @@ -25,6 +25,16 @@ services.nginx.virtualHosts.*.enableACME). + + + GNOME has been upgraded to 42. Please take a look at their + Release + Notes for details. Notably, it replaces gedit with + GNOME Text Editor, GNOME Terminal with GNOME Console (formerly + King’s Cross), and GNOME Screenshot with a tool built into the + Shell. + + PHP 8.1 is now available diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 9caec0ac07f..2f142d4f42b 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -11,6 +11,8 @@ In addition to numerous new and upgraded packages, this release has the followin the option to use DNS-01 validation when using `enableACME` on web server virtual hosts (e.g. `services.nginx.virtualHosts.*.enableACME`). +- GNOME has been upgraded to 42. Please take a look at their [Release Notes](https://release.gnome.org/42/) for details. Notably, it replaces gedit with GNOME Text Editor, GNOME Terminal with GNOME Console (formerly King’s Cross), and GNOME Screenshot with a tool built into the Shell. + - PHP 8.1 is now available - Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html). From 9664785741ce66d1f4e7eefb3679d644c7646074 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:12:12 +0000 Subject: [PATCH 162/382] =?UTF-8?q?vala=5F0=5F56:=200.55.3=20=E2=86=92=200?= =?UTF-8?q?.55.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/-/compare/0.55.3...0.55.90 --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 3bb0f4c9a4b..5d70446b848 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -100,8 +100,8 @@ in rec { }; vala_0_56 = generic { - version = "0.55.3"; - sha256 = "wWGF59HyF4NqfOvGSar+g1ULt7GS+9Mn7eOIzSwtUEk="; + version = "0.55.90"; + sha256 = "jY49tFLkB3eeisTjsKWx2qVGDc6SDvN599dKNtMKXDM="; }; vala = vala_0_54; From 046c9e05a029fa953bd899c39bd0b4f52bf61ab1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 12:21:37 +0100 Subject: [PATCH 163/382] libsecret: clean up --- .../libraries/libsecret/default.nix | 72 ++++++++++++++----- 1 file changed, 54 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 18f00a0933c..e91329b26be 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,29 +1,64 @@ -{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 -, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala -, gtk-doc, gnome, gjs, libintl, dbus, xvfb-run }: +{ stdenv +, lib +, fetchurl +, glib +, pkg-config +, gettext +, libxslt +, python3 +, docbook-xsl-nons +, docbook_xml_dtd_42 +, libgcrypt +, gobject-introspection +, vala +, gtk-doc +, gnome +, gjs +, libintl +, dbus +, xvfb-run +}: stdenv.mkDerivation rec { pname = "libsecret"; version = "0.20.4"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"; }; - postPatch = '' - patchShebangs . - ''; - - outputs = [ "out" "dev" "devdoc" ]; - - propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ - pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl - gobject-introspection vala gtk-doc glib + pkg-config + gettext + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 + libintl + gobject-introspection + vala + gtk-doc + glib + ]; + + buildInputs = [ + libgcrypt + ]; + + propagatedBuildInputs = [ + glib + ]; + + installCheckInputs = [ + python3 + python3.pkgs.dbus-python + python3.pkgs.pygobject3 + xvfb-run + dbus + gjs ]; - buildInputs = [ libgcrypt ]; - # optional: build docs with gtk-doc? (probably needs a flag as well) configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" @@ -31,12 +66,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installCheckInputs = [ - python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb-run dbus gjs - ]; - # needs to run after install because typelibs point to absolute paths doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib + + postPatch = '' + patchShebangs . + ''; + installCheckPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ From 0222931643ea81af4d48d1fb4b2c91e2d73e7b07 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:11:37 +0000 Subject: [PATCH 164/382] =?UTF-8?q?libsecret:=200.20.4=20=E2=86=92=200.20.?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsecret/-/compare/0.20.4...0.20.5 --- .../libraries/libsecret/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index e91329b26be..9e8be02aa63 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -2,6 +2,8 @@ , lib , fetchurl , glib +, meson +, ninja , pkg-config , gettext , libxslt @@ -11,7 +13,7 @@ , libgcrypt , gobject-introspection , vala -, gtk-doc +, gi-docgen , gnome , gjs , libintl @@ -21,25 +23,27 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.20.4"; + version = "0.20.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"; + sha256 = "P7PONA/NfbVNh8iT5pv8Kx9uTUsnkGX/5m2snw/RK00="; }; nativeBuildInputs = [ + meson + ninja pkg-config gettext - libxslt + libxslt # for xsltproc for building man pages docbook-xsl-nons docbook_xml_dtd_42 libintl gobject-introspection vala - gtk-doc + gi-docgen glib ]; @@ -60,12 +64,6 @@ stdenv.mkDerivation rec { gjs ]; - configureFlags = [ - "--with-libgcrypt-prefix=${libgcrypt.dev}" - ]; - - enableParallelBuilding = true; - # needs to run after install because typelibs point to absolute paths doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib @@ -80,6 +78,11 @@ stdenv.mkDerivation rec { make check ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 100ae90d517dd243d16b89edf16805bf5d8ad874 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 12:54:30 +0100 Subject: [PATCH 165/382] tree-wide: Modernize moving gi-docgen-built docs to devdoc output Since DevHelp 41, it no longer needs to be stored in `share/devhelp`. --- pkgs/development/libraries/gdk-pixbuf/default.nix | 9 +++++---- pkgs/development/libraries/gtk/4.x.nix | 10 +++------- pkgs/development/libraries/pango/default.nix | 9 +++------ 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 3182a4b3998..74f0c7c09c7 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -111,10 +111,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache - '' + lib.optionalString withGtkDoc '' - # So that devhelp can find this. - mkdir -p "$devdoc/share/devhelp" - mv "$out/share/doc" "$devdoc/share/devhelp/books" ''; # The fixDarwinDylibNames hook doesn't patch binaries. @@ -124,6 +120,11 @@ stdenv.mkDerivation rec { done ''; + postFixup = lib.optionalString withGtkDoc '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit doCheck; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 6da3fc769ea..1f61793de5b 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -202,13 +202,6 @@ stdenv.mkDerivation rec { for f in $dev/bin/gtk4-encode-symbolic-svg; do wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" done - - '' + lib.optionalString x11Support '' - # So that DevHelp can find this. - # TODO: Remove this with DevHelp 41. - mkdir -p "$devdoc/share/devhelp/books" - mv "$out/share/doc/"* "$devdoc/share/devhelp/books" - rmdir -p --ignore-fail-on-non-empty "$out/share/doc" ''; # Wrap demos @@ -219,6 +212,9 @@ stdenv.mkDerivation rec { wrapProgram $dev/bin/$program \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" done + '' + lib.optionalString x11Support '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 3033b7df4e3..0e6e1d33ba3 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -84,12 +84,9 @@ stdenv.mkDerivation rec { doCheck = false; # test-font: FAIL - postInstall = lib.optionalString withDocs '' - # So that devhelp can find this. - # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448 - mkdir -p "$devdoc/share/devhelp" - mv "$out/share/doc/pango/reference" "$devdoc/share/devhelp/books" - rmdir -p --ignore-fail-on-non-empty "$out/share/doc/pango" + postFixup = lib.optionalString withDocs '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { From e5d429af2df840d6fe69656bdafa7ec381f55b82 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:08:57 +0000 Subject: [PATCH 166/382] =?UTF-8?q?gnome.file-roller:=203.40.0=20=E2=86=92?= =?UTF-8?q?=203.41.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/file-roller/-/compare/3.40.0...3.41.90 --- pkgs/desktops/gnome/apps/file-roller/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index c4c489dae08..ea9eb8dfd38 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -17,6 +17,7 @@ , glib , gnome , gtk3 +, libhandy , json-glib , libarchive , libnotify @@ -28,11 +29,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.40.0"; + version = "3.41.90"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a"; + sha256 = "Bi5rSO1re8o9ONAoY9apsBP0zNNbpvvjXFaYeQDf7Ok="; }; patches = lib.optionals withPantheon [ @@ -65,6 +66,7 @@ stdenv.mkDerivation rec { glib gnome.adwaita-icon-theme gtk3 + libhandy json-glib libarchive libnotify From 998a209d2aa6382d87ca29f67068bb9c8933ff18 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:09:05 +0000 Subject: [PATCH 167/382] =?UTF-8?q?gnome.gnome-bluetooth:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.beta.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/42.beta...42.beta.2 --- .../gnome/core/gnome-bluetooth/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index f4c655472b3..362b3bc2556 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.beta"; + version = "42.beta.2"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1Qn47dpsMIU7kx3M4y4km9SdvKuLxFSUHqmP/fHuvao="; + sha256 = "sMrjHipDLqMQSZsmMszAW1erA6q1AiCXWkeg5UFgkH4="; }; nativeBuildInputs = [ @@ -63,19 +63,9 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dicon_update=false" "-Dgtk_doc=true" ]; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - - # https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/merge_requests/117 - substituteInPlace lib/bluetooth-utils.c \ - --replace "/* fallthrough */" "break;" - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; From e204c94bc2740abdb476254bcf04344e1e72b5c0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:09:08 +0000 Subject: [PATCH 168/382] =?UTF-8?q?gnome.gnome-boxes:=2042.alpha=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/42.alpha...42.beta --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 3c5af219e76..200a502a92e 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "42.alpha"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z9hnCCvXmiSc9ZhykhpZUNUUDD7ZSucME8cODVSXEgQ="; + sha256 = "+WAr54ZlUNOG7iSD12Ewq5j3YSYjSMxpuDCC67xVo9Q="; }; doCheck = true; From 338a586a9a45f44ec583e51224d03071a7991b67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:09:20 +0000 Subject: [PATCH 169/382] =?UTF-8?q?gnome.gnome-desktop:=2042.alpha.1=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/42.alpha.1...42.beta --- pkgs/development/libraries/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index f3f221745b6..ba2fb9573b0 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.alpha.1"; + version = "42.beta"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lxUTBDVAeqgptNWdwDb/XKOSTytO4X7FMBf2ar2gX+w="; + sha256 = "sha256-l6hYliu9Q7pS9tQPVfMdKdwvTQYV2NbXoYzBcnzIiKY="; }; patches = [ From ddd4f1e9956d1d1a028dbb6b59386556dcbc939c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:09:34 +0000 Subject: [PATCH 170/382] =?UTF-8?q?gnome.gnome-music:=2041.0=20=E2=86=92?= =?UTF-8?q?=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-music/-/compare/41.0...42.beta --- .../gnome/apps/gnome-music/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 96ec321fa4a..bad7091b6c7 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -15,7 +15,7 @@ , grilo , grilo-plugins , pkg-config -, gtk3 +, gtk4 , pango , glib , desktop-file-utils @@ -23,21 +23,20 @@ , itstool , gnome , gst_all_1 -, libdazzle , libsoup -, libhandy +, libadwaita , gsettings-desktop-schemas }: python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "41.0"; + version = "42.beta"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1llz2aqa3n3ivwl7i09pgylsbgrfzb872vcj1k7pvivxm1kkbcb9"; + sha256 = "NABOz5+LNH2wA/LfDTs4MaiWj0sJJjxTWsSYPebzBNU="; }; nativeBuildInputs = [ @@ -54,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - gtk3 + gtk4 pango glib libmediaart @@ -66,9 +65,8 @@ python3.pkgs.buildPythonApplication rec { grilo grilo-plugins libnotify - libdazzle libsoup - libhandy + libadwaita gsettings-desktop-schemas tracker ] ++ (with gst_all_1; [ @@ -85,13 +83,6 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; - postPatch = '' - for f in meson_post_conf.py meson_post_install.py; do - chmod +x $f - patchShebangs $f - done - ''; - # Prevent double wrapping, let the Python wrapper use the args in preFixup. dontWrapGApps = true; From 09c31ed8116ff4120006f4042421cef21e9a1901 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:10:23 +0000 Subject: [PATCH 171/382] =?UTF-8?q?gnome-builder:=2042.alpha1=20=E2=86=92?= =?UTF-8?q?=2042.beta1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/42.alpha1...42.beta1 --- .../editors/gnome-builder/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 28f2225248a..f17aa21f2be 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -4,7 +4,6 @@ , cmark , appstream-glib , desktop-file-utils -, fetchpatch , fetchurl , flatpak , gnome @@ -18,6 +17,7 @@ , json-glib , jsonrpc-glib , libdazzle +, libhandy , libpeas , libportal-gtk3 , libxml2 @@ -40,24 +40,15 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "42.alpha1"; + version = "42.beta1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AtJ+Op2ChWWgcREWFb3zqyp1CzBb/469BwJXK3DuWnc="; + sha256 = "cEgZ7J/W7Mb6S489mFsCEs+hZWlhAMzalGGPiBKzKio="; }; - patches = [ - # Fix building docs - # https://gitlab.gnome.org/GNOME/gnome-builder/-/merge_requests/530 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/e2b369ec056ff43701803c5e5185fa2ac391d238.patch"; - sha256 = "OI2CMtA0M9u6/5xmWm4i+bXOKDXmtYprCONNCU2aOj0="; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -87,6 +78,7 @@ stdenv.mkDerivation rec { json-glib jsonrpc-glib libdazzle + libhandy libxml2 ostree pcre From 32a8970e8fd456751e6271bf0cc6b38a715b4392 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:10:24 +0000 Subject: [PATCH 172/382] =?UTF-8?q?gnome-connections:=2041.2=20=E2=86=92?= =?UTF-8?q?=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/connections/-/compare/41.2...42.beta --- pkgs/desktops/gnome/apps/gnome-connections/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 83e88059f80..7aec60e9deb 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, vala +, vala_0_56 , gettext , itstool , python3 @@ -14,6 +14,7 @@ , glib , gtk3 , libhandy +, libsecret , libxml2 , gtk-vnc , gtk-frdp @@ -22,18 +23,18 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "41.2"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-WrmUKPPOn4qDdDK2e3XbxSi5U6QpOotWVE34g0b+VxM="; + hash = "sha256-uELyHD1XcwrP+7XPmVk5pZWVjg03PC9fe2tQ5C0z1gk="; }; nativeBuildInputs = [ meson ninja pkg-config - vala + vala_0_56 gettext itstool python3 @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { gtk-vnc gtk3 libhandy + libsecret libxml2 gtk-frdp ]; From 4191eac28215104a722d94648144f02007b0b128 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:10:35 +0000 Subject: [PATCH 173/382] =?UTF-8?q?gnome-text-editor:=2042.alpha2=20?= =?UTF-8?q?=E2=86=92=2042.beta1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/42.alpha2...42.beta1 --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 3a8dde63190..0597692affe 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "42.alpha2"; + version = "42.beta1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EN0zMEv/ij3fBwHaU5gB5s0SmVJ5rw4kWNI3P90LXoo="; + sha256 = "sha256-xpWG5IRY9vzHazgWMW2fvM4EOWiTQlt/gxlgHkk9/A8="; }; nativeBuildInputs = [ From 49b9ccaf8ef406eaab283db328ae0c4934766643 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:11:02 +0000 Subject: [PATCH 174/382] =?UTF-8?q?gtranslator:=2040.0=20=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtranslator/-/compare/40.0...41.0 --- pkgs/tools/text/gtranslator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index 5bc99724e3f..d065a48d8db 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -8,7 +8,7 @@ , python3 , wrapGAppsHook , libxml2 -, libgda +, libgda6 , libhandy , libsoup , json-glib @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0d48nc11z0m91scy21ah56ysxns82zvswx8lglvlkig1vqvblgpc"; + sha256 = "E28R/gOhlJkMQ6/jOL0eoK0U5+H26Gjlv3xbUsTF5eE="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gtk3 libdazzle gtksourceview4 - libgda + libgda6 libhandy libsoup json-glib From 0ac3c88ed4a64f644f1585fdd8a3bf838251a7b8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 12:11:35 +0100 Subject: [PATCH 175/382] =?UTF-8?q?gnome.totem:=203.38.2=20=E2=86=92=2042.?= =?UTF-8?q?beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/totem/-/compare/V_3_38_2...42.beta --- pkgs/desktops/gnome/core/totem/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 0178c04b53c..191985227c9 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -4,8 +4,6 @@ , ninja , gettext , gst_all_1 -, clutter-gtk -, clutter-gst , python3Packages , shared-mime-info , pkg-config @@ -21,6 +19,7 @@ , grilo , grilo-plugins , libpeas +, libhandy , adwaita-icon-theme , gnome-desktop , gsettings-desktop-schemas @@ -30,11 +29,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "3.38.2"; + version = "42.beta"; src = fetchurl { - url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/OVi4rJsvPwMZ4U43MgfncFc5g1aie5DWJB79jQwTEA="; + url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "6Wibk+ZgYFNSaLke+3WDFohpzUOiOktaoo7szBGxIbc="; }; nativeBuildInputs = [ @@ -53,17 +52,16 @@ stdenv.mkDerivation rec { gtk3 glib grilo - clutter-gtk - clutter-gst totem-pl-parser grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas + libhandy shared-mime-info gdk-pixbuf libxml2 From a8d19cdbdf351f565eba0033db0371bb445deb94 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 12 Mar 2022 19:18:55 +0800 Subject: [PATCH 176/382] pantheon.epiphany: drop dark style preference patch The vanilla epiphany already support dark style preference in Pantheon, so no need to keep the patch. --- pkgs/desktops/gnome/core/epiphany/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 594b9ef7d2f..ffbdd423c60 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -11,7 +11,6 @@ , icu , wrapGAppsHook , gnome -, pantheon , libportal-gtk3 , libxml2 , libxslt @@ -52,13 +51,6 @@ stdenv.mkDerivation rec { # Pantheon specific patches for epiphany # https://github.com/elementary/browser # - # Make this respect dark mode settings from Pantheon - # https://github.com/elementary/browser/pull/21 - # https://github.com/elementary/browser/pull/41 - (fetchpatch { - url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/dark-style.patch"; - sha256 = "sha256-RzMUc9P51UN3tRFefzRtMniXR9duOOmLj5eu5gL2TEQ="; - }) # Patch to unlink nav buttons # https://github.com/elementary/browser/pull/18 (fetchpatch { @@ -87,7 +79,6 @@ stdenv.mkDerivation rec { glib glib-networking gnome-desktop - gnome.adwaita-icon-theme gst_all_1.gst-libav gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base @@ -110,8 +101,6 @@ stdenv.mkDerivation rec { p11-kit sqlite webkitgtk - ] ++ lib.optionals withPantheon [ - pantheon.granite ]; # Tests need an X display From 0f97d73b749be36e47b69b27f3c7ff8e20614da0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 12 Mar 2022 19:23:50 +0800 Subject: [PATCH 177/382] pantheon.file-roller: drop The vanilla file-roller already support dark style preference in Pantheon, so no need to keep the package. --- .../services/x11/desktop-managers/pantheon.nix | 1 - pkgs/desktops/gnome/apps/file-roller/default.nix | 14 -------------- pkgs/desktops/pantheon/default.nix | 4 ++-- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 8ff9b0b756d..1a5cf32de7f 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -222,7 +222,6 @@ in programs.evince.enable = mkDefault true; programs.evince.package = pkgs.pantheon.evince; programs.file-roller.enable = mkDefault true; - programs.file-roller.package = pkgs.pantheon.file-roller; # Settings from elementary-default-settings environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index ea9eb8dfd38..982309e68b3 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , desktop-file-utils , gettext , glibcLocales @@ -22,9 +21,7 @@ , libarchive , libnotify , nautilus -, pantheon , unzip -, withPantheon ? false }: stdenv.mkDerivation rec { @@ -36,15 +33,6 @@ stdenv.mkDerivation rec { sha256 = "Bi5rSO1re8o9ONAoY9apsBP0zNNbpvvjXFaYeQDf7Ok="; }; - patches = lib.optionals withPantheon [ - # Make this respect dark mode settings from Pantheon - # https://github.com/elementary/fileroller/ - (fetchpatch { - url = "https://raw.githubusercontent.com/elementary/fileroller/f183eac36c68c9c9441e72294d4e305cf5fe36ed/fr-application-prefers-color-scheme.patch"; - sha256 = "sha256-d/sqf4Oen9UrzYqru7Ck15o/6g6WfxRDH/iAGFXgYAA="; - }) - ]; - LANG = "en_US.UTF-8"; # postinstall.py nativeBuildInputs = [ @@ -71,8 +59,6 @@ stdenv.mkDerivation rec { libarchive libnotify nautilus - ] ++ lib.optionals withPantheon [ - pantheon.granite ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 09ccf8d8f71..8e0de85cdaf 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -85,8 +85,6 @@ lib.makeScope pkgs.newScope (self: with self; { evince = pkgs.evince.override { withPantheon = true; }; - file-roller = pkgs.gnome.file-roller.override { withPantheon = true; }; - sideload = callPackage ./apps/sideload { }; #### DESKTOP @@ -244,6 +242,8 @@ lib.makeScope pkgs.newScope (self: with self; { extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 + file-roller = pkgs.gnome.file-roller; # added 2022-03-12 + notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18 } From 097fd04fb8dfadde46572eed41a0e1f2ffdfd44c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:27:59 +0000 Subject: [PATCH 178/382] =?UTF-8?q?at-spi2-core:=202.42.0=20=E2=86=92=202.?= =?UTF-8?q?43.92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/AT_SPI2_CORE_2_42_0...AT_SPI2_CORE_2_43_92 --- .../libraries/at-spi2-core/default.nix | 62 ++++++++++++------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 66b0c13646b..e62b2f8dd47 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,48 +1,66 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl - , meson , ninja , pkg-config , gobject-introspection , gsettings-desktop-schemas , makeWrapper - , dbus , glib , dconf , libX11 -, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case +, libXtst , libXi , libXext - -, gnome # To pass updateScript +, gnome }: stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.42.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11p3lvmbm0hfck3p5xwxxycln8x0cf7l68jjz6an2g7sjh7a2pab"; - }; + version = "2.43.92"; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ]; - # libXext is a transitive dependency of libXi - buildInputs = [ libX11 libXtst libXi libXext ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "jXTuEnhOtCU34v1sGWT/J+xXHh6wh9Y8F8xDceyuhyM="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + makeWrapper + ]; + + buildInputs = [ + libX11 + # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case + libXtst + libXi + # libXext is a transitive dependency of libXi + libXext + ]; + # In atspi-2.pc dbus-1 glib-2.0 - propagatedBuildInputs = [ dbus glib ]; + propagatedBuildInputs = [ + dbus + glib + ]; - doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" + # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" + doCheck = false; - # Provide dbus-daemon fallback when it is not already running when - # at-spi2-bus-launcher is executed. This allows us to avoid - # including the entire dbus closure in libraries linked with - # the at-spi2-core libraries. - mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ]; + mesonFlags = [ + # Provide dbus-daemon fallback when it is not already running when + # at-spi2-bus-launcher is executed. This allows us to avoid + # including the entire dbus closure in libraries linked with + # the at-spi2-core libraries. + "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" + ]; passthru = { updateScript = gnome.updateScript { From c78b2de16f512466ca7571a62308211169e7db6c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:05 +0000 Subject: [PATCH 179/382] =?UTF-8?q?baobab:=2042.beta=20=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/baobab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 188b83e5912..1e62dfe2047 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "iVtRFak12WbKJo7yrLwYd9jfZFZ9uNAlTC4qerRnGCY="; + sha256 = "ZUGjFQBG8fcIcYOWKBt2qpmzNqIcynCe/xPGk1klJDU="; }; nativeBuildInputs = [ From 70222ad792b1e47ccb8fff298eadf93e80b07880 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 23:35:37 +0100 Subject: [PATCH 180/382] =?UTF-8?q?poppler:=2022.01.0=20=E2=86=92=2022.03.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.freedesktop.org/archives/poppler/2022-February/015055.html https://lists.freedesktop.org/archives/poppler/2022-March/015089.html --- pkgs/development/libraries/poppler/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 6fa07bcaf80..5547e492a65 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -18,6 +18,7 @@ , ninja , openjpeg , pkg-config +, python3 , scribusUnstable , texlive , zlib @@ -34,19 +35,20 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "22.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "22.03.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-fTSTBWtbhkE+XGk8LK4CxcBs2OYY0UwsMeLIS2eyMT4="; + sha256 = "sha256-cox4upTXWlX2tjVdT72qb0mTTZYWvljl5nmpz9CYDh4="; }; nativeBuildInputs = [ cmake ninja pkg-config + python3 ]; buildInputs = [ From 2c63c790c8ce929a60912b9e896b136d517039ea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:14 +0000 Subject: [PATCH 181/382] =?UTF-8?q?evince:=2041.4=20=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/41.4...42.rc --- pkgs/desktops/gnome/core/evince/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index d7001853fa6..930922c76ed 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -35,11 +35,8 @@ , pantheon , python3 , texlive -, t1lib , gst_all_1 -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 +, gi-docgen , supportMultimedia ? true # PDF multimedia , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps @@ -49,13 +46,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "41.4"; + version = "42.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "/yRSQPIwkivsMqTXsKHZGyR6g9E0hPmbdANdUesjITA="; + sha256 = "XtLiXcPrxbJDdNgyVlTBICcDg5A42GANUWk52JJjte8="; }; patches = lib.optionals withPantheon [ @@ -75,11 +72,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream - docbook-xsl-nons - docbook_xml_dtd_43 gettext gobject-introspection - gtk-doc + gi-docgen itstool meson ninja @@ -108,7 +103,6 @@ stdenv.mkDerivation rec { libxml2 pango poppler - t1lib texlive.bin.core # kpathsea for DVI support ] ++ lib.optionals withLibsecret [ libsecret @@ -140,6 +134,11 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 93ad8bcb6a092fd7920bdaf55da06760a54de5d6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:15 +0000 Subject: [PATCH 182/382] =?UTF-8?q?evolution:=203.43.2=20=E2=86=92=203.43.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.43.2...3.43.3 --- .../0001-M-102-Port-to-libgweather4.patch | 379 ------------------ .../evolution/evolution/default.nix | 10 +- 2 files changed, 2 insertions(+), 387 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/evolution/evolution/0001-M-102-Port-to-libgweather4.patch diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/0001-M-102-Port-to-libgweather4.patch b/pkgs/applications/networking/mailreaders/evolution/evolution/0001-M-102-Port-to-libgweather4.patch deleted file mode 100644 index 22e7e4a9ff1..00000000000 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/0001-M-102-Port-to-libgweather4.patch +++ /dev/null @@ -1,379 +0,0 @@ -From b90091b403c10266e56b2724c8d7f9749fa60807 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Sat, 19 Feb 2022 01:52:52 +0100 -Subject: [PATCH] M!102 - Port to libgweather4 - -Adds support for linking against gweather4 (pass -DWITH_GWEATHER4=ON). - -Closes https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/102 ---- - CMakeLists.txt | 10 ++- - config.h.in | 3 + - .../e-weather-location-entry.c | 80 +++++++++++++++++-- - .../evolution-cal-config-weather.c | 41 +++++++++- - 4 files changed, 123 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7247d65f16..1ba2165b4d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,6 +92,7 @@ set(geocode_glib_minimum_version 3.10) - set(gladeui_minimum_version 3.10.0) - set(gnome_autoar_minimum_version 0.1.1) - set(gweather_minimum_version 3.10) -+set(gweather4_minimum_version 3.91.0) - set(libcanberra_gtk_minimum_version 0.25) - set(libnotify_minimum_version 0.7) - set(libunity_minimum_version 7.1.4) -@@ -668,7 +669,14 @@ endif(ENABLE_TEXT_HIGHLIGHT) - add_printable_option(ENABLE_WEATHER "Enable weather calendars" ON) - - if(ENABLE_WEATHER) -- pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GWEATHER gweather-3.0>=${gweather_minimum_version}) -+ add_printable_variable(WITH_GWEATHER4 "Use GWeather 4 instead of 3" OFF) -+ -+ if(WITH_GWEATHER4) -+ pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GWEATHER gweather4>=${gweather4_minimum_version}) -+ else(WITH_GWEATHER4) -+ pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GWEATHER gweather-3.0>=${gweather_minimum_version}) -+ endif(WITH_GWEATHER4) -+ - pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar" GEO geocode-glib-1.0>=${geocode_glib_minimum_version}) - endif(ENABLE_WEATHER) - -diff --git a/config.h.in b/config.h.in -index 881641355a..2b520a96bd 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -93,6 +93,9 @@ - /* When defined GSpell usage is enabled */ - #cmakedefine HAVE_GSPELL 1 - -+/* Defined when linking against gweather4. Cannot just use GWEATHER_CHECK_VERSION because 40.0 made the versions non-monotonic. */ -+#cmakedefine WITH_GWEATHER4 1 -+ - /* Source code highlighting utility */ - #cmakedefine HIGHLIGHT_COMMAND "@HIGHLIGHT_COMMAND@" - -diff --git a/src/modules/cal-config-weather/e-weather-location-entry.c b/src/modules/cal-config-weather/e-weather-location-entry.c -index f4fb48c403..f4ff276633 100644 ---- a/src/modules/cal-config-weather/e-weather-location-entry.c -+++ b/src/modules/cal-config-weather/e-weather-location-entry.c -@@ -125,9 +125,17 @@ finalize (GObject *object) - priv = entry->priv; - - if (priv->location) -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (priv->location); -+ #else - gweather_location_unref (priv->location); -+ #endif - if (priv->top) -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (priv->top); -+ #else - gweather_location_unref (priv->top); -+ #endif - if (priv->model) - g_object_unref (priv->model); - -@@ -214,11 +222,15 @@ e_weather_location_entry_class_init (EWeatherLocationEntryClass *location_entry_ - - g_object_class_install_property ( - object_class, PROP_TOP, -+ #ifdef WITH_GWEATHER4 -+ g_param_spec_object ("top", -+ #else - g_param_spec_boxed ("top", -- "Top Location", -- "The GWeatherLocation whose children will be used to fill in the entry", -- GWEATHER_TYPE_LOCATION, -- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); -+ #endif -+ "Top Location", -+ "The GWeatherLocation whose children will be used to fill in the entry", -+ GWEATHER_TYPE_LOCATION, -+ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property ( - object_class, PROP_SHOW_NAMED_TIMEZONES, -@@ -230,11 +242,15 @@ e_weather_location_entry_class_init (EWeatherLocationEntryClass *location_entry_ - - g_object_class_install_property ( - object_class, PROP_LOCATION, -+ #ifdef WITH_GWEATHER4 -+ g_param_spec_object ("location", -+ #else - g_param_spec_boxed ("location", -- "Location", -- "The selected GWeatherLocation", -- GWEATHER_TYPE_LOCATION, -- G_PARAM_READWRITE)); -+ #endif -+ "Location", -+ "The selected GWeatherLocation", -+ GWEATHER_TYPE_LOCATION, -+ G_PARAM_READWRITE)); - } - - static void -@@ -247,14 +263,22 @@ set_property (GObject *object, - - switch (prop_id) { - case PROP_TOP: -+ #ifdef WITH_GWEATHER4 -+ entry->priv->top = g_value_dup_object (value); -+ #else - entry->priv->top = g_value_dup_boxed (value); -+ #endif - break; - case PROP_SHOW_NAMED_TIMEZONES: - entry->priv->show_named_timezones = g_value_get_boolean (value); - break; - case PROP_LOCATION: - e_weather_location_entry_set_location (E_WEATHER_LOCATION_ENTRY (object), -+ #ifdef WITH_GWEATHER4 -+ g_value_get_object (value)); -+ #else - g_value_get_boxed (value)); -+ #endif - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -275,7 +299,11 @@ get_property (GObject *object, - g_value_set_boolean (value, entry->priv->show_named_timezones); - break; - case PROP_LOCATION: -+ #ifdef WITH_GWEATHER4 -+ g_value_set_object (value, entry->priv->location); -+ #else - g_value_set_boxed (value, entry->priv->location); -+ #endif - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -321,7 +349,11 @@ set_location_internal (EWeatherLocationEntry *entry, - priv = entry->priv; - - if (priv->location) -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (priv->location); -+ #else - gweather_location_unref (priv->location); -+ #endif - - g_return_if_fail (iter == NULL || loc == NULL); - -@@ -334,7 +366,11 @@ set_location_internal (EWeatherLocationEntry *entry, - priv->custom_text = FALSE; - g_free (name); - } else if (loc) { -+ #ifdef WITH_GWEATHER4 -+ priv->location = g_object_ref (loc); -+ #else - priv->location = gweather_location_ref (loc); -+ #endif - gtk_entry_set_text (GTK_ENTRY (entry), gweather_location_get_name (loc)); - priv->custom_text = FALSE; - } else { -@@ -384,11 +420,19 @@ e_weather_location_entry_set_location (EWeatherLocationEntry *entry, - -1); - if (gweather_location_equal (loc, cmploc)) { - set_location_internal (entry, model, &iter, NULL); -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (cmploc); -+ #else - gweather_location_unref (cmploc); -+ #endif - return; - } - -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (cmploc); -+ #else - gweather_location_unref (cmploc); -+ #endif - } while (gtk_tree_model_iter_next (model, &iter)); - - set_location_internal (entry, model, NULL, loc); -@@ -411,7 +455,11 @@ e_weather_location_entry_get_location (EWeatherLocationEntry *entry) - g_return_val_if_fail (E_WEATHER_IS_LOCATION_ENTRY (entry), NULL); - - if (entry->priv->location) -+ #ifdef WITH_GWEATHER4 -+ return g_object_ref (entry->priv->location); -+ #else - return gweather_location_ref (entry->priv->location); -+ #endif - else - return NULL; - } -@@ -474,14 +522,22 @@ e_weather_location_entry_set_city (EWeatherLocationEntry *entry, - - cmpcode = gweather_location_get_code (cmploc); - if (!cmpcode || strcmp (cmpcode, code) != 0) { -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (cmploc); -+ #else - gweather_location_unref (cmploc); -+ #endif - continue; - } - - if (city_name) { - cmpname = gweather_location_get_city_name (cmploc); - if (!cmpname || strcmp (cmpname, city_name) != 0) { -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (cmploc); -+ #else - gweather_location_unref (cmploc); -+ #endif - g_free (cmpname); - continue; - } -@@ -489,7 +545,11 @@ e_weather_location_entry_set_city (EWeatherLocationEntry *entry, - } - - set_location_internal (entry, model, &iter, NULL); -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (cmploc); -+ #else - gweather_location_unref (cmploc); -+ #endif - return TRUE; - } while (gtk_tree_model_iter_next (model, &iter)); - -@@ -611,7 +671,11 @@ fill_location_entry_model (GtkListStore *store, - break; - } - -+ #ifdef WITH_GWEATHER4 -+ g_clear_object (&child); -+ #else - g_clear_pointer (&child, gweather_location_unref); -+ #endif - } - - static gchar * -diff --git a/src/modules/cal-config-weather/evolution-cal-config-weather.c b/src/modules/cal-config-weather/evolution-cal-config-weather.c -index 423d6e2357..454cde5e05 100644 ---- a/src/modules/cal-config-weather/evolution-cal-config-weather.c -+++ b/src/modules/cal-config-weather/evolution-cal-config-weather.c -@@ -72,10 +72,18 @@ cal_config_weather_location_to_string (GBinding *binding, - GWeatherLocation *location; - gchar *string = NULL; - -+ #ifdef WITH_GWEATHER4 -+ location = g_value_get_object (source_value); -+ #else - location = g_value_get_boxed (source_value); -+ #endif - #if GWEATHER_CHECK_VERSION(3, 39, 0) - if (location) -+ #ifdef WITH_GWEATHER4 -+ g_object_ref (location); -+ #else - gweather_location_ref (location); -+ #endif - #endif - - while (location && !gweather_location_has_coords (location)) { -@@ -83,7 +91,11 @@ cal_config_weather_location_to_string (GBinding *binding, - GWeatherLocation *child = location; - - location = gweather_location_get_parent (child); -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (child); -+ #else - gweather_location_unref (child); -+ #endif - #else - location = gweather_location_get_parent (location); - #endif -@@ -101,7 +113,9 @@ cal_config_weather_location_to_string (GBinding *binding, - - string = g_strdup_printf ("%s/%s", lat_str, lon_str); - -- #if GWEATHER_CHECK_VERSION(3, 39, 0) -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (location); -+ #elif GWEATHER_CHECK_VERSION(3, 39, 0) - gweather_location_unref (location); - #endif - } -@@ -134,7 +148,11 @@ cal_config_weather_find_location_by_coords (GWeatherLocation *start, - gweather_location_get_coords (location, &lat, &lon); - - if (lat == latitude && lon == longitude) { -+ #ifdef WITH_GWEATHER4 -+ g_object_ref (location); -+ #else - gweather_location_ref (location); -+ #endif - return location; - } - } -@@ -145,7 +163,11 @@ cal_config_weather_find_location_by_coords (GWeatherLocation *start, - - result = cal_config_weather_find_location_by_coords (child, latitude, longitude); - if (result) { -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (child); -+ #else - gweather_location_unref (child); -+ #endif - return result; - } - } -@@ -154,7 +176,11 @@ cal_config_weather_find_location_by_coords (GWeatherLocation *start, - for (ii = 0; children[ii]; ii++) { - location = cal_config_weather_find_location_by_coords (children[ii], latitude, longitude); - if (location) { -+ #ifdef WITH_GWEATHER4 -+ g_object_ref (location); -+ #else - gweather_location_ref (location); -+ #endif - return location; - } - } -@@ -194,7 +220,11 @@ cal_config_weather_string_to_location (GBinding *binding, - - match = cal_config_weather_find_location_by_coords (world, latitude, longitude); - -+ #ifdef WITH_GWEATHER4 -+ g_value_take_object (target_value, match); -+ #else - g_value_take_boxed (target_value, match); -+ #endif - - g_strfreev (tokens); - -@@ -320,8 +350,13 @@ cal_config_weather_insert_widgets (ESourceConfigBackend *backend, - G_BINDING_SYNC_CREATE, - cal_config_weather_string_to_location, - cal_config_weather_location_to_string, -+ #ifdef WITH_GWEATHER4 -+ g_object_ref (world), -+ g_object_unref); -+ #else - gweather_location_ref (world), - (GDestroyNotify) gweather_location_unref); -+ #endif - - e_binding_bind_property ( - extension, "units", -@@ -329,7 +364,9 @@ cal_config_weather_insert_widgets (ESourceConfigBackend *backend, - G_BINDING_BIDIRECTIONAL | - G_BINDING_SYNC_CREATE); - --#if GWEATHER_CHECK_VERSION(3, 39, 0) -+#ifdef WITH_GWEATHER4 -+ g_object_unref (world); -+#elif GWEATHER_CHECK_VERSION(3, 39, 0) - gweather_location_unref (world); - #endif - } --- -2.35.1 - diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index fdd0f0e292c..541cc95235c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,19 +46,13 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.43.2"; + version = "3.43.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nBAQtBOGT5fE4VB96MWaNR9LMXT3DSIiig+dXjmz3pg="; + sha256 = "lnh+6kfHDvPL9+5HX0nK4DKS+wi3sWRJi5ccM38ju80="; }; - patches = [ - # Fix build with gweather4 - # https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/102 - ./0001-M-102-Port-to-libgweather4.patch - ]; - nativeBuildInputs = [ cmake intltool From 6ef351611a8171d6ce3c47e72f21696a9ff14197 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:17 +0000 Subject: [PATCH 183/382] =?UTF-8?q?evolution-data-server:=203.43.2=20?= =?UTF-8?q?=E2=86=92=203.43.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.43.2...3.43.3 --- .../0001-M-93-Port-to-libgweather4.patch | 140 ------------------ .../core/evolution-data-server/default.nix | 10 +- 2 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/evolution-data-server/0001-M-93-Port-to-libgweather4.patch diff --git a/pkgs/desktops/gnome/core/evolution-data-server/0001-M-93-Port-to-libgweather4.patch b/pkgs/desktops/gnome/core/evolution-data-server/0001-M-93-Port-to-libgweather4.patch deleted file mode 100644 index 7b00a8023e8..00000000000 --- a/pkgs/desktops/gnome/core/evolution-data-server/0001-M-93-Port-to-libgweather4.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 4adf9032fd820414d9ebd12cc746fee1895cc910 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Javier=20Jard=C3=B3n?= -Date: Sat, 8 Jan 2022 15:30:52 +0000 -Subject: [PATCH] M!93 - Port to libgweather4 - -Adds support for linking against gweather4 (pass -DWITH_GWEATHER4=ON). - -Co-Authored-By: Jan Tojnar -Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/93 ---- - CMakeLists.txt | 9 ++++++++- - config.h.in | 3 +++ - .../backends/weather/e-cal-backend-weather.c | 8 ++++++++ - .../backends/weather/e-weather-source.c | 17 +++++++++++++++-- - 4 files changed, 34 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 234f605be..5182a4792 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -119,6 +119,7 @@ set(sqlite_minimum_version 3.7.17) - # Optional Packages - set(goa_minimum_version 3.8) - set(gweather_minimum_version 3.10) -+set(gweather4_minimum_version 3.91.0) - set(libaccounts_glib_minimum_version 1.4) - set(libsignon_glib_minimum_version 1.8) - set(json_glib_minimum_version 1.0.4) -@@ -755,7 +756,13 @@ endif(NOT have_addrinfo) - add_printable_option(ENABLE_WEATHER "Build the weather calendar backend" ON) - - if(ENABLE_WEATHER) -- pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar backend" LIBGWEATHER gweather-3.0>=${gweather_minimum_version}) -+ add_printable_variable(WITH_GWEATHER4 "Use GWeather 4 instead of 3" OFF) -+ -+ if(WITH_GWEATHER4) -+ pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar backend" LIBGWEATHER gweather4>=${gweather4_minimum_version}) -+ else(WITH_GWEATHER4) -+ pkg_check_modules_for_option(ENABLE_WEATHER "weather calendar backend" LIBGWEATHER gweather-3.0>=${gweather_minimum_version}) -+ endif(WITH_GWEATHER4) - - set(CMAKE_REQUIRED_INCLUDES ${LIBGWEATHER_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES ${LIBGWEATHER_LDFLAGS}) -diff --git a/config.h.in b/config.h.in -index 4e79549ab..c087d2b04 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -197,6 +197,9 @@ - /* gweather_info_new() has only one argument */ - #cmakedefine HAVE_ONE_ARG_GWEATHER_INFO_NEW 1 - -+/* Defined when linking against gweather4. Cannot just use GWEATHER_CHECK_VERSION because 40.0 made the versions non-monotonic. */ -+#cmakedefine WITH_GWEATHER4 1 -+ - /* evolution-alarm-notify - Define if using Canberra-GTK for sound */ - #cmakedefine HAVE_CANBERRA 1 - -diff --git a/src/calendar/backends/weather/e-cal-backend-weather.c b/src/calendar/backends/weather/e-cal-backend-weather.c -index 72faccd62..c4999671f 100644 ---- a/src/calendar/backends/weather/e-cal-backend-weather.c -+++ b/src/calendar/backends/weather/e-cal-backend-weather.c -@@ -464,7 +464,11 @@ create_weather (ECalBackendWeather *cbw, - time_t update_time; - ICalTimezone *update_zone = NULL; - const GWeatherLocation *location; -+ #ifdef WITH_GWEATHER4 -+ GTimeZone *w_timezone; -+ #else - const GWeatherTimezone *w_timezone; -+ #endif - gdouble tmin = 0.0, tmax = 0.0, temp = 0.0; - - g_return_val_if_fail (E_IS_CAL_BACKEND_WEATHER (cbw), NULL); -@@ -484,7 +488,11 @@ create_weather (ECalBackendWeather *cbw, - /* use timezone of the location to determine date for which this is set */ - location = gweather_info_get_location (report); - if (location && (w_timezone = gweather_location_get_timezone ((GWeatherLocation *) location))) -+ #ifdef WITH_GWEATHER4 -+ update_zone = i_cal_timezone_get_builtin_timezone (g_time_zone_get_identifier (w_timezone)); -+ #else - update_zone = i_cal_timezone_get_builtin_timezone (gweather_timezone_get_tzid ((GWeatherTimezone *) w_timezone)); -+ #endif - - if (!update_zone) - update_zone = i_cal_timezone_get_utc_timezone (); -diff --git a/src/calendar/backends/weather/e-weather-source.c b/src/calendar/backends/weather/e-weather-source.c -index 3052d034c..031b7a6ad 100644 ---- a/src/calendar/backends/weather/e-weather-source.c -+++ b/src/calendar/backends/weather/e-weather-source.c -@@ -39,8 +39,11 @@ weather_source_dispose (GObject *object) - EWeatherSourcePrivate *priv; - - priv = E_WEATHER_SOURCE (object)->priv; -+ #ifdef WITH_GWEATHER4 -+ g_clear_object (&priv->location); -+ #else - g_clear_pointer (&priv->location, gweather_location_unref); -- -+ #endif - g_clear_object (&priv->info); - - /* Chain up to parent's dispose() method. */ -@@ -85,7 +88,11 @@ weather_source_find_location_by_coords (GWeatherLocation *start, - gweather_location_get_coords (location, &lat, &lon); - - if (lat == latitude && lon == longitude) { -+ #ifdef WITH_GWEATHER4 -+ g_object_ref (location); -+ #else - gweather_location_ref (location); -+ #endif - return location; - } - } -@@ -96,7 +103,11 @@ weather_source_find_location_by_coords (GWeatherLocation *start, - - result = weather_source_find_location_by_coords (child, latitude, longitude); - if (result) { -+ #ifdef WITH_GWEATHER4 -+ g_object_unref (child); -+ #else - gweather_location_unref (child); -+ #endif - return result; - } - } -@@ -159,7 +170,9 @@ e_weather_source_new (const gchar *location) - } - } - --#if GWEATHER_CHECK_VERSION(3, 39, 0) -+#ifdef WITH_GWEATHER4 -+ g_object_unref (world); -+#elif GWEATHER_CHECK_VERSION(3, 39, 0) - gweather_location_unref (world); - #endif - g_strfreev (tokens); --- -2.35.1 - diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 409b7a0762a..ce581f8fc78 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.43.2"; + version = "3.43.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jmV4HGQPoNm0+AEP9Q6Cpo11VTZWrVDZPxMRJ1y7RBw="; + sha256 = "bSt+XXN1l95aDOZVxZj3TTN262CpcqRr+5Q/Gu4HAEE="; }; patches = [ @@ -59,10 +59,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tzdata; }) - - # Fix build with gweather4 - # https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/93 - ./0001-M-93-Port-to-libgweather4.patch ]; prePatch = '' @@ -139,7 +135,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; homepage = "https://wiki.gnome.org/Apps/Evolution"; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; From 52e90c9d2ffa74254f061b1a47cddc78c49afba4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:17 +0000 Subject: [PATCH 184/382] =?UTF-8?q?evolution-ews:=203.43.2=20=E2=86=92=203?= =?UTF-8?q?.43.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.43.2...3.43.3 --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 3ae1f5933b0..7044e226173 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.43.2"; + version = "3.43.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "m6P26aa3DgK0hHXQLaoj5b2iEQZQcuOYBlL1ngeGxf8="; + sha256 = "pSix3sk72OawjujEoJMpihJZYAW9Bn0/AM1EKTgWg0w="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; From 8b1959ff1659482854009051bda9554150afae94 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:28 +0000 Subject: [PATCH 185/382] =?UTF-8?q?gjs:=201.71.1=20=E2=86=92=201.71.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.71.1...1.71.90 --- pkgs/development/libraries/gjs/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 7cf700768a1..ad5aa39916d 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.71.1"; + version = "1.71.90"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8VrQ1Fp9MaGsTgdHkDjAU2cTzKPFSSyi8nMcBKOl8ek="; + sha256 = "sha256-/g2pKtu4wiUkyWl79w650uW6JgNqTh4wZMNVq2xFUoU="; }; patches = [ @@ -77,8 +77,7 @@ in stdenv.mkDerivation rec { "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; - # TODO: Cairo test fails - doCheck = false; + doCheck = true; postPatch = '' patchShebangs build/choose-tests-locale.sh From d3857212b13c87d40501bcad3a9c68003eb0ab1b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:30 +0000 Subject: [PATCH 186/382] =?UTF-8?q?glib:=202.71.2=20=E2=86=92=202.71.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.71.2...2.71.3 --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 22458153a3e..77902229f10 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.71.2"; + version = "2.71.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "33BYdnULlS6ygqjPFdvXfcYJFSo2aXS0klqSskT+Y+E="; + sha256 = "KIVJQEwm2z1Sz3o38vQrSVsxzP/OK0yyQ5pkCZx0A0M="; }; patches = optionals stdenv.isDarwin [ From f40dfc3bf17b533a74c946ba343fe4c9a622d382 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:42 +0000 Subject: [PATCH 187/382] =?UTF-8?q?gnome.eog:=2042.beta=20=E2=86=92=2042.r?= =?UTF-8?q?c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 3c8489128ae..3dd175cb5c8 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "42.beta"; + version = "42.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-NeArN4a67hTUfPIH23+7krbIcTZEt80UZTcu5KKRuBo="; + sha256 = "sha256-X45iuwJD25dKmtJNUyX7RsEZtPnfTVvgbGyxbPA9PMk="; }; nativeBuildInputs = [ From 439cb94b1a561e14caa40745a88749840a468204 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:49 +0000 Subject: [PATCH 188/382] =?UTF-8?q?gnome.gnome-applets:=203.42.0=20?= =?UTF-8?q?=E2=86=92=203.43.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-applets/-/compare/3.42.0...3.43.1 --- pkgs/desktops/gnome/misc/gnome-applets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix index 2cdafcc23b3..0fdd71aa599 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.42.0"; + version = "3.43.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/RaXR7kv7/Rs05/mLyPd+WZ8EAaPRigDOF0TjvxIedQ="; + sha256 = "IGhOGuYP6LI1FLco1ugkmuv2zpifhNS8M0604rkI8wk="; }; nativeBuildInputs = [ From b509184519e9d2091a7b8f088ac766dd33772a5c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:52 +0000 Subject: [PATCH 189/382] =?UTF-8?q?gnome.gnome-bluetooth:=2042.beta.2=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/42.beta.2...42.rc --- pkgs/desktops/gnome/core/gnome-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 362b3bc2556..258a2b0d42d 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.beta.2"; + version = "42.rc"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sMrjHipDLqMQSZsmMszAW1erA6q1AiCXWkeg5UFgkH4="; + sha256 = "NqZY/rSa4oJCipguZCoFmvBwq+ZUmUFnu5wGsGnrBTs="; }; nativeBuildInputs = [ From ddb5be9675f20e8df3d653a6eea0580583242c4b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:52 +0000 Subject: [PATCH 190/382] =?UTF-8?q?gnome.gnome-boxes:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 200a502a92e..dddeb4b78a6 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+WAr54ZlUNOG7iSD12Ewq5j3YSYjSMxpuDCC67xVo9Q="; + sha256 = "8CTBQJ5YaD/GRWcSMZFlv1BGTQhWLQYXuKkUOgnzTrI="; }; doCheck = true; From faed5d9ea108163ddc326c0b261c6299f420da0e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:55 +0000 Subject: [PATCH 191/382] =?UTF-8?q?gnome.gnome-calculator:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 66383fbf9ec..b80c50f1b62 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -13,7 +13,6 @@ , gtksourceview5 , wrapGAppsHook , gobject-introspection -, python3 , gnome , mpfr , gmp @@ -26,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9nruUc/Ql9pdJ7uU/o0JCkpopfd90boL5fN4X6KFKu0="; + sha256 = "1quQqyiDQc/WQYAkmT5FdW8+es8CVSV2IH9q1R5qBlA="; }; nativeBuildInputs = [ @@ -41,7 +40,6 @@ stdenv.mkDerivation rec { gettext itstool wrapGAppsHook - python3 gobject-introspection # for finding vapi files ]; @@ -61,11 +59,6 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - preCheck = '' # Currency conversion test tries to store currency data in $HOME/.cache. export HOME=$TMPDIR From feb0c91919a3670ced52219c42b4313fd79b8d66 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:55 +0000 Subject: [PATCH 192/382] =?UTF-8?q?gnome.gnome-calendar:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/42.beta...42.rc --- .../gnome/apps/gnome-calendar/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index a4327fa760c..a457b9d9d26 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -9,7 +8,6 @@ , libgweather , geoclue2 , geocode-glib -, python3 , gettext , libxml2 , gnome @@ -24,21 +22,13 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TTNcGt7tjqLjSuHmt5uVtlFpaHsmjjlsek4l9+rZdlE="; + sha256 = "1k2ZG3WbwvdvjJQFicd9gb2oEergo5+9kyoIV/R0eZQ="; }; - patches = [ - # Fix postinstall referring to gtk-update-icon-cache - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/b7e84c432664f76f10680c04781ab5c3cafdd247.patch"; - sha256 = "ahJwspsnU6uT0mc1W+aWPWgp/9+lVF8H+dAK/IV7qgM="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -46,7 +36,6 @@ stdenv.mkDerivation rec { gettext libxml2 wrapGAppsHook4 - python3 ]; buildInputs = [ From a750f4df27037d73be1a4459bbbebee8de1f5c28 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:28:59 +0000 Subject: [PATCH 193/382] =?UTF-8?q?gnome.gnome-characters:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/apps/gnome-characters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 48254c22a71..88ac1111352 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ytMfo5JAI1hhi+aY9GeQmyF1Sp//9Mq4hSPwmiwqGxI="; + sha256 = "D1hb1baVNpmipafBsYpNmbRLeQKkkmIheKpdLDvAPGM="; }; nativeBuildInputs = [ From bbaf1da9fa87d83e5cc53213a780fcbde8a302da Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:04 +0000 Subject: [PATCH 194/382] =?UTF-8?q?gnome.gnome-contacts:=2042.alpha=20?= =?UTF-8?q?=E2=86=92=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/42.alpha...42.beta --- pkgs/desktops/gnome/core/gnome-contacts/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 1fd94c14784..23168183492 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -7,7 +7,7 @@ , libxslt , docbook-xsl-nons , docbook_xml_dtd_42 -, python3 +, desktop-file-utils , gtk4 , glib , libportal @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "42.alpha"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nTMBGn3/FW/zCNwgGiFSE6vV3x7lyZxKnmc4atwoTA8="; + sha256 = "u5w8kWr4XmXzc90JAZnHeo2Uua+dlPZtt6sqEt4E/Z0="; }; propagatedUserEnvPkgs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 - python3 + desktop-file-utils wrapGAppsHook ]; From bf5f695ad684c2cecad97f1c2456ea435c186278 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:05 +0000 Subject: [PATCH 195/382] =?UTF-8?q?gnome.gnome-control-center:=2042.beta?= =?UTF-8?q?=20=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index e4e023ed144..ec3e2804978 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-973QoT+FLQsQyU8oT54wmYuHDZBkfn3TftfvebJQEt0="; + sha256 = "sha256-5yXQ+HzmMQz9/jWxqYcfvxj2JxfcmHaOMeDRQiT6EpI="; }; patches = [ From 7eca5484b6c7522c2b29f3dbcf34b3cd79e74661 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:06 +0000 Subject: [PATCH 196/382] =?UTF-8?q?gnome.gnome-desktop:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/42.beta...42.rc --- pkgs/development/libraries/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index ba2fb9573b0..c2035c13f9f 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.beta"; + version = "42.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-l6hYliu9Q7pS9tQPVfMdKdwvTQYV2NbXoYzBcnzIiKY="; + sha256 = "sha256-kdy9LCCNNggD2AIlJuDO9Q66Y88b8iq0oFYmlLNBUeQ="; }; patches = [ From ffe64d62943b51fef3a633729a9a58105d5021ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:12 +0000 Subject: [PATCH 197/382] =?UTF-8?q?gnome.gnome-font-viewer:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/gnome-font-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index fe007c3581d..b7c63f86624 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "aNUBFJ63k+T8a7lqnYZZdja98Q6eKCA+LmT2QUPNSmk="; + sha256 = "wTU34a+CZ+Ppnzk1WyiiK69krS/aWgGqpx3kaqeJb+g="; }; doCheck = true; From 8db2d2ab9b0c74acbe60e98ccbc52ef45b56d7b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:12 +0000 Subject: [PATCH 198/382] =?UTF-8?q?gnome.gnome-flashback:=203.42.1=20?= =?UTF-8?q?=E2=86=92=203.43.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-flashback/-/compare/3.42.1...3.43.1 --- pkgs/desktops/gnome/misc/gnome-flashback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 9e796670aa0..4001e60f113 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -30,7 +30,7 @@ }: let pname = "gnome-flashback"; - version = "3.42.1"; + version = "3.43.1"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "sha256:0kl4m05whm03m2v0y3jd69lghkggn8s0hxdhvchcas7jmhh940n8"; + sha256 = "sha256-KNRVgfLXV/rrIgqIjlYbr23r9FdP4LQcNI3cmi2CBdM="; }; # make .desktop Execs absolute From 7844de7d3715861fc21937b197e25cca7497ceb1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:12 +0000 Subject: [PATCH 199/382] =?UTF-8?q?gnome.gnome-disk-utility:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/gnome-disk-utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index 7b3f3f952e4..17a70d4261b 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-+032WUvsL4VBncDlNaUZprPJ2H/mSCqh0emLSwKgMdk="; + sha256 = "sha256-09rOYmvYLkoPBeYuWU58noj/Dm+NVJngneyUyRnbu/c="; }; nativeBuildInputs = [ From b09558038074e76ba4e0043aab680d593eb31e6f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:14 +0000 Subject: [PATCH 200/382] =?UTF-8?q?gnome.gnome-initial-setup:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index d5e6130b005..608e27368f3 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -27,6 +27,7 @@ , polkit , webkitgtk , systemd +, libhandy , libnma , tzdata , libgnomekbd @@ -35,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZE3If6EVfL1AQx3ZMuouZc7oHb8X0hiTAK0enqOsPT0="; + sha256 = "7ACze8aXJvlwsAw4hSgq4IPgtGi93iGS24D2ju1eJ3k="; }; patches = [ @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { json-glib krb5 libgweather + libhandy libnma libpwquality librest From 6b318e1e30fcf39d5f2de6658d54e3f4e39e41c9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:22 +0000 Subject: [PATCH 201/382] =?UTF-8?q?gnome.gnome-maps:=2042.beta=20=E2=86=92?= =?UTF-8?q?=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v42.beta...v42.rc --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 56874df59f5..bd6269903b2 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-LuEQu6nDjs4ebdNGmyjWCD/soMvGNRFaGU1nBp1MM4Y="; + sha256 = "sha256-U/1nmsr83rpKv0oeH6GDY1hRYkYTnuA89pc9A+IwIRQ="; }; patches = [ From 0260e10b97c3b7df27f077003cca8e573e743501 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:28 +0000 Subject: [PATCH 202/382] =?UTF-8?q?gnome.gnome-panel:=203.42.0=20=E2=86=92?= =?UTF-8?q?=203.43.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-panel/-/compare/3.42.0...3.43.1 --- pkgs/desktops/gnome/misc/gnome-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index aa472230e9c..fde2247fe94 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.42.0"; + version = "3.43.1"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-rqjA78LtuiDpetRpUXnNCiU45kwpBHAsyMWU6OCJhwM="; + hash = "sha256-51SJ3QFyLahjDnSuLFkcKK/xpSooCG0pVUXLJ24b4nc="; }; patches = [ From fb208c4ff379572f16d3a2274ff43367df1c00b7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:29 +0000 Subject: [PATCH 203/382] =?UTF-8?q?gnome.gnome-remote-desktop:=2042.beta?= =?UTF-8?q?=20=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 8068da4dfda..05604066dbb 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-0T+EE/jdFdjGEHWWfuDtAvkfG61+xBKK4LwWqCZqalw="; + hash = "sha256-B1qcSM/cVJ7BO8POKbC1FgLWh+LaJix6icUullE9YmI="; }; nativeBuildInputs = [ From cc5a39379ec4d6211f86597c8f97d9cbc9eac929 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:34 +0000 Subject: [PATCH 204/382] =?UTF-8?q?gnome.gnome-settings-daemon:=2042.beta?= =?UTF-8?q?=20=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 4bc6deae723..7e4f92ca9fa 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8ZRFgIrGSYdkMwxbAqnAer70tj7/1G0HX85IjZ4Ahl8="; + sha256 = "5vnAiV1YpeNu3Dlgo59pVtnbann0VyKogAFh/EzcMpM="; }; patches = [ From 0ff3e9dc9d171065d04ea3a20a36c5684f83ff5f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:34 +0000 Subject: [PATCH 205/382] =?UTF-8?q?gnome.gnome-shell:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 07ccb0f516c..1ad36f7e96b 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "42.beta"; + version = "42.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "2jVPkpxtq0gK/7GpzpFyVRc5CuIfV0R/TB8QW/HR0Rc="; + sha256 = "M9QE+zyTud5CmE8BEKKWnWpKckfCf+f14kxn7P7HUJQ="; }; patches = [ From 46a26699b029edb3a48a4b0a2e9e9c142509d598 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:35 +0000 Subject: [PATCH 206/382] =?UTF-8?q?gnome.gnome-shell-extensions:=2042.beta?= =?UTF-8?q?=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 0a34495908f..1083fe11106 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "QtHztEMRGe344a66JKAMgC9ixQBn4j2xKIynwSWsIu8="; + sha256 = "PuZbdbGv2LzKCioD2psohHh+1A4leogdmqbvfIcnYC8="; }; patches = [ From 3a39559228c3d0e5e7f5ac9367297a0f37e5e165 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:38 +0000 Subject: [PATCH 207/382] =?UTF-8?q?gnome.gnome-software:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 6c956bb4f11..729bf57f8e6 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "vGxp+8L0IMjQA604lu6Coe8GpIFWS5E69StzFxf7TXY="; + sha256 = "46yV0SPC7UBhqKT2pgXOag2O2qqgIvbpg8qAz5d6jmk="; }; patches = [ From 3b3cfa23927dbfc1af052fe48e79317af16c7d84 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:43 +0000 Subject: [PATCH 208/382] =?UTF-8?q?gnome.gnome-system-monitor:=2042.alpha?= =?UTF-8?q?=20=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/42.alpha...42.rc --- .../gnome/core/gnome-system-monitor/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index a3dea632291..d29ce337e33 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -12,7 +12,6 @@ , wrapGAppsHook , meson , ninja -, python3 , gsettings-desktop-schemas , itstool , gnome @@ -24,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "42.alpha"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "puK3mIgkm/YQpVaOCvjq2gFNiQ1PwXxWb2Gk21lHqMo="; + sha256 = "CfScgbZZVvHW3ZnumpQRJkvzSPRRbIu6m6sLX/x8D0c="; }; nativeBuildInputs = [ @@ -38,7 +37,6 @@ stdenv.mkDerivation rec { wrapGAppsHook meson ninja - python3 ]; buildInputs = [ @@ -58,12 +56,6 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-system-monitor"; From 124cef91b10b7881d694c9807aa432860906ae2c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:48 +0000 Subject: [PATCH 209/382] =?UTF-8?q?gnome.gnome-tweaks:=2040.10=20=E2=86=92?= =?UTF-8?q?=2042.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-tweaks/-/compare/40.10...42.beta --- pkgs/desktops/gnome/misc/gnome-tweaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index 88678ff0113..5643741aceb 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "40.10"; + version = "42.beta"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z/07M6OZV3+7RJHOj70C9UxZJPEFbzARTo1CApDvI/w="; + sha256 = "g/RMwdyK3HcM2tcXtAPLmmzDwN5Q445vHmeLQ0Aa2Gg="; }; nativeBuildInputs = [ From 340aed85ff5e457e88594c19068a4698ff220712 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:49 +0000 Subject: [PATCH 210/382] =?UTF-8?q?gnome.gnome-weather:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/apps/gnome-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 88495c9a237..c954dc0b7c3 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "veAxQbZcSq4qofvOdH7zmkAvbOMrQXzw4dYXC3jxfho="; + sha256 = "JnI+WkAKMi9dLlehIVajrHqMA3Qo6vWgDZZTQ+rDxoQ="; }; nativeBuildInputs = [ From 2156af0633f9ab1e506c7a202523232bb5565739 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:59 +0000 Subject: [PATCH 211/382] =?UTF-8?q?gnome.nautilus:=2042.beta=20=E2=86=92?= =?UTF-8?q?=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/42.beta...42.rc --- pkgs/desktops/gnome/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 50aec269f97..8618bb026eb 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "42.beta"; + version = "42.rc"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z6TYKgbtYMvsB3i2d7wi7gaws/vfwTLKhwoL8LJmQjE="; + sha256 = "IA80O5kQQzao46aPN8Q9QP1K2a0wSl4fxZP43FE/r58="; }; patches = [ From 709adb24627cf88c751056d523261451c8132862 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:59 +0000 Subject: [PATCH 212/382] =?UTF-8?q?gnome.metacity:=203.42.0=20=E2=86=92=20?= =?UTF-8?q?3.43.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/metacity/-/compare/3.42.0...3.43.1 --- pkgs/desktops/gnome/misc/metacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index 8dcef792265..943592f9052 100644 --- a/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.42.0"; + version = "3.43.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2J1nnc/tm17vGPBuLcszp6tUPVOzWPqJzmVZPCMe7rw="; + sha256 = "TZIUpsEqvZEo9mXScswNU+H9GiTY9pmYVg16EQn1GGc="; }; patches = [ From e30273b083f4c1146dd76f30de50e07e8dcbfa5b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:29:59 +0000 Subject: [PATCH 213/382] =?UTF-8?q?gnome.mutter:=2042.beta=20=E2=86=92=204?= =?UTF-8?q?2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 6fa9fc70b69..9f3925d0ce5 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -46,13 +46,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "42.beta"; + version = "42.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Nz3ZZtoUmh8qi2suTxsYIelEkUyaUd5A+0UTCNVD7UQ="; + sha256 = "0eJARGt/jNij/52q4zbByQFhk7p+B2nHml5sA4SQIuU="; }; patches = [ From 6699fb04e91e4fcef61f6a68ccff030c90760557 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:30:03 +0000 Subject: [PATCH 214/382] =?UTF-8?q?gnome.networkmanager-fortisslvpn:=201.2?= =?UTF-8?q?.10=20=E2=86=92=201.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/compare/1.2.10...1.4.0 --- .../networkmanager/fortisslvpn/default.nix | 19 +++++++++---------- .../fortisslvpn/fix-paths.patch | 7 ++++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index f97bac13cf7..e9608741816 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , openfortivpn @@ -7,23 +8,24 @@ , file , glib , gtk3 +, gtk4 , networkmanager , ppp , libsecret , withGnome ? true , gnome -, fetchpatch , libnma +, libnma-gtk4 }: stdenv.mkDerivation rec { pname = "NetworkManager-fortisslvpn"; - version = "1.2.10"; + version = "1.4.0"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s"; + sha256 = "sFXiY0m1FrI1hXmKs+9XtDawFIAOkqiscyz8jnbF2vo="; }; patches = [ @@ -31,12 +33,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit openfortivpn; }) - - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/merge_requests/11.patch"; - sha256 = "0l7l2r1njh62lh2pf497ibf99sgkvjsj58xr76qx3jxgq9zfw6n9"; - }) ]; nativeBuildInputs = [ @@ -52,12 +48,15 @@ stdenv.mkDerivation rec { glib ] ++ lib.optionals withGnome [ gtk3 + gtk4 libsecret libnma + libnma-gtk4 ]; configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gtk4=${if withGnome then "yes" else "no"}" "--localstatedir=/var" "--enable-absolute-paths" ]; diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch b/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch index a1241b6738c..9176a3bf042 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch @@ -1,11 +1,12 @@ +diff --git a/src/nm-fortisslvpn-service.c b/src/nm-fortisslvpn-service.c +index 6c340d0..995c981 100644 --- a/src/nm-fortisslvpn-service.c +++ b/src/nm-fortisslvpn-service.c -@@ -387,7 +387,7 @@ +@@ -182,6 +182,7 @@ nm_find_openfortivpn (void) { static const char *openfortivpn_binary_paths[] = { -- "/bin/openfortivpn", + "@openfortivpn@/bin/openfortivpn", - "/usr/bin/openfortivpn", "/usr/local/bin/openfortivpn", + "/usr/bin/openfortivpn", NULL From 1947aeb1684e831168d3701efc069e1e24956c55 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:30:05 +0000 Subject: [PATCH 215/382] =?UTF-8?q?gnome.networkmanager-openconnect:=201.2?= =?UTF-8?q?.6=20=E2=86=92=201.2.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/-/compare/1.2.6...1.2.8 --- .../networkmanager/openconnect/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index c03a698514a..e0199784b2b 100644 --- a/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , glib @@ -12,21 +13,21 @@ , libsecret , file , gtk3 +, libnma +, libnma-gtk4 +, gtk4 , withGnome ? true , gnome , kmod -, fetchpatch }: -let +stdenv.mkDerivation rec { pname = "NetworkManager-openconnect"; - version = "1.2.6"; -in stdenv.mkDerivation { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + version = "1.2.8"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m"; + url = "mirror://gnome/sources/NetworkManager-openconnect/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "Xe2qeF2C2OI53dCCv6xSUMaR6WRGS+GAe2gnJjYzzcw="; }; patches = [ @@ -34,12 +35,6 @@ in stdenv.mkDerivation { src = ./fix-paths.patch; inherit kmod openconnect; }) - - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/merge_requests/9.patch"; - sha256 = "0yd2dmq6gq6y4czr7dqdgaiqvw2vyv2gikznpfdxyfn2v1pcrk9m"; - }) ]; buildInputs = [ @@ -49,6 +44,9 @@ in stdenv.mkDerivation { networkmanager ] ++ lib.optionals withGnome [ gtk3 + libnma + libnma-gtk4 + gtk4 gcr libsecret ]; @@ -61,8 +59,8 @@ in stdenv.mkDerivation { configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gtk4=${if withGnome then "yes" else "no"}" "--enable-absolute-paths" - "--without-libnm-glib" ]; passthru = { From a8df2da06ebc801be5e059b67dbc0fb3ffc67981 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:30:06 +0000 Subject: [PATCH 216/382] =?UTF-8?q?gnome.networkmanager-openvpn:=201.8.16?= =?UTF-8?q?=20=E2=86=92=201.8.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/compare/1.8.16...1.8.18 --- .../networkmanager/openvpn/default.nix | 53 +++++++++++++++---- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index 20a90fffed2..92391e0374b 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -1,15 +1,31 @@ -{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret -, glib, gtk3, withGnome ? true, gnome, kmod, libnma }: +{ stdenv +, lib +, fetchurl +, substituteAll +, openvpn +, intltool +, libxml2 +, pkg-config +, file +, networkmanager +, libsecret +, glib +, gtk3 +, gtk4 +, withGnome ? true +, gnome +, kmod +, libnma +, libnma-gtk4 +}: -let +stdenv.mkDerivation rec { pname = "NetworkManager-openvpn"; - version = "1.8.16"; -in stdenv.mkDerivation { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + version = "1.8.18"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "iSDeCceuXx9SDIP4REVduPrsMUJzUCaP4t2VuGD5H7U="; + url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "U9+wrPZEeK3HKAdPFi9i5gv/YqYFvYl+uIsmfnBXkno="; }; patches = [ @@ -19,13 +35,28 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ openvpn networkmanager glib ] - ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; + nativeBuildInputs = [ + intltool + pkg-config + file + libxml2 + ]; - nativeBuildInputs = [ intltool pkg-config file libxml2 ]; + buildInputs = [ + openvpn + networkmanager + glib + ] ++ lib.optionals withGnome [ + gtk3 + gtk4 + libsecret + libnma + libnma-gtk4 + ]; configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gtk4=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager "--enable-absolute-paths" ]; From 957a88ced6acbacca3dd6ff8e106acdbc0cd2637 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:30:08 +0000 Subject: [PATCH 217/382] =?UTF-8?q?gnome.networkmanager-vpnc:=201.2.6=20?= =?UTF-8?q?=E2=86=92=201.2.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/-/compare/1.2.6...1.2.8 --- .../networkmanager/vpnc/default.nix | 58 +++++++++++++------ 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix index 70e7104696e..d81dbf08816 100644 --- a/pkgs/tools/networking/networkmanager/vpnc/default.nix +++ b/pkgs/tools/networking/networkmanager/vpnc/default.nix @@ -1,14 +1,30 @@ -{ lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkg-config, networkmanager, libsecret -, gtk3, withGnome ? true, gnome, glib, kmod, file, fetchpatch, libnma }: -let +{ stdenv +, lib +, fetchurl +, substituteAll +, vpnc +, intltool +, pkg-config +, networkmanager +, libsecret +, gtk3 +, gtk4 +, withGnome ? true +, gnome +, glib +, kmod +, file +, libnma +, libnma-gtk4 +}: + +stdenv.mkDerivation rec { pname = "NetworkManager-vpnc"; - version = "1.2.6"; -in stdenv.mkDerivation { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + version = "1.2.8"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy"; + url = "mirror://gnome/sources/NetworkManager-vpnc/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1l4xqlPI/cP95++EpNqpeaYFwj/THO/2R79+qqma+8w="; }; patches = [ @@ -16,21 +32,29 @@ in stdenv.mkDerivation { src = ./fix-paths.patch; inherit vpnc kmod; }) - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/merge_requests/5.patch"; - sha256 = "0z0x5vqmrsap3ynamhya7gh6c6k5grhj2vqpy76alnv9xns8dzi6"; - }) ]; - buildInputs = [ vpnc networkmanager glib ] - ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; + nativeBuildInputs = [ + intltool + pkg-config + file + ]; - nativeBuildInputs = [ intltool pkg-config file ]; + buildInputs = [ + vpnc + networkmanager + glib + ] ++ lib.optionals withGnome [ + gtk3 + gtk4 + libsecret + libnma + libnma-gtk4 + ]; configureFlags = [ - "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gtk4=${if withGnome then "yes" else "no"}" "--enable-absolute-paths" ]; From 3c834a10ca6f0411350025d8799752b27d1cc807 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:30:22 +0000 Subject: [PATCH 218/382] =?UTF-8?q?gnome-builder:=2042.beta1=20=E2=86=92?= =?UTF-8?q?=2042.rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/42.beta1...42.rc1 --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index f17aa21f2be..873d2118b4d 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "42.beta1"; + version = "42.rc1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cEgZ7J/W7Mb6S489mFsCEs+hZWlhAMzalGGPiBKzKio="; + sha256 = "s0rehJp+0lOpf+I6ObFpqgnatnQXIawWOORa/IA+D8M="; }; nativeBuildInputs = [ From e88659acea082fa2e9fc3bda5c6f2785d7826d17 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:30:30 +0000 Subject: [PATCH 219/382] =?UTF-8?q?gnome-text-editor:=2042.beta1=20?= =?UTF-8?q?=E2=86=92=2042.rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/42.beta1...42.rc1 --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 0597692affe..45945e11e17 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "42.beta1"; + version = "42.rc1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xpWG5IRY9vzHazgWMW2fvM4EOWiTQlt/gxlgHkk9/A8="; + sha256 = "sha256-JLCQMFIPb3QzPy5qoNmN1P36lBx8QsXk4rW80j15Mmo="; }; nativeBuildInputs = [ From 07bd942158d5929edf929680d3f121ae6522cf5f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:30:44 +0000 Subject: [PATCH 220/382] =?UTF-8?q?gsettings-desktop-schemas:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/compare/42.beta...42.rc --- .../libraries/gsettings-desktop-schemas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 2c0ba0a01de..63c700fe75e 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "42.beta"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "LwNwYJ8+mqCdoCkzkSACT4B0k0ZnPRH2UdXM/HbkrzY="; + sha256 = "4tGRELuUWySHLBG/TIDv0ZE29eWrIqk1jvBA30Z3aAk="; }; strictDeps = true; From 71fd4d86885d55388537b7b3df3f9ad71cf22887 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:30:52 +0000 Subject: [PATCH 221/382] =?UTF-8?q?gtk3:=203.24.31=20=E2=86=92=203.24.33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk+/-/compare/3.24.31...3.24.33 --- pkgs/development/libraries/gtk/3.x.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index bb145159447..c736c5cc761 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -2,7 +2,6 @@ , stdenv , substituteAll , fetchurl -, fetchpatch , pkg-config , gettext , docbook-xsl-nons @@ -60,7 +59,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.31"; + version = "3.24.33"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-Qjw+f9tMRZ7oieNf1Ncf0mI1YlQcEEGxHAflrR/xC/k="; + sha256 = "sha256-WIsGUi4l0VeemJtvnYob2/L+E83gGgTpBP80aiJeeAE="; }; patches = [ @@ -84,12 +83,6 @@ stdenv.mkDerivation rec { # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536 ./patches/3.0-darwin-x11.patch - - # 3.24.31 does not declare QuartzCore dependency properly and fails to link - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/0ac61443694b477c41fc246cb387ef86aba441de.patch"; - sha256 = "sha256-KaMeIdV/gfM4xzN9lIkY99E7bzAfTM6VETk5DEunB2w="; - }) ]; nativeBuildInputs = [ From f4ed674e9bfbaedffd33642818934dd6ce2550ab Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:31:06 +0000 Subject: [PATCH 222/382] =?UTF-8?q?libdazzle:=203.42.0=20=E2=86=92=203.43.?= =?UTF-8?q?90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libdazzle/-/compare/3.42.0...3.43.90 --- .../libraries/libdazzle/default.nix | 45 ++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 426ffadf4c6..0a35ffc96f8 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,20 +1,53 @@ -{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb-run, glib, gtk3, gnome }: +{ lib +, stdenv +, fetchurl +, ninja +, meson +, pkg-config +, vala +, gobject-introspection +, libxml2 +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, dbus +, xvfb-run +, glib +, gtk3 +, gnome +}: stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.42.0"; + version = "3.43.90"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09b9l56yiwad7xqr7g7ragmm4gmqxjnvc2pcx6741klw7lxpmrpa"; + sha256 = "LPTtCoKcw0awqGD5QRyrJ6rkJjScT+wCgUZAyzmEyiY="; }; - nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ]; - buildInputs = [ glib gtk3 ]; + nativeBuildInputs = [ + ninja + meson + pkg-config + vala + gobject-introspection + libxml2 + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + dbus + xvfb-run + glib + ]; + + buildInputs = [ + glib + gtk3 + ]; mesonFlags = [ "-Denable_gtk_doc=true" From 948008152b46af43520a6df89d0d31c9a87f5029 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:31:06 +0000 Subject: [PATCH 223/382] =?UTF-8?q?libadwaita:=201.1.beta=20=E2=86=92=201.?= =?UTF-8?q?1.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.1.beta...1.1.rc --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index bd19c79a302..fc8fbb7300b 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.beta"; + version = "1.1.rc"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-D1hJMidnGtCC+6gz6lqp+qL+9UVzIRL7IjGptwk/X+M="; + hash = "sha256-odXwY/iQtJMzUAIlfpY8lfPUS0s7jdQ4F9Rr32D/hzk="; }; nativeBuildInputs = [ From a873fe79934e24137c699c4d7188e078341af715 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:31:25 +0000 Subject: [PATCH 224/382] =?UTF-8?q?libhandy:=201.5.90=20=E2=86=92=201.5.91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libhandy/-/compare/1.5.90...1.5.91 --- pkgs/development/libraries/libhandy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 6c58d68341f..0c6dd8d3e4b 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.5.90"; + version = "1.5.91"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-acE3tXgik1OTcbzb0VuRzB8PSi9U2b3jszmGB6WIkKI="; + sha256 = "sha256-zHYdeDROW40nz6iiRjNi8kTBGysH/pdJV7XJYQas1Ds="; }; nativeBuildInputs = [ From 747b64c51c8a25a3bb8743e30cfc96649ace3bcc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:31:37 +0000 Subject: [PATCH 225/382] =?UTF-8?q?librsvg:=202.53.1=20=E2=86=92=202.53.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/librsvg/-/compare/2.53.1...2.53.2 --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index e9b7a67e558..777aaa7bd8a 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.53.1"; + version = "2.53.2"; outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "uo4EAHR0nzhFRFxWAuCQLzAHoYsHTPDMahDI3cWmUyI="; + sha256 = "BmPFJ+rBpxyVplF4wC/xGt4jqa6jTq+STKZuSp7qa3w="; }; cargoVendorDir = "vendor"; From 652c0997898ee41850d7a4b8423d6c6f1c04c4a5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:31:50 +0000 Subject: [PATCH 226/382] =?UTF-8?q?mobile-broadband-provider-info:=2020210?= =?UTF-8?q?805=20=E2=86=92=2020220315?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/compare/20210805...20220315 --- pkgs/data/misc/mobile-broadband-provider-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 51598a53d50..234016175d2 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20210805"; + version = "20220315"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-a/ihVY6lVBr7xve0QV50zJ9aqYKbE07Ks+8ch0ElaLw="; + sha256 = "sha256-H82sctF52xQnl4Nm9wG+HDx1Nf1aZYvFzIKCR8b2RcY="; }; nativeBuildInputs = [ From a150787ddc2726faa9c8068963ca77af9b7fb002 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:31:57 +0000 Subject: [PATCH 227/382] =?UTF-8?q?orca:=2042.beta=20=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_42_BETA...ORCA_42_RC --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 3de74635349..559b0ecf8e9 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.beta"; + version = "42.rc"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lhL6XiigaN4lAi0d5/OWrBRjArySLTTvGG5YeEJR96M="; + sha256 = "LKaKC90G4N1TGsxeGUHvwyQUbzxa0l9esjJt4b8SMo8="; }; patches = [ From fa58a38b4056561857d5ff0a942fbeb331bd2cf0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:31:57 +0000 Subject: [PATCH 228/382] =?UTF-8?q?pango:=201.50.4=20=E2=86=92=201.50.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pango/-/compare/1.50.4...1.50.5 --- pkgs/development/libraries/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 0e6e1d33ba3..5a5e2e1d4f9 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.4"; + version = "1.50.5"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "9K1j6H3CsUUwBUKk+wBNB6n5GzQVL64N2+UOzdhRwWI="; + sha256 = "bRNoctpiB/6Ixc0slcNryvTtKUArhUZjqGzX7+mbDPU="; }; strictDeps = !withIntrospection; From 69dde9d14fabb7f655ab3e4506faf963b056159a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:32:06 +0000 Subject: [PATCH 229/382] =?UTF-8?q?sysprof:=203.42.1=20=E2=86=92=203.43.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sysprof/-/compare/3.42.1...3.43.90 --- pkgs/development/tools/profiling/sysprof/capture.nix | 1 + pkgs/development/tools/profiling/sysprof/default.nix | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index 2d33dedbdd2..e6690fc0c68 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith_sysprofd=none" "-Dlibsysprof=false" + "-Dlibunwind=false" "-Dhelp=false" "-Denable_tools=false" "-Denable_tests=false" diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 319212da770..50ed0663886 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -8,8 +8,10 @@ , json-glib , itstool , libdazzle +, libunwind , libxml2 -, meson, ninja +, meson +, ninja , pango , pkg-config , polkit @@ -21,13 +23,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.42.1"; + version = "3.43.90"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "F5a4FATudf0eus9URkrXr/6/YvKFHu9STZ+OrAxKIAE="; + sha256 = "6PMXiS9d3A5cUdN1nEk443VQOvNM18h2ttPYzrqdc0c="; }; nativeBuildInputs = [ @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { polkit systemd libdazzle + libunwind ]; mesonFlags = [ From 3eac402d0d877b5549701a19dd8cad03bb808f23 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:32:11 +0000 Subject: [PATCH 230/382] =?UTF-8?q?tracker:=203.3.0.beta=20=E2=86=92=203.3?= =?UTF-8?q?.0.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.3.0.beta...3.3.0.rc --- pkgs/development/libraries/tracker/default.nix | 12 ++---------- pkgs/development/libraries/tracker/fix-paths.patch | 13 ------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/libraries/tracker/fix-paths.patch diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 1fd66ea9c61..02903258b00 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -25,27 +25,19 @@ , json-glib , systemd , dbus -, substituteAll }: stdenv.mkDerivation rec { pname = "tracker"; - version = "3.3.0.beta"; + version = "3.3.0.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "JvOoH1FOWsz8mBcpWAOK9Mw421rdp2u7yaB8gnorGjs="; + sha256 = "J4ypi46GGYxYpwBfzEqVHvP7w18zdbIUo5l1D1KI5ig="; }; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit asciidoc; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/tracker/fix-paths.patch b/pkgs/development/libraries/tracker/fix-paths.patch deleted file mode 100644 index 5e4d8657f7b..00000000000 --- a/pkgs/development/libraries/tracker/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build -index f90c757cf..40d9c939d 100644 ---- a/docs/manpages/meson.build -+++ b/docs/manpages/meson.build -@@ -32,7 +32,7 @@ foreach m : manpages - command: [xsltproc, - '--output', '@OUTPUT@', - '--stringparam', 'man.authors.section.enabled', '0', -- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], -+ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], - input: xml, - output: manpage, - install: true, From 43d4e493beb8a4b115560cb3d2aca4eaf6539bfd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:32:12 +0000 Subject: [PATCH 231/382] =?UTF-8?q?tracker-miners:=203.3.0.beta=20?= =?UTF-8?q?=E2=86=92=203.3.0.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker-miners/-/compare/3.3.0.beta...3.3.0.rc --- .../libraries/tracker-miners/default.nix | 15 ++++----------- .../libraries/tracker-miners/fix-paths.patch | 13 ------------- 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/libraries/tracker-miners/fix-paths.patch diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 877609fd179..e1c3569bd06 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, substituteAll , asciidoc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.3.0.beta"; + version = "3.3.0.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "a0spkyekdk5H0d9bJTiBbr5LhMsyX9nlrloHMQexAcU="; + sha256 = "dr861BhgwrhICNLuWfe6a4CjrQylvE1H0tav0sn+lwY="; }; nativeBuildInputs = [ @@ -113,13 +113,6 @@ stdenv.mkDerivation rec { "-Dminer_rss=false" ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit asciidoc; - }) - ]; - postInstall = '' glib-compile-schemas "$out/share/glib-2.0/schemas" ''; diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch deleted file mode 100644 index 8661648eacd..00000000000 --- a/pkgs/development/libraries/tracker-miners/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build -index 0b8a64863..a09db59f0 100644 ---- a/docs/manpages/meson.build -+++ b/docs/manpages/meson.build -@@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_manpages - command: [xsltproc, - '--output', '@OUTPUT@', - '--stringparam', 'man.authors.section.enabled', '0', -- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], -+ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], - input: xml, - output: manpage, - install: true, From caa2c316642a2a93959b172494efc767df49d2d4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:32:17 +0000 Subject: [PATCH 232/382] =?UTF-8?q?xdg-desktop-portal-gnome:=2041.1=20?= =?UTF-8?q?=E2=86=92=2042.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/compare/41.1...42.rc --- .../libraries/xdg-desktop-portal-gnome/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index ad68f13fe0f..a98c11d8b77 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -10,6 +10,7 @@ , gsettings-desktop-schemas , gtk4 , libadwaita +, gnome-desktop , xdg-desktop-portal , wayland , gnome @@ -17,11 +18,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "41.1"; + version = "42.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "u6FEGZ5+1LlJCyScGvZFqGnWKZMmXerDjyGb8EL//fI="; + sha256 = "NSQFoSKAQXsC21jy6Muq7xAtcmOdeXZAH8/ME01kw7U="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas # settings exposed by settings portal gtk4 libadwaita + gnome-desktop xdg-desktop-portal wayland # required by GTK 4 ]; From 6d70c1c14921be699887e2f9fe24d52b3619e969 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Mar 2022 20:32:18 +0000 Subject: [PATCH 233/382] =?UTF-8?q?vala=5F0=5F56:=200.55.90=20=E2=86=92=20?= =?UTF-8?q?0.55.91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/-/compare/0.55.90...0.55.91 --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 5d70446b848..0aaa5e5ce3c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -100,8 +100,8 @@ in rec { }; vala_0_56 = generic { - version = "0.55.90"; - sha256 = "jY49tFLkB3eeisTjsKWx2qVGDc6SDvN599dKNtMKXDM="; + version = "0.55.91"; + sha256 = "qdaV/hImno3MNy4FPc9m1p8CkNNO6LgjKAmBa7hiJ7s="; }; vala = vala_0_54; From 429862e5fa4ba70b879b9d7c00ed3c23711be3fd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:20:19 +0000 Subject: [PATCH 234/382] =?UTF-8?q?at-spi2-core:=202.43.92=20=E2=86=92=202?= =?UTF-8?q?.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/AT_SPI2_CORE_2_43_92...AT_SPI2_CORE_2_44_0 --- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index e62b2f8dd47..675c930d9ed 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.43.92"; + version = "2.44.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jXTuEnhOtCU34v1sGWT/J+xXHh6wh9Y8F8xDceyuhyM="; + sha256 = "fu488oWwiQYP1rblGz6yys91LMo6CCx/TCxauEHlE1M="; }; nativeBuildInputs = [ From baead1ef9491d9b08c955cf6263e4adb7538ed9c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:20:32 +0000 Subject: [PATCH 235/382] =?UTF-8?q?evince:=2042.rc=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 930922c76ed..d9f5f7b6f7f 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "42.rc"; + version = "42.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XtLiXcPrxbJDdNgyVlTBICcDg5A42GANUWk52JJjte8="; + sha256 = "rGD/FKr1bWQ5lcO0um9XJcyc4k4nkIc7XIfttKIALUI="; }; patches = lib.optionals withPantheon [ From db0ac3504c4c52aeb751b15b91c72080751b41db Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:20:33 +0000 Subject: [PATCH 236/382] =?UTF-8?q?epiphany:=2042.beta=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index ffbdd423c60..43b3eb2ee2f 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "vNVCkd+N9wm3W/0Xu+CQWVrag8vbFmMj6B9B/PiVjDI="; + sha256 = "Pb+owA5Ft/ROGCTQHw/r6DcHtfuTMMJhFz9ot/A81eM="; }; patches = lib.optionals withPantheon [ From f07b4584f00d0c4d9c8a2421a12efafc90f35416 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:20:34 +0000 Subject: [PATCH 237/382] =?UTF-8?q?evolution:=203.43.3=20=E2=86=92=203.44.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.43.3...3.44.0 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 541cc95235c..2fae122fc1b 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.43.3"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "lnh+6kfHDvPL9+5HX0nK4DKS+wi3sWRJi5ccM38ju80="; + sha256 = "3yHT31Ik36hC6ikO/82QKv1LFBhgik37aQejt9TZlPk="; }; nativeBuildInputs = [ From ebc11eed59023b14e6353d66cc5782a3796ddfb7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:20:34 +0000 Subject: [PATCH 238/382] =?UTF-8?q?evolution-data-server:=203.43.3=20?= =?UTF-8?q?=E2=86=92=203.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.43.3...3.44.0 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index ce581f8fc78..e43fe60eb7e 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.43.3"; + version = "3.44.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bSt+XXN1l95aDOZVxZj3TTN262CpcqRr+5Q/Gu4HAEE="; + sha256 = "DYiBtcUeG5F2GxlF2yZKRqq/VKc+6hyo9EiyB4FdWC4="; }; patches = [ From 23817ad3a3d7e368db681f30cbaf1a959ce76938 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:20:38 +0000 Subject: [PATCH 239/382] =?UTF-8?q?evolution-ews:=203.43.3=20=E2=86=92=203?= =?UTF-8?q?.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.43.3...3.44.0 --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 7044e226173..db7771bc3c9 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.43.3"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "pSix3sk72OawjujEoJMpihJZYAW9Bn0/AM1EKTgWg0w="; + sha256 = "q4Cg6eLOdn+56EruBl0Ote9QLNebLiykUeyoQpIpeoA="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; From a0da2d759d5c2722bff3edfe7f374145ec5387f5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:20:43 +0000 Subject: [PATCH 240/382] =?UTF-8?q?gdk-pixbuf:=202.42.6=20=E2=86=92=202.42?= =?UTF-8?q?.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/compare/2.42.6...2.42.8 --- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 74f0c7c09c7..1e9c881ae8c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.42.6"; + version = "2.42.8"; outputs = [ "out" "dev" "man" ] ++ lib.optional withGtkDoc "devdoc" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zz7pmw2z46g7mr1yjxbsdldd5pd03xbjc58inj8rxfqgrdvg9n4"; + sha256 = "hKzqOsskEbKRNLMgFaWxqqYoRLGcSx74uJccawdZ9MY="; }; patches = [ From 76a508dc3969566ed555ac8ad3fc6de1f06f7f6c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:20:49 +0000 Subject: [PATCH 241/382] =?UTF-8?q?glib:=202.71.3=20=E2=86=92=202.72.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.71.3...2.72.0 --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 77902229f10..02e2293d173 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.71.3"; + version = "2.72.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "KIVJQEwm2z1Sz3o38vQrSVsxzP/OK0yyQ5pkCZx0A0M="; + sha256 = "177w1MTnpi4I77jl8lKgE1cAe5WIqH/ytGOjhXAR950="; }; patches = optionals stdenv.isDarwin [ From 7fd26599b43f936b907430e63cc9d10a7afbc901 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:07 +0000 Subject: [PATCH 242/382] =?UTF-8?q?gnome.gnome-bluetooth:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/gnome-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 258a2b0d42d..7d8fc2bc867 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.rc"; + version = "42.0"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NqZY/rSa4oJCipguZCoFmvBwq+ZUmUFnu5wGsGnrBTs="; + sha256 = "PR4nIGc7yaJCYZ3F0jH9bndsGKSdop9DzcQzBVrbAXA="; }; nativeBuildInputs = [ From 22646b3293c4dda4839349e50495550c12194b98 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:08 +0000 Subject: [PATCH 243/382] =?UTF-8?q?gnome.gnome-boxes:=2042.rc=20=E2=86=92?= =?UTF-8?q?=2042.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/42.rc...42.0.1 --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index dddeb4b78a6..7853a80f073 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "42.rc"; + version = "42.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8CTBQJ5YaD/GRWcSMZFlv1BGTQhWLQYXuKkUOgnzTrI="; + sha256 = "GuIS/4mZFVQuxTtU2VtozfJx2VjPUSzcP+3Hgixu4SM="; }; doCheck = true; From 9ef769d3ebea046d05197045565e4d8abe1b1e6d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:11 +0000 Subject: [PATCH 244/382] =?UTF-8?q?gnome.gnome-calendar:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index a457b9d9d26..10267a6c870 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1k2ZG3WbwvdvjJQFicd9gb2oEergo5+9kyoIV/R0eZQ="; + sha256 = "tj9z9VAy/BOQRC+UzfazyrnJHHdN3S5cYez+ydLF6ao="; }; nativeBuildInputs = [ From 35718b4e39a2ddec3e6bfb5bcb81c4e5c00dea66 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:13 +0000 Subject: [PATCH 245/382] =?UTF-8?q?gnome.gnome-chess:=2042.alpha=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-chess/-/compare/42.alpha...42.0 --- pkgs/desktops/gnome/games/gnome-chess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index 3834839de7e..5690355a0ce 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "42.alpha"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "53vLHtI+o0Xb/qP3Z0RM29aHTxYohOG81n1OLKaOx1k="; + sha256 = "Eq9Uk6YiBaxrt0VA8KhYQT2okolmo0boVDMLQdc7w5M="; }; nativeBuildInputs = [ From 1c3215f4a6b4e803ee8786fff49242cd96b6c193 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:18 +0000 Subject: [PATCH 246/382] =?UTF-8?q?gnome.gnome-control-center:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index ec3e2804978..9dc09cfe81a 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5yXQ+HzmMQz9/jWxqYcfvxj2JxfcmHaOMeDRQiT6EpI="; + sha256 = "sha256-BzLvp8QXHOCg7UEGWAtM41pXsQFSwOo20jkTSRN3fto="; }; patches = [ From 50e60fa5cb2f2c78cc4b354da1967ea327cf1c57 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:20 +0000 Subject: [PATCH 247/382] =?UTF-8?q?gnome.gnome-disk-utility:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/gnome-disk-utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index 17a70d4261b..89502c8d883 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-09rOYmvYLkoPBeYuWU58noj/Dm+NVJngneyUyRnbu/c="; + sha256 = "sha256-G2VkRU1nQmMiyzv8WlVYZTv8ff7qKuCCWx0IYp8BCQs="; }; nativeBuildInputs = [ From c65426f6062c3d9b245db7a9c7cd20de4b8e2540 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:25 +0000 Subject: [PATCH 248/382] =?UTF-8?q?gnome.gnome-initial-setup:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 608e27368f3..2d5ef1409a7 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "7ACze8aXJvlwsAw4hSgq4IPgtGi93iGS24D2ju1eJ3k="; + sha256 = "y/PjhtKstfTsuxGP+3A9oSkB6EuAwkR0lCgQHqxH6qc="; }; patches = [ From 54f5470466241f9ccae3c504a5f985f9d4615c3d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:42 +0000 Subject: [PATCH 249/382] =?UTF-8?q?gnome.gnome-software:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 729bf57f8e6..e89f616680c 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "46yV0SPC7UBhqKT2pgXOag2O2qqgIvbpg8qAz5d6jmk="; + sha256 = "QsaF4u95li6zCo6VjHA8mh899zFQQiOgYos7Yk733B4="; }; patches = [ From 06ef018ff4a91a14ba98890184cbee83eb9cc5b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:44 +0000 Subject: [PATCH 250/382] =?UTF-8?q?gnome.gnome-sudoku:=2040.2=20=E2=86=92?= =?UTF-8?q?=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/40.2...42.0 --- pkgs/desktops/gnome/games/gnome-sudoku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 1431a617949..87e7c467d04 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "40.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NhIFMePHE5WB6jgA+/48KzFpTEQBRezIl6w05WLXVKM="; + sha256 = "HS603bgCa0Q2Rc81hbjfEkTjgo7hwHUYBSslmeHFwo8="; }; nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; From 42e872ee28adc8ccb896679ce17b33a1cceb3bae Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:21:54 +0000 Subject: [PATCH 251/382] =?UTF-8?q?gnome.gvfs:=201.49.90=20=E2=86=92=201.5?= =?UTF-8?q?0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gvfs/-/compare/1.49.90...1.50.0 --- pkgs/development/libraries/gvfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index c61d75bd250..e02a0be4d28 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.49.90"; + version = "1.50.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Pj1lT6TWqASzppLPYHCdyop8HtlSMDakLYv3U5WLm2w="; + sha256 = "y8L1ZNLp8Ax2BnP0LWgDvOPggat/+0RW3v//upM5tN0="; }; postPatch = '' From 49663d6348c4b94bfbb21f9fc1771a18a1a1d9e2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:22:08 +0000 Subject: [PATCH 252/382] =?UTF-8?q?gnome.simple-scan:=2040.7=20=E2=86=92?= =?UTF-8?q?=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/simple-scan/-/compare/40.7...42.0 --- pkgs/desktops/gnome/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix index 0865fbb5aca..dd96e254109 100644 --- a/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "40.7"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-fFUYUsta99NKqYn4rV7ePL4xgoz43VrsKytv3NGsPVM="; + sha256 = "sha256-rB+Fev0LyIl90gRQI618VxPlzu/KVrCzzF6aR5UylYY="; }; nativeBuildInputs = [ From d6d13b7d13b7ae3443aa330ef9f880032f7a7b3c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:22:11 +0000 Subject: [PATCH 253/382] =?UTF-8?q?gnome.totem:=2042.beta=20=E2=86=92=2042?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/totem/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/totem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 191985227c9..44e1319f8d4 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6Wibk+ZgYFNSaLke+3WDFohpzUOiOktaoo7szBGxIbc="; + sha256 = "SvBJHduV34szruOZ06UPnHqxfeiNOvYzVlZ8+I9X5qs="; }; nativeBuildInputs = [ From 1e8f2716bcd3578f40730a365e7b6571c39401ae Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:22:17 +0000 Subject: [PATCH 254/382] =?UTF-8?q?gnome-builder:=2042.rc1=20=E2=86=92=204?= =?UTF-8?q?2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/42.rc1...42.0 --- pkgs/applications/editors/gnome-builder/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 873d2118b4d..8fd9f56a9d2 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,6 +5,7 @@ , appstream-glib , desktop-file-utils , fetchurl +, fetchpatch , flatpak , gnome , libgit2-glib @@ -40,15 +41,23 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "42.rc1"; + version = "42.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "s0rehJp+0lOpf+I6ObFpqgnatnQXIawWOORa/IA+D8M="; + sha256 = "Uu/SltaLL/GCNBwEgdz9cGVMQIvbZ5/Ot225cDwiQo8="; }; + patches = [ + # Fix appstream validation + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/d7151679e0c925d27216256dc32fe67fb298d059.patch"; + sha256 = "vdNJawkqSBaFGRZvxzvjOryQpBL4jcN7tr1t3ihD7LA="; + }) + ]; + nativeBuildInputs = [ appstream-glib desktop-file-utils From 82632f000e93aeb67dfc7becc740a3d1ca0679d2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:22:31 +0000 Subject: [PATCH 255/382] =?UTF-8?q?gobject-introspection:=201.71.0=20?= =?UTF-8?q?=E2=86=92=201.72.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gobject-introspection/-/compare/1.71.0...1.72.0 --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index eceed463a3c..b457331983a 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.71.0"; + version = "1.72.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VV3DmXwokiKFQwKfWGELg/wdpzPk49GOk2PXtagRZN0="; + sha256 = "Av6OWQhh2I+DBg3TnNpcyqYLLaHSHQ+VSZMBsYa+qrw="; }; patches = [ From 5c7c637f44d27694fe711a9f7083fac2e1e7e63a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:22:56 +0000 Subject: [PATCH 256/382] =?UTF-8?q?jsonrpc-glib:=203.41.0=20=E2=86=92=203.?= =?UTF-8?q?42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/jsonrpc-glib/-/compare/3.41.0...3.42.0 --- .../libraries/jsonrpc-glib/default.nix | 41 ++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 4f5821ad254..fb828e5b571 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,18 +1,42 @@ -{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, glib +, json-glib +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, gnome +}: + stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.41.0"; + version = "3.42.0"; outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib json-glib ]; - src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "fE5qW4w3KWMs7MMS3BFjxNACQ9MukFKOVOxQOKI6fCE="; + sha256 = "IhmJpXyoKhJGfcQngizXZRsMrQOBQMkxAnvxB0IIJ2s="; }; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + ]; + + buildInputs = [ + glib + json-glib + ]; + mesonFlags = [ "-Denable_gtk_doc=true" ]; @@ -21,6 +45,11 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/jsonrpc-glib/issues/2 doCheck = false; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 0738d6e70d4c6c6f98daa545febf10b24620be5e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:23:00 +0000 Subject: [PATCH 257/382] =?UTF-8?q?libdazzle:=203.43.90=20=E2=86=92=203.44?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libdazzle/-/compare/3.43.90...3.44.0 --- pkgs/development/libraries/libdazzle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 0a35ffc96f8..7f4c53071d0 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.43.90"; + version = "3.44.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "LPTtCoKcw0awqGD5QRyrJ6rkJjScT+wCgUZAyzmEyiY="; + sha256 = "PNPkXrbiaAywXVLh6A3Y+dWdR2UhLw4o945sF4PRjq4="; }; nativeBuildInputs = [ From 4133c2dfcab47552a2064be91b9e98689816bfc4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:23:02 +0000 Subject: [PATCH 258/382] =?UTF-8?q?libadwaita:=201.1.rc=20=E2=86=92=201.1.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.1.rc...1.1.0 --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index fc8fbb7300b..447ad06e9b8 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.rc"; + version = "1.1.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-odXwY/iQtJMzUAIlfpY8lfPUS0s7jdQ4F9Rr32D/hzk="; + hash = "sha256-+bgCD2jy3M0gEAtbB+nOptQGEXXkvk1idoggJz4UMy0="; }; nativeBuildInputs = [ From 81be15c774e1def25869be7db80690dfd524aafd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:23:10 +0000 Subject: [PATCH 259/382] =?UTF-8?q?libgnome-games-support=5F2=5F0:=202.0.b?= =?UTF-8?q?eta.2=20=E2=86=92=202.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgnome-games-support/-/compare/2.0.beta.2...2.0.0 --- pkgs/development/libraries/libgnome-games-support/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/development/libraries/libgnome-games-support/2.0.nix index bc1d795c010..a5f1c2576b9 100644 --- a/pkgs/development/libraries/libgnome-games-support/2.0.nix +++ b/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libgnome-games-support"; - version = "2.0.beta.2"; + version = "2.0.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jB7lF4q8wppOgUJnuMXvo6DvmwkxbAAgCQ4Ex6OYxNw="; + sha256 = "U4Ifb+Mu3cue7zMk9kaqrIPMbT3gk339XyZkcNRT0qQ="; }; nativeBuildInputs = [ From 7fd4c47704c226a3027689014ea48cf53f2803df Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:23:17 +0000 Subject: [PATCH 260/382] =?UTF-8?q?libhandy:=201.5.91=20=E2=86=92=201.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libhandy/-/compare/1.5.91...1.6.1 --- pkgs/development/libraries/libhandy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 0c6dd8d3e4b..c1d81f8043c 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.5.91"; + version = "1.6.1"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zHYdeDROW40nz6iiRjNi8kTBGysH/pdJV7XJYQas1Ds="; + sha256 = "sha256-bqsDhEBNVr0bH6BZ2aCBF3d49q4ID/whIPKGVsp0YqQ="; }; nativeBuildInputs = [ From 2f139d2d019994968fbc238785e1f9b19fd7acc3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:23:29 +0000 Subject: [PATCH 261/382] =?UTF-8?q?librsvg:=202.53.2=20=E2=86=92=202.54.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/librsvg/-/compare/2.53.2...2.54.0 --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 777aaa7bd8a..b0935441384 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.53.2"; + version = "2.54.0"; outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BmPFJ+rBpxyVplF4wC/xGt4jqa6jTq+STKZuSp7qa3w="; + sha256 = "uvjrwUfxRrQmG7PQzQ+slEv427Sx8jR9IzQfl03MMIU="; }; cargoVendorDir = "vendor"; From 31cfdd97700ddeb9c961311fd856f574db4b4783 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:23:32 +0000 Subject: [PATCH 262/382] =?UTF-8?q?libsoup=5F3:=203.0.4=20=E2=86=92=203.0.?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsoup/-/compare/3.0.4...3.0.5 --- pkgs/development/libraries/libsoup/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 454a1cdf40a..4791e49ae3f 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.0.4"; + version = "3.0.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-W9OLXgkfcH/X+j7Xw3qsyj+OFsZXh/HMF9w40dzeVns="; + sha256 = "sha256-9dFD22gws4Je3CocREnWOSc7C/oBeklwhxli2byiIUU="; }; nativeBuildInputs = [ From 487e7ecb8d81a541bdfc7f57828d3b73fe391d9a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:23:53 +0000 Subject: [PATCH 263/382] =?UTF-8?q?sysprof:=203.43.90=20=E2=86=92=203.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sysprof/-/compare/3.43.90...3.44.0 --- pkgs/development/tools/profiling/sysprof/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 50ed0663886..e21e7190786 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.43.90"; + version = "3.44.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6PMXiS9d3A5cUdN1nEk443VQOvNM18h2ttPYzrqdc0c="; + sha256 = "q12fW3GXOzCI1Yob/fHcI8OaAvX85OXpxz4DSxeLAFs="; }; nativeBuildInputs = [ From 748625551a4e2a482e609a97791c38292fdb9a83 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:23:53 +0000 Subject: [PATCH 264/382] =?UTF-8?q?template-glib:=203.34.0=20=E2=86=92=203?= =?UTF-8?q?.34.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/template-glib/-/compare/3.34.0...3.34.1 --- pkgs/development/libraries/template-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index c0ee2c1d350..375a7c3237a 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let - version = "3.34.0"; + version = "3.34.1"; pname = "template-glib"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1"; + sha256 = "nsm3HgTU9csU91XveQYxzQtFwGA+Ecg2/Hz9niaM0Ho="; }; buildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; From 5b6b29248a9f567d7221b69e35431c907c81143f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Mar 2022 23:24:02 +0000 Subject: [PATCH 265/382] =?UTF-8?q?xdg-desktop-portal-gnome:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/compare/42.rc...42.0.1 --- .../libraries/xdg-desktop-portal-gnome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index a98c11d8b77..6764df634bb 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "42.rc"; + version = "42.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NSQFoSKAQXsC21jy6Muq7xAtcmOdeXZAH8/ME01kw7U="; + sha256 = "3+i1JFDzKDj5+eiY6Vqo36JwXOEtQ4MFVXwSi5zg4uY="; }; nativeBuildInputs = [ From b214aa70b45a1f2e45d58f1833b1ccd62cedc248 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 18 Mar 2022 19:50:07 +0800 Subject: [PATCH 266/382] pantheon.evince: drop The vanilla evince already support dark style preference in Pantheon, so no need to keep the patch. --- .../services/x11/desktop-managers/pantheon.nix | 1 - pkgs/desktops/gnome/core/evince/default.nix | 17 +---------------- pkgs/desktops/pantheon/default.nix | 4 ++-- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 1a5cf32de7f..3528b0f40e7 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -220,7 +220,6 @@ in ] config.environment.pantheon.excludePackages); programs.evince.enable = mkDefault true; - programs.evince.package = pkgs.pantheon.evince; programs.file-roller.enable = mkDefault true; # Settings from elementary-default-settings diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index d9f5f7b6f7f..49781ac64da 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -32,7 +31,6 @@ , gsettings-desktop-schemas , gnome-desktop , dbus -, pantheon , python3 , texlive , gst_all_1 @@ -40,7 +38,6 @@ , supportMultimedia ? true # PDF multimedia , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps -, withPantheon ? false , withLibsecret ? true }: @@ -55,16 +52,6 @@ stdenv.mkDerivation rec { sha256 = "rGD/FKr1bWQ5lcO0um9XJcyc4k4nkIc7XIfttKIALUI="; }; - patches = lib.optionals withPantheon [ - # Make this respect dark mode settings from Pantheon - # https://github.com/elementary/evince/pull/21 - # https://github.com/elementary/evince/pull/31 - (fetchpatch { - url = "https://raw.githubusercontent.com/elementary/evince/c8364019ee2c2dffd2a1bccf79b8f4e526aa22af/dark-style.patch"; - sha256 = "sha256-nKELRXnM6gMRTGmWdO1Qqlo9ciy+4HOK5z2CYOoi2Lo="; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py @@ -115,9 +102,7 @@ stdenv.mkDerivation rec { gst-plugins-bad gst-plugins-ugly gst-libav - ]) ++ lib.optionals withPantheon [ - pantheon.granite - ]; + ]); mesonFlags = [ "-Dnautilus=false" diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 8e0de85cdaf..a3d5f873cbc 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -83,8 +83,6 @@ lib.makeScope pkgs.newScope (self: with self; { epiphany = pkgs.epiphany.override { withPantheon = true; }; - evince = pkgs.evince.override { withPantheon = true; }; - sideload = callPackage ./apps/sideload { }; #### DESKTOP @@ -240,6 +238,8 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21 + evince = pkgs.gnome.evince; # added 2022-03-18 + extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 file-roller = pkgs.gnome.file-roller; # added 2022-03-12 From 5a00ac1b084d9810e21dd6ce9762673ad3635b35 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 18 Mar 2022 20:19:55 +0800 Subject: [PATCH 267/382] pantheon.gnome-bluetooth-contract: mark as broken Sendto device selection is removed in gnome-bluetooth 42. I decide it is not worth to maintain a legacy gnome-bluetooth package for the contract. This should also be broken in elementary OS 7. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 - .../pantheon/desktop/gnome-bluetooth-contract/default.nix | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 3528b0f40e7..48e119a8618 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -302,7 +302,6 @@ in environment.systemPackages = with pkgs.pantheon; [ contractor file-roller-contract - gnome-bluetooth-contract ]; environment.pathsToLink = [ diff --git a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix index e1a25eea4a6..19051439209 100644 --- a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix +++ b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix @@ -49,5 +49,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = teams.pantheon.members; platforms = platforms.linux; + # sendto device selection is removed in gnome-bluetooth 42 + # https://github.com/elementary/gnome-bluetooth-contract/issues/1 + broken = true; }; } From 1aefc6d80199f35baca6c5b35b746f4aece4e8cd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 03:06:55 +0100 Subject: [PATCH 268/382] =?UTF-8?q?gnomeExtensions.gsconnect:=2048=20?= =?UTF-8?q?=E2=86=92=2050?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/GSConnect/gnome-shell-extension-gsconnect/releases/tag/v49 https://github.com/GSConnect/gnome-shell-extension-gsconnect/releases/tag/v50 --- pkgs/desktops/gnome/extensions/gsconnect/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 2d3d2415db2..31b3d67a302 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -19,15 +19,15 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-gsconnect"; - version = "48"; + version = "50"; outputs = [ "out" "installedTests" ]; src = fetchFromGitHub { - owner = "andyholmes"; + owner = "GSConnect"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "sha256-cKEFTF8DnQIQAXVW9NvE34mUqueQP/OtxTzMUy1dT5U="; + sha256 = "sha256-uUpdjBsVeS99AYDpGlXP9fMqGxWj+XfVubNoGJs76G0="; }; patches = [ @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "KDE Connect implementation for Gnome Shell"; - homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; + homepage = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; From 245a1b20d7252f7cf7d41f6b0eff11050df63c67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:09:57 +0000 Subject: [PATCH 269/382] =?UTF-8?q?evince:=2042.0=20=E2=86=92=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/42.0...42.1 --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 49781ac64da..18451ce239f 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rGD/FKr1bWQ5lcO0um9XJcyc4k4nkIc7XIfttKIALUI="; + sha256 = "skdnuz1RA7TjWw4VzwM9viSI+IcAzdiC0ipDre7C6Ao="; }; postPatch = '' From 914fd5031c8bfce3946155133e5d0798c9e9ee2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:10:07 +0000 Subject: [PATCH 270/382] =?UTF-8?q?gjs:=201.71.90=20=E2=86=92=201.72.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.71.90...1.72.0 --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index ad5aa39916d..42ba3bd46df 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.71.90"; + version = "1.72.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/g2pKtu4wiUkyWl79w650uW6JgNqTh4wZMNVq2xFUoU="; + sha256 = "sha256-PvDK9xbjkg3WH3dI9tVuR2zA/Bg1GtBUjn3xoKub3K0="; }; patches = [ From 73e9cb0ef2fd0ba18bc7d86cbf1023ac4d43bc19 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:10:20 +0000 Subject: [PATCH 271/382] =?UTF-8?q?gnome.eog:=2042.rc=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 3dd175cb5c8..08baf9022f7 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "42.rc"; + version = "42.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-X45iuwJD25dKmtJNUyX7RsEZtPnfTVvgbGyxbPA9PMk="; + sha256 = "sha256-+zW/tRZ6QhIfWae5t6wNdbvQUXua/W2Rgx6E01c13fg="; }; nativeBuildInputs = [ From ad2536cd9d8706d8c08bde22938ccf076c609437 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:10:26 +0000 Subject: [PATCH 272/382] =?UTF-8?q?gnome.gnome-applets:=203.43.1=20?= =?UTF-8?q?=E2=86=92=203.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-applets/-/compare/3.43.1...3.44.0 --- pkgs/desktops/gnome/misc/gnome-applets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix index 0fdd71aa599..a03b356c21f 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.43.1"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IGhOGuYP6LI1FLco1ugkmuv2zpifhNS8M0604rkI8wk="; + sha256 = "MDlifKknGeSAWH1yT0aXEJw9Em7BUPFPOy4Gkk2576c="; }; nativeBuildInputs = [ From d9409428425d0385769ad77dceceb4007c1d04ac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:10:32 +0000 Subject: [PATCH 273/382] =?UTF-8?q?gnome.gnome-calculator:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index b80c50f1b62..889155f19a6 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1quQqyiDQc/WQYAkmT5FdW8+es8CVSV2IH9q1R5qBlA="; + sha256 = "pTWhTr6ljmkaS1oIUlau0GCiw/BzhKw6PQGDIzKifko="; }; nativeBuildInputs = [ From 24f85a59d82488371484be690ec243958ca9eebe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:10:34 +0000 Subject: [PATCH 274/382] =?UTF-8?q?gnome.gnome-characters:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/apps/gnome-characters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 88ac1111352..b43e0cdecad 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "D1hb1baVNpmipafBsYpNmbRLeQKkkmIheKpdLDvAPGM="; + sha256 = "XaD/uBb4prRPMDdEyoJ6NAgBGMHJONjXmvF7f+Z5gPg="; }; nativeBuildInputs = [ From 0b1b922bfd899d79f555363306f253b9c17e9ffb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:10:36 +0000 Subject: [PATCH 275/382] =?UTF-8?q?gnome.gnome-clocks:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 662e21e5455..3c57c6272e8 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "gZriRRfuGnNe4w5ntHgp1x3b40eC1lyIPJxj0+xwW9g="; + sha256 = "DnEY20oDLjzqMhLZjLuCjWt88i/gXgxfyLORxqPdb+A="; }; nativeBuildInputs = [ From d389bfd7415cfe402d2bd0aeb034ddcf77ed0336 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:10:44 +0000 Subject: [PATCH 276/382] =?UTF-8?q?gnome.gnome-flashback:=203.43.1=20?= =?UTF-8?q?=E2=86=92=203.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-flashback/-/compare/3.43.1...3.44.0 --- pkgs/desktops/gnome/misc/gnome-flashback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 4001e60f113..34d2b6eea3c 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -30,7 +30,7 @@ }: let pname = "gnome-flashback"; - version = "3.43.1"; + version = "3.44.0"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "sha256-KNRVgfLXV/rrIgqIjlYbr23r9FdP4LQcNI3cmi2CBdM="; + sha256 = "sha256-HfCDgSfGJG7s2J0cUP+I/IKr9t47MGjlLd5JWkK9VQo="; }; # make .desktop Execs absolute From 2d61486510210781b4360547693a6a210b915565 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:10:50 +0000 Subject: [PATCH 277/382] =?UTF-8?q?gnome.gnome-maps:=2042.rc=20=E2=86=92?= =?UTF-8?q?=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index bd6269903b2..0efb5faa3c7 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-U/1nmsr83rpKv0oeH6GDY1hRYkYTnuA89pc9A+IwIRQ="; + sha256 = "sha256-BUSG03dAc3BqdqmBQXl40VG+O3Ik1yN3W74xbvoked8="; }; patches = [ From 12dbca9935106fc45f1b8ef7eed04b91ed0496e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:10:58 +0000 Subject: [PATCH 278/382] =?UTF-8?q?gnome.gnome-panel:=203.43.1=20=E2=86=92?= =?UTF-8?q?=203.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-panel/-/compare/3.43.1...3.44.0 --- pkgs/desktops/gnome/misc/gnome-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index fde2247fe94..139e161352a 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.43.1"; + version = "3.44.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-51SJ3QFyLahjDnSuLFkcKK/xpSooCG0pVUXLJ24b4nc="; + hash = "sha256-mWVfddAxh2wTDtI8TaIsCZ57zEBIsCVaPDo7vHh7Mao="; }; patches = [ From b2d2fcd8e48f228cc7a6b0f66eb6895ca9c6ca28 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:03 +0000 Subject: [PATCH 279/382] =?UTF-8?q?gnome.gnome-settings-daemon:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/42.rc...42.1 --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 7e4f92ca9fa..03698f865d6 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "42.rc"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "5vnAiV1YpeNu3Dlgo59pVtnbann0VyKogAFh/EzcMpM="; + sha256 = "7WWFGuVK3NWKJMhoN9Yk/GoUvYSrIulN9Ao6TP0Z/9s="; }; patches = [ From 6386a0fd382d5af31e1c35cc44b119717f396f9d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:06 +0000 Subject: [PATCH 280/382] =?UTF-8?q?gnome.gnome-sound-recorder:=2042.beta?= =?UTF-8?q?=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sound-recorder/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index d18992c1434..cd7259c3ae9 100644 --- a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wKXhOnuXryq4aZechRketErQ6l9Iqc56ORGnsKZVwpA="; + sha256 = "TAjDFSgvPr96LabyDg/58McdqlIp/NL+C1wKqqoG8K0="; }; nativeBuildInputs = [ From 5baffcdf7619d091c6c514d53afcb12f8e75f9f0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:07 +0000 Subject: [PATCH 281/382] =?UTF-8?q?gnome.gnome-system-monitor:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/gnome-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index d29ce337e33..5d24a23e411 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "CfScgbZZVvHW3ZnumpQRJkvzSPRRbIu6m6sLX/x8D0c="; + sha256 = "EyOdIgMiAaIr0pgzxXW2hIFnANLeFooVMCI1d8XAddw="; }; nativeBuildInputs = [ From 8422afe224bf4e0d2260081a3412199276e3d846 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:21 +0000 Subject: [PATCH 282/382] =?UTF-8?q?gnome.metacity:=203.43.1=20=E2=86=92=20?= =?UTF-8?q?3.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/metacity/-/compare/3.43.1...3.44.0 --- pkgs/desktops/gnome/misc/metacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index 943592f9052..ef3e31f1032 100644 --- a/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.43.1"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "TZIUpsEqvZEo9mXScswNU+H9GiTY9pmYVg16EQn1GGc="; + sha256 = "GcPF150hcfRbqg9jLMiZX4YHvxIxoWAUQ5usm6Flp8A="; }; patches = [ From 66b7d51d18f182fa23b4dc1f762ffd87857ef3bd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:22 +0000 Subject: [PATCH 283/382] =?UTF-8?q?gnome.nautilus:=2042.rc=20=E2=86=92=204?= =?UTF-8?q?2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 8618bb026eb..1814dc732ea 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "42.rc"; + version = "42.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "IA80O5kQQzao46aPN8Q9QP1K2a0wSl4fxZP43FE/r58="; + sha256 = "PJBPM7otKgeIkr7ir3FITNYIkjzXjsfooVF7whVRE9U="; }; patches = [ From e150d2f3e256c31297611e359ea23eb1dc346a1f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:33 +0000 Subject: [PATCH 284/382] =?UTF-8?q?gnome.tali:=2040.5=20=E2=86=92=2040.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tali/-/compare/40.5...40.6 --- pkgs/desktops/gnome/games/tali/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index 936fe62c259..c12853e5dae 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.5"; + version = "40.6"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Y6CcVeRqGhl1a/XglXyvmUMA+tq9umvaYC5mjfzfcSI="; + sha256 = "g/ugR+3s0ZbTBxmnDi9NCYa7Jswr1flVoKkgDqY/BhI="; }; nativeBuildInputs = [ From 0fa24ad74b50e3b59d21e8e45040db8f87760685 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:36 +0000 Subject: [PATCH 285/382] =?UTF-8?q?gnome.yelp:=2042.beta=20=E2=86=92=2042.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/yelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 2eea34ed3a4..3fdf7f3e546 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-cT187uTnI9ECP6Ox4HN4MUcZKRctNGhC/tBHFO6zkK8="; + sha256 = "sha256-IIglVqnF29MHWTAkXnA3HGusMOqnpe0Jx9sSfNogE/c="; }; nativeBuildInputs = [ From a1cabaf9dee10153fd91ab738f07b409184e11ed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:37 +0000 Subject: [PATCH 286/382] =?UTF-8?q?gnome.yelp-xsl:=2042.beta=20=E2=86=92?= =?UTF-8?q?=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp-xsl/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/yelp-xsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix index ab4a0959ff8..3398e8ddd57 100644 --- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-yhd6HPx+NhYfr8gVYJcuQiA6o+hgbfWXlL8D7ez3Vsw="; + sha256 = "sha256-KbJzzAvRbvtumDRDgD8en9wDUR5cT/Y0j9MKYE1NyEY="; }; nativeBuildInputs = [ From c1c386b761901ed47fba0199dad94f85b752b434 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:48 +0000 Subject: [PATCH 287/382] =?UTF-8?q?gnome-text-editor:=2042.rc1=20=E2=86=92?= =?UTF-8?q?=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/42.rc1...42.0 --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 45945e11e17..ac065aaaec7 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "42.rc1"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-JLCQMFIPb3QzPy5qoNmN1P36lBx8QsXk4rW80j15Mmo="; + sha256 = "sha256-DjIUDuHBNChWO81feE5h7iL/0a0n2MAig7Q1ioHfq1A="; }; nativeBuildInputs = [ From 31a318d325592e5c69be0c97ec9809256e497a88 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:48 +0000 Subject: [PATCH 288/382] =?UTF-8?q?gnome-photos:=2040.0=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-photos/-/compare/40.0...42.0 --- pkgs/applications/graphics/gnome-photos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 9dc318a0674..774e377ca03 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "40.0"; + version = "42.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0"; + sha256 = "JcsoFCUZnex7BF8T8y+PlgNMsMuLlNlvnf+vT1vmhVE="; }; patches = [ From 8e4ab2ff1eb0dfa46798293127986064bb2e34a6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:51 +0000 Subject: [PATCH 289/382] =?UTF-8?q?gnome-tour:=2042.beta=20=E2=86=92=2042.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-tour/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/gnome-tour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index 633ad5b9385..cbb33c2b230 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-c8NnZvWcqnnYXKuooveqaize81fBT6JZHgXck7Fbx+I="; + hash = "sha256-/PGsaJBX2oZZaXDsPag1VSHApy6VBj6wWdX+5N6oL08="; }; cargoVendorDir = "vendor"; From 6deb13afdc859c4c251580b152a36f882c9808dc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:11:54 +0000 Subject: [PATCH 290/382] =?UTF-8?q?gnome-user-docs:=2041.2=20=E2=86=92=204?= =?UTF-8?q?2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/41.2...42.0 --- pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 23dfd975bf7..db177006a3d 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "41.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0xcIld06i7EXyfFIoLs/tJDRr3ExxEFod7G7/sWROVo="; + sha256 = "srJ9oEEAu90vTw5bw48tBW2V+jZWcgFj9kNqMWfV6QU="; }; nativeBuildInputs = [ From 004ea1200f6b508b1a5aab04d0ad143e232d58c6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:12:04 +0000 Subject: [PATCH 291/382] =?UTF-8?q?gsettings-desktop-schemas:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/compare/42.rc...42.0 --- .../libraries/gsettings-desktop-schemas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 63c700fe75e..085544a3612 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "4tGRELuUWySHLBG/TIDv0ZE29eWrIqk1jvBA30Z3aAk="; + sha256 = "ZoYzWp7WI/euInb++lCkENTnHUIxiAgkcUBwyzFzI9I="; }; strictDeps = true; From d2f46a0e67b9e97782b40e065b7536fd74cc3377 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:12:14 +0000 Subject: [PATCH 292/382] =?UTF-8?q?gtk4:=204.6.1=20=E2=86=92=204.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.6.1...4.6.2 --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 1f61793de5b..db682d99dca 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.1"; + version = "4.6.2"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "2FUI0hy7zWPVaKeGKvXs1juXjX1XmcvkBMkdI4nQ7F8="; + sha256 = "/yY69gmlDrdgVmU1ktkpRZrvSBmkRMQ29tUsb2PB+uw="; }; nativeBuildInputs = [ From 0080317d866e6c090ca1f33d2cfbd50885c07577 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:12:15 +0000 Subject: [PATCH 293/382] =?UTF-8?q?gtksourceview4:=204.8.2=20=E2=86=92=204?= =?UTF-8?q?.8.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/4.8.2...4.8.3 --- pkgs/development/libraries/gtksourceview/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 0095b6ca9e0..74acd6f743d 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.8.2"; + version = "4.8.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1k1pava84ywgq62xl5bz8y3zm7z2kz6kkgp423c0y02jrgjyfbc4"; + sha256 = "wwAZUGMgyiR02DTM7R4iF+pTPgDrKj9Ot4eQB5QOxoI="; }; patches = [ From 70c0a6915f1233180bc06326f94bb458a9b67e23 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:12:16 +0000 Subject: [PATCH 294/382] =?UTF-8?q?gtksourceview5:=205.3.2=20=E2=86=92=205?= =?UTF-8?q?.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.3.2...5.4.0 --- pkgs/development/libraries/gtksourceview/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 411f9c24700..81c0abd61b6 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.3.2"; + version = "5.4.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "r3c24u4828EBMJDoyvNfuJ1lz0HJw5nKxdiZLZVd7TA="; + sha256 = "ADvCF+ZwqOyKo67OmUtw5wt9a4B0k4rdohcYVV2E5jc="; }; patches = [ From 705068d5e32b9301b40ef9fab38c5b3178ad9cfb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:12:47 +0000 Subject: [PATCH 295/382] =?UTF-8?q?libpeas:=201.30.0=20=E2=86=92=201.32.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpeas/-/compare/1.30.0...1.32.0 --- .../development/libraries/libpeas/default.nix | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 55c884d215f..97b1823272b 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,20 +1,45 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome -, glib, gtk3, gobject-introspection, python3, ncurses +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, gnome +, glib +, gtk3 +, gobject-introspection +, python3 +, ncurses }: stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.30.0"; + version = "1.32.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18xrk1c1ixlhkmykcfiafrl2am470ws687xqvjlq40zwkcp5dx8b"; + sha256 = "1iVSD6AuiXcCmyRq5Dm8IYloll8egtYSIItxPx3MPQ4="; }; - nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ]; - buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + gobject-introspection + ]; + + buildInputs = [ + glib + gtk3 + ncurses + python3 + python3.pkgs.pygobject3 + ]; + propagatedBuildInputs = [ # Required by libpeas-1.0.pc gobject-introspection From c82f942efcd486f6f838dec7a467c3ef55ce4392 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 06:51:49 +0100 Subject: [PATCH 296/382] libpeas: build developer docs --- pkgs/development/libraries/libpeas/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 97b1823272b..712592431ab 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , gettext +, gi-docgen , gnome , glib , gtk3 @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libpeas"; version = "1.32.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { meson ninja gettext + gi-docgen gobject-introspection ]; @@ -45,6 +47,15 @@ stdenv.mkDerivation rec { gobject-introspection ]; + mesonFlags = [ + "-Dgtk_doc=true" + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From acc8f309630eaa5b8fec52e3060677bd413b512c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:13:05 +0000 Subject: [PATCH 297/382] =?UTF-8?q?pango:=201.50.5=20=E2=86=92=201.50.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pango/-/compare/1.50.5...1.50.6 --- pkgs/development/libraries/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 5a5e2e1d4f9..ee79d537059 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.5"; + version = "1.50.6"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bRNoctpiB/6Ixc0slcNryvTtKUArhUZjqGzX7+mbDPU="; + sha256 = "qZi882iBw6wgSV1AvOswT06qkXW9KWfIVlZDTL2v6Go="; }; strictDeps = !withIntrospection; From a1c0f79f27df4582dfee8b7aed52b452725730df Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:13:18 +0000 Subject: [PATCH 298/382] =?UTF-8?q?tracker:=203.3.0.rc=20=E2=86=92=203.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.3.0.rc...3.3.0 --- pkgs/development/libraries/tracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 02903258b00..5cb3dc73daa 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.3.0.rc"; + version = "3.3.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J4ypi46GGYxYpwBfzEqVHvP7w18zdbIUo5l1D1KI5ig="; + sha256 = "Bwb5b+f5XfQqzsgSwd57RZOg1kgyHKg1BqnXHiJBe9o="; }; nativeBuildInputs = [ From 49d506498eb699e44049adc0f21876c6a73cefac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:13:19 +0000 Subject: [PATCH 299/382] =?UTF-8?q?tracker-miners:=203.3.0.rc=20=E2=86=92?= =?UTF-8?q?=203.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker-miners/-/compare/3.3.0.rc...3.3.0 --- pkgs/development/libraries/tracker-miners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index e1c3569bd06..7c3e495d54a 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.3.0.rc"; + version = "3.3.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dr861BhgwrhICNLuWfe6a4CjrQylvE1H0tav0sn+lwY="; + sha256 = "izh967d0BhwGrfsmeg4ODz0heZNxvwHQVklaubjdlBc="; }; nativeBuildInputs = [ From 8f059fbd3d62e3251dd74f6ee44ae7d092f6f1ee Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:13:20 +0000 Subject: [PATCH 300/382] =?UTF-8?q?vala:=200.54.7=20=E2=86=92=200.54.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/-/compare/0.54.7...0.54.8 --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 0aaa5e5ce3c..2cba11a7be1 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -95,8 +95,8 @@ in rec { }; vala_0_54 = generic { - version = "0.54.7"; - sha256 = "Ygecof8C5dF65yqppa3GGuav3P67DZ8GBjo2776soMc="; + version = "0.54.8"; + sha256 = "7fs+eUhqS/SM666pKR5X/HfakyK2lh6VSd9tlz0EvIA="; }; vala_0_56 = generic { From 9e4194bd5ede9c3671bb1477361607986a81d8ec Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 02:13:26 +0000 Subject: [PATCH 301/382] =?UTF-8?q?yelp-tools:=2042.beta=20=E2=86=92=2042.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp-tools/-/compare/42.beta...42.0 --- pkgs/development/misc/yelp-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index e78c73c4168..a58891bc333 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "42.beta"; + version = "42.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dJkLKTKhUOHsKN6QLiZGqli6VlCu18l51orichtpOtk="; + sha256 = "LNQwY/+nJi3xXdjTeao+o5mdQmYfB1Y/SALaoRSfffQ="; }; nativeBuildInputs = [ From 27d52bf401dffdd81ac44d2be1188d687186e67d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 07:35:53 +0100 Subject: [PATCH 302/382] =?UTF-8?q?libgweather:=203.91.0=20=E2=86=92=204.0?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgweather/-/tags/3.99.0 https://gitlab.gnome.org/GNOME/libgweather/-/tags/4.0.0 --- pkgs/development/libraries/libgweather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index f8ac8da7fc4..e4a527ba485 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.91.0"; + version = "4.0.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "cls+s0/G0h7cgLbmhHKLMIix+hRPCipNPpYFx6jz3Pg="; + sha256 = "RA1EgBtvcrSMZ25eN/kQnP7hOU/XTMknJeGxuk+ug0w="; }; patches = [ From a0d22d2ada9040f9217304785a25cd25ccfddf4b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 06:12:03 +0100 Subject: [PATCH 303/382] =?UTF-8?q?gnome.gpaste:=203.42.6=20=E2=86=92=2042?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.imagination-land.org/posts/2022-03-19-gpaste-42.0-released.html --- pkgs/desktops/gnome/misc/gpaste/default.nix | 13 ++++++++---- .../gnome/misc/gpaste/fix-paths.patch | 20 ++++++++++++------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index f593fbbd653..1a6abacad7d 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , fetchpatch , appstream-glib @@ -7,6 +8,8 @@ , glib , gobject-introspection , gtk3 +, gtk4 +, libadwaita , meson , mutter , ninja @@ -17,14 +20,14 @@ }: stdenv.mkDerivation rec { - version = "3.42.6"; + version = "42.0"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-dCeNWdHj3bBGJR1VpJtQjSn601Vdl3f9FjHAPB2wuhE="; + sha256 = "sha256-dwL06BL6P8fqvAfrYpifqMAh6d+3Er6RhUeP6nfCr1M="; }; patches = [ @@ -38,7 +41,7 @@ stdenv.mkDerivation rec { --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" substituteInPlace src/gnome-shell/prefs.js \ --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" - substituteInPlace src/libgpaste/settings/gpaste-settings.c \ + substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \ --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"} ''; @@ -57,6 +60,8 @@ stdenv.mkDerivation rec { gjs glib gtk3 + gtk4 + libadwaita mutter pango ]; diff --git a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch index 46e30ce2e2c..2ec807b61c0 100644 --- a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch +++ b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch @@ -1,3 +1,5 @@ +diff --git a/src/gnome-shell/extension.js b/src/gnome-shell/extension.js +index c8773fd6..9efbed67 100644 --- a/src/gnome-shell/extension.js +++ b/src/gnome-shell/extension.js @@ -6,6 +6,8 @@ @@ -8,21 +10,25 @@ + imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; imports.gi.versions.GLib = '2.0'; - imports.gi.versions.GPaste = '1.0'; + imports.gi.versions.GPaste = '2'; +diff --git a/src/gnome-shell/prefs.js b/src/gnome-shell/prefs.js +index 32244ab2..74b85572 100644 --- a/src/gnome-shell/prefs.js +++ b/src/gnome-shell/prefs.js @@ -6,6 +6,8 @@ - const Gettext = imports.gettext; + imports.gi.versions.GPasteGtk = '4'; +imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); + - //const { GPaste } = imports.gi; - const ExtensionUtils = imports.misc.extensionUtils; ---- a/src/libgpaste/settings/gpaste-settings.c -+++ b/src/libgpaste/settings/gpaste-settings.c -@@ -1013,7 +1013,11 @@ + + const { GPasteGtk } = imports.gi; +diff --git a/src/libgpaste/gpaste/gpaste-settings.c b/src/libgpaste/gpaste/gpaste-settings.c +index 7e53eb64..57c399fc 100644 +--- a/src/libgpaste/gpaste/gpaste-settings.c ++++ b/src/libgpaste/gpaste/gpaste-settings.c +@@ -1013,7 +1013,11 @@ create_g_settings (void) } else { From 49e154ce0bf6c95d8832879719428bb8addb0bf1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 19:53:18 +0000 Subject: [PATCH 304/382] =?UTF-8?q?gnome.file-roller:=203.41.90=20?= =?UTF-8?q?=E2=86=92=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/file-roller/-/compare/3.41.90...3.42.0 --- pkgs/desktops/gnome/apps/file-roller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index 982309e68b3..df8e9548c35 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.41.90"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Bi5rSO1re8o9ONAoY9apsBP0zNNbpvvjXFaYeQDf7Ok="; + sha256 = "HEOObVPsEP9PLrWyLXu/KKfCqElXq2SnUcHN88UjAsc="; }; LANG = "en_US.UTF-8"; # postinstall.py From 5d74b9a1b83f020de7e01d1af3d73f7081c7af87 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 Mar 2022 19:54:34 +0000 Subject: [PATCH 305/382] =?UTF-8?q?gnome-desktop:=2042.rc=20=E2=86=92=2042?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/42.rc...42.0 --- pkgs/development/libraries/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index c2035c13f9f..5d682e23b27 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.rc"; + version = "42.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kdy9LCCNNggD2AIlJuDO9Q66Y88b8iq0oFYmlLNBUeQ="; + sha256 = "sha256-88qik6Xob2zK0Y+BcnPbHGcGHmgNedg5qop1KOW7JtY="; }; patches = [ From 38d1e91f9013ae81a8bcb9c67ff8bde21ba0e39e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 10:11:27 +0000 Subject: [PATCH 306/382] =?UTF-8?q?vala=5F0=5F56:=200.55.91=20=E2=86=92=20?= =?UTF-8?q?0.56.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/-/compare/0.55.91...0.56.0 --- pkgs/development/compilers/vala/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 2cba11a7be1..230f6ee19a2 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -20,7 +20,7 @@ let "0.54" = ./disable-graphviz-0.46.1.patch; - "0.55" = ./disable-graphviz-0.46.1.patch; + "0.56" = ./disable-graphviz-0.46.1.patch; }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); @@ -100,8 +100,8 @@ in rec { }; vala_0_56 = generic { - version = "0.55.91"; - sha256 = "qdaV/hImno3MNy4FPc9m1p8CkNNO6LgjKAmBa7hiJ7s="; + version = "0.56.0"; + sha256 = "2SvRPFYwkF7rapg9y3AiBNqXMUYMKm5OOfhnmW83EEA="; }; vala = vala_0_54; From dcd3431bc94d9beb5f40c0b286a2006f74a4eb9c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 10:14:00 +0000 Subject: [PATCH 307/382] =?UTF-8?q?baobab:=2042.rc=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/baobab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 1e62dfe2047..7c463e8ed28 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZUGjFQBG8fcIcYOWKBt2qpmzNqIcynCe/xPGk1klJDU="; + sha256 = "Sxqr5rqxWCs/6nmigpvOfyQVu25QYvJTV67t1TF6UNw="; }; nativeBuildInputs = [ From 97763f8b06720c1487f542682e68e6f126bba034 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 10:14:55 +0000 Subject: [PATCH 308/382] =?UTF-8?q?gnome.gnome-font-viewer:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/gnome-font-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index b7c63f86624..397f0b9838f 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wTU34a+CZ+Ppnzk1WyiiK69krS/aWgGqpx3kaqeJb+g="; + sha256 = "z6K43/8hoQWhoCHa36IT8TYn5qF5p3x7Wf3O2sqEjcw="; }; doCheck = true; From 1f3e12ea10da54bef15d6d403903635effe8e5a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 10:15:02 +0000 Subject: [PATCH 309/382] =?UTF-8?q?gnome.gnome-music:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-music/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index bad7091b6c7..4676710bfc6 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "42.beta"; + version = "42.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NABOz5+LNH2wA/LfDTs4MaiWj0sJJjxTWsSYPebzBNU="; + sha256 = "nWgZj5hSveD4NFhLlqgSiX0xDLcXKLak8Ji8spsZxdA="; }; nativeBuildInputs = [ From d80b089680f71c8da89a223bc59457a1c4cd9984 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 10:15:09 +0000 Subject: [PATCH 310/382] =?UTF-8?q?gnome.gnome-remote-desktop:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 05604066dbb..61252d60814 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-B1qcSM/cVJ7BO8POKbC1FgLWh+LaJix6icUullE9YmI="; + hash = "sha256-s9wrt1x4Pe2quWqNu6wW3ZqhOebTooo9s+pAxgRluY8="; }; nativeBuildInputs = [ From 3ecef34ed099ce9ec0d72e3ae40f39c10440a548 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 10:15:23 +0000 Subject: [PATCH 311/382] =?UTF-8?q?gnome.gnome-weather:=2042.rc=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/42.rc...42.0 --- pkgs/desktops/gnome/apps/gnome-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index c954dc0b7c3..b7921322d99 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "42.rc"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JnI+WkAKMi9dLlehIVajrHqMA3Qo6vWgDZZTQ+rDxoQ="; + sha256 = "V57mkdhT5bs/9Q6Me0P4Wundfls6ZJ4CwlSi2bgHtGU="; }; nativeBuildInputs = [ From fb4b0c019f42b46520da0bb5a3bb333c3671879c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 10:15:39 +0000 Subject: [PATCH 312/382] =?UTF-8?q?gnome.polari:=2041.0=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/polari/-/compare/41.0...42.0 - Now uses libadwaita. - Format the expression. - Remove unnecessary icon theme dependency. - Add comments to thumbnailer deps. - Correct license. --- pkgs/desktops/gnome/apps/polari/default.nix | 71 +++++++++++++++++---- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix index f207307588a..c734a5c5c82 100644 --- a/pkgs/desktops/gnome/apps/polari/default.nix +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -1,15 +1,40 @@ -{ lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme -, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils -, pkg-config, gtk4, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib -, gnome, wrapGAppsHook4, telepathy-logger, gspell, gsettings-desktop-schemas }: +{ stdenv +, lib +, itstool +, fetchurl +, gdk-pixbuf +, telepathy-glib +, gjs +, meson +, ninja +, gettext +, telepathy-idle +, libxml2 +, desktop-file-utils +, pkg-config +, gtk4 +, libadwaita +, gtk3 +, glib +, libsecret +, libsoup +, webkitgtk +, gobject-introspection +, appstream-glib +, gnome +, wrapGAppsHook4 +, telepathy-logger +, gspell +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "polari"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "o7BfgWYDcMZ8lCtvRLKYx7eIFv6zjJJuwiEr3iLqQOs="; + sha256 = "WPFbv1tCwLASPv3td1cR07DyRJl1cwlAOMpVZGHgSTw="; }; patches = [ @@ -19,16 +44,38 @@ stdenv.mkDerivation rec { ./make-thumbnailer-wrappable.patch ]; - propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; + propagatedUserEnvPkgs = [ + telepathy-idle + telepathy-logger + ]; nativeBuildInputs = [ - meson ninja pkg-config itstool gettext wrapGAppsHook4 libxml2 - desktop-file-utils gobject-introspection appstream-glib + meson + ninja + pkg-config + itstool + gettext + wrapGAppsHook4 + libxml2 + desktop-file-utils + gobject-introspection + appstream-glib ]; buildInputs = [ - gtk4 gtk3 glib adwaita-icon-theme gsettings-desktop-schemas - telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk + gtk4 + libadwaita + gtk3 # for thumbnailer + glib + gsettings-desktop-schemas + telepathy-glib + telepathy-logger + gjs + gspell + gdk-pixbuf + libsecret + libsoup + webkitgtk # for thumbnailer ]; postFixup = '' @@ -46,7 +93,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Polari"; description = "IRC chat client designed to integrate with the GNOME desktop"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From b9f71fe5d3eae72ce07f2c3dca3debeaea7a5f9a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 10:16:41 +0000 Subject: [PATCH 313/382] =?UTF-8?q?libgsf:=201.14.48=20=E2=86=92=201.14.49?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgsf/-/compare/LIBGSF_1_14_48...LIBGSF_1_14_49 Also format the expression. --- pkgs/development/libraries/libgsf/default.nix | 71 ++++++++++++++----- 1 file changed, 52 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 1850da7e646..8bc2dc76160 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,26 +1,59 @@ -{ fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 -, perl, gdk-pixbuf, libiconv, libintl, gnome }: +{ fetchurl +, lib +, stdenv +, pkg-config +, intltool +, gettext +, glib +, libxml2 +, zlib +, bzip2 +, perl +, gdk-pixbuf +, libiconv +, libintl +, gnome +}: stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.48"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/4bX8dRt0Ovvt72DCnSkHbZDYrmHv4hT//arTBEyuDc="; - }; - - nativeBuildInputs = [ pkg-config intltool libintl ]; - - buildInputs = [ gettext bzip2 zlib ]; - checkInputs = [ perl ]; - - propagatedBuildInputs = [ libxml2 glib gdk-pixbuf libiconv ]; + version = "1.14.49"; outputs = [ "out" "dev" ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "6evjZojwEMnm5AyJA/NzKUjeuKygMleNB9B1G9gs+Fc="; + }; + + nativeBuildInputs = [ + pkg-config + intltool + libintl + ]; + + buildInputs = [ + gettext + bzip2 + zlib + ]; + + checkInputs = [ + perl + ]; + + propagatedBuildInputs = [ + libxml2 + glib + gdk-pixbuf + libiconv + ]; + doCheck = true; - preCheck = "patchShebangs ./tests/"; + + preCheck = '' + patchShebangs ./tests/ + ''; passthru = { updateScript = gnome.updateScript { @@ -31,10 +64,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME's Structured File Library"; - homepage = "https://www.gnome.org/projects/libgsf"; - license = licenses.lgpl2Plus; + homepage = "https://www.gnome.org/projects/libgsf"; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix; longDescription = '' Libgsf aims to provide an efficient extensible I/O abstraction for From b11117dd8633a3e59e8f377e710676a0ce3e3193 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 19:54:02 +0100 Subject: [PATCH 314/382] =?UTF-8?q?gnomeExtensions.gsconnect:=2050=20?= =?UTF-8?q?=E2=86=92=2053?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/GSConnect/gnome-shell-extension-gsconnect/releases/tag/v51 https://github.com/GSConnect/gnome-shell-extension-gsconnect/releases/tag/v53 --- pkgs/desktops/gnome/extensions/gsconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 31b3d67a302..0b72d35bda7 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-gsconnect"; - version = "50"; + version = "53"; outputs = [ "out" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "GSConnect"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "sha256-uUpdjBsVeS99AYDpGlXP9fMqGxWj+XfVubNoGJs76G0="; + sha256 = "sha256-u14OVv3iyQbLEmqLgMdEUD2iC4nsYVCOr4ua66T3TBk="; }; patches = [ From 8d24f4a6c851d18858de4ef8ecb9db355eee7960 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 18:56:05 +0000 Subject: [PATCH 315/382] =?UTF-8?q?gnome.adwaita-icon-theme:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 830c25efa5f..b3c9e1ea62a 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lAk3ccnZPNh+5rQaNkoH99eRGNXZzpwGATBWJ3scCAU="; + sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA="; }; # For convenience, we can specify adwaita-icon-theme only in packages From cd1d12ca656a5cca5e19f0723dea6d67d68b7eaa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 18:56:19 +0000 Subject: [PATCH 316/382] =?UTF-8?q?gnome.gdm:=2041.3=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdm/-/compare/41.3...42.0 --- pkgs/desktops/gnome/core/gdm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index 6b51d11adfe..990f1bef211 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -19,6 +19,7 @@ , gtk3 , libcanberra-gtk3 , pam +, libgudev , libselinux , keyutils , audit @@ -43,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "41.3"; + version = "42.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "uwtlCnzqkPCaMyhPvQKXUxVAfvwY6BQAmFLRvK00N9Q="; + sha256 = "oyisl2k3vsF5lx/weCmhJGuYznJBgcEorjKguketOFU="; }; mesonFlags = [ @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { keyutils libX11 libcanberra-gtk3 + libgudev libselinux pam plymouth From 8a91a19d5e45385702fdf5a73660393aa919e862 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 18:56:29 +0000 Subject: [PATCH 317/382] =?UTF-8?q?gnome.gnome-backgrounds:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/42.beta...42.0 - Format the expression - Remove unused dependencies - Add meta.{description,homepage,license} --- .../gnome/core/gnome-backgrounds/default.nix | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index c2cfaa630b6..ba70570b1f8 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gettext }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, gnome +}: stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "jbnaBtzxXiduvbiarUPzk9AKahd8MYj+XQuLXnrhX6U="; - }; - - passthru = { - updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; }; + sha256 = "TH/hoJ9FnF93GJpZglJPzgXYiJRJVdZ5kQ8jRgbBKV0="; }; patches = [ @@ -20,9 +22,22 @@ stdenv.mkDerivation rec { ./stable-dir.patch ]; - nativeBuildInputs = [ meson ninja pkg-config gettext ]; + nativeBuildInputs = [ + meson + ninja + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-backgrounds"; + attrPath = "gnome.gnome-backgrounds"; + }; + }; meta = with lib; { + description = "Default wallpaper set for GNOME"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-backgrounds"; + license = licenses.cc-by-sa-30; platforms = platforms.unix; maintainers = teams.gnome.members; }; From e182fe066586913382f389c9ed89a29297e0c26c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 18:57:31 +0000 Subject: [PATCH 318/382] =?UTF-8?q?gnome-connections:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/connections/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/apps/gnome-connections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 7aec60e9deb..b8517a833b0 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-uELyHD1XcwrP+7XPmVk5pZWVjg03PC9fe2tQ5C0z1gk="; + hash = "sha256-L3s5u0OPS2oM3Jn2JjGpXbI+W7JC7Gg5pMlQKchwJO0="; }; nativeBuildInputs = [ From 2a3f38f305a4f356b0ec9796374bcc5244b6f232 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 18:58:00 +0000 Subject: [PATCH 319/382] =?UTF-8?q?gthumb:=203.12.0=20=E2=86=92=203.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gthumb/-/compare/3.12.0...3.12.1 --- pkgs/applications/graphics/gthumb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index d412c6fded8..e680554a711 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.12.0"; + version = "3.12.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Pe/8AwOE5ktXNhxDfHm0ga4Uie9EyHroVugbsQ2OOD8="; + sha256 = "sha256-ZDBmOgAHBpbGgeXru4AQc/1GpG1oEsKeL5pPgRr6Gfw="; }; nativeBuildInputs = [ From d0af33ab0fa907d0d30efcfb41096bce0154280a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 18:58:03 +0000 Subject: [PATCH 320/382] =?UTF-8?q?gtkmm4:=204.6.0=20=E2=86=92=204.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtkmm/-/compare/4.6.0...4.6.1 --- pkgs/development/libraries/gtkmm/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 1960a04e95f..c91e7b54ff2 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.6.0"; + version = "4.6.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "E1OgkJPLVx71rAXZPSALrxMq1gS19JQHd2VuFQWBTB8="; + sha256 = "DV7+yp7GT91TC7gibGMQrJlUmz3ZYE1uNnY5eRrz0eA="; }; nativeBuildInputs = [ From d9a7352912a7b2601e4639b47fbd543de5d076df Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Mar 2022 06:58:56 +0000 Subject: [PATCH 321/382] =?UTF-8?q?gnome.gnome-session:=2041.3=20=E2=86=92?= =?UTF-8?q?=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-session/-/compare/41.3...42.0 --- pkgs/desktops/gnome/core/gnome-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 3c6903b2b01..43bf56eb1fc 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "41.3"; + version = "42.0"; outputs = [ "out" "sessions" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "7koikFP1ImJAVIiWCTNbiFKHz2e73g3J/YgrAeybWzk="; + sha256 = "PMoGBTq2gpJpIJUafalfjMbXLadMaCxG0KBlMzKWnKo="; }; patches = [ From 548f950b3c89c085843114020c0dc1ed85cbc19c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Mar 2022 08:14:35 +0100 Subject: [PATCH 322/382] =?UTF-8?q?gnome.gnome-session-ctl:=2041.3=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/nix-community/gnome-session-ctl/releases/tag/42.0 --- pkgs/desktops/gnome/core/gnome-session/ctl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-session/ctl.nix b/pkgs/desktops/gnome/core/gnome-session/ctl.nix index 7ee9e156e5b..09fc80bf9ef 100644 --- a/pkgs/desktops/gnome/core/gnome-session/ctl.nix +++ b/pkgs/desktops/gnome/core/gnome-session/ctl.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-session-ctl"; - version = "41.3"; + version = "42.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = version; - hash = "sha256-aC0tkTf2lgCRlcbFj1FEOVBm3YUuP+8Yz98W3ZjUydg="; + hash = "sha256-XGJVmlxqbJ/1frbzn2TI7BJm449xeLk43xMMqFsLYko="; }; nativeBuildInputs = [ From 053ecedfe0b6b7dcbeb9d60dfb74e8741987bc2b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Mar 2022 08:39:30 +0100 Subject: [PATCH 323/382] gjs.tests: fix warning The tests complained: /nix/store/nm3nf5y4hzgmy00lw5s6ls68j38y84y0-gjs-1.72.0-installedTests/libexec/installed-tests/gjs/scripts/testCommandLineModules.sh: line 90: gjs-console: command not found But they still passed. --- nixos/tests/installed-tests/gjs.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/tests/installed-tests/gjs.nix b/nixos/tests/installed-tests/gjs.nix index 1656e9de171..d12487cba24 100644 --- a/nixos/tests/installed-tests/gjs.nix +++ b/nixos/tests/installed-tests/gjs.nix @@ -3,4 +3,10 @@ makeInstalledTest { tested = pkgs.gjs; withX11 = true; + + testConfig = { + environment.systemPackages = [ + pkgs.gjs + ]; + }; } From 6cc62a8bc011faa61fe317a7aa3df69e7a598b8e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Mar 2022 13:27:39 +0000 Subject: [PATCH 324/382] =?UTF-8?q?networkmanagerapplet:=201.24.0=20?= =?UTF-8?q?=E2=86=92=201.26.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/network-manager-applet/-/compare/1.24.0...1.26.0 --- pkgs/tools/networking/networkmanager/applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index fbb56f4c5c9..cca96577ad4 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ufS8pdA1Jxjge3OF+xlam7yP1oa3lZt0E3hU1SqrnFg="; + sha256 = "sha256-aWEbKQZK29Vzlf4+Uanr3h6nlGFfd2kARTorvj2M3f0="; }; mesonFlags = [ From 87d18174d317e78fdfd9ab1fd35b685deb812aa8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Mar 2022 15:42:00 +0100 Subject: [PATCH 325/382] nixos/gdm: fix accessibility menu icon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GNOME Shell 42 switched an icon for the accessibility menu in the top panel to one from gnome-control-center instead of a legacy one from adwaita-icon-theme: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2155 Let’s add that dependency to the systemd unit since installing it through `environment.systemPackages` is not enough due to environment isolation. --- nixos/modules/services/x11/display-managers/gdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index b1dc6643be8..70ae6b8978d 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -141,7 +141,7 @@ in GDM_X_SERVER_EXTRA_ARGS = toString (filter (arg: arg != "-terminate") cfg.xserverArgs); # GDM is needed for gnome-login.session - XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share"; + XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share:${pkgs.gnome.gnome-control-center}/share"; } // optionalAttrs (xSessionWrapper != null) { # Make GDM use this wrapper before running the session, which runs the # configured setupCommands. This relies on a patched GDM which supports From 8be53bf3d96aaf716198211646f99c49da8f7e4d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Mar 2022 17:26:39 +0000 Subject: [PATCH 326/382] =?UTF-8?q?gnome.gnome-contacts:=2042.beta=20?= =?UTF-8?q?=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/42.beta...42.0 --- pkgs/desktops/gnome/core/gnome-contacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 23168183492..fac22f0b578 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "u5w8kWr4XmXzc90JAZnHeo2Uua+dlPZtt6sqEt4E/Z0="; + sha256 = "iALDj9wj9SjawSj1O9zx9sow4OHGhIxCzWyEpeIsUhY="; }; propagatedUserEnvPkgs = [ From 3b052a0f6114fbf0641dd1f6054aaa5ce32c1484 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Mar 2022 17:28:50 +0000 Subject: [PATCH 327/382] =?UTF-8?q?orca:=2042.rc=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_42_RC...ORCA_42_0 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 559b0ecf8e9..63923188db7 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.rc"; + version = "42.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "LKaKC90G4N1TGsxeGUHvwyQUbzxa0l9esjJt4b8SMo8="; + sha256 = "LCUXmrQbJgsY8f+Jm+uv5olDi0nf/SEd78l2olCT9zo="; }; patches = [ From d30f68d0b8b191cb5d699f701a60dba526d0f706 Mon Sep 17 00:00:00 2001 From: piegames Date: Tue, 22 Mar 2022 18:53:16 +0100 Subject: [PATCH 328/382] =?UTF-8?q?gnomeExtensions:=2041=20=E2=86=92=2042?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/extensions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 39a1e00be14..f4077cac5b2 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -60,7 +60,7 @@ in rec { gnome41Extensions = mapUuidNames (produceExtensionsList "41"); gnome42Extensions = mapUuidNames (produceExtensionsList "42"); - gnomeExtensions = lib.trivial.pipe (gnome40Extensions // gnome41Extensions) [ + gnomeExtensions = lib.trivial.pipe (gnome41Extensions // gnome42Extensions) [ # Apply some custom patches for automatically packaged extensions (callPackage ./extensionOverrides.nix {}) # Add all manually packaged extensions From d81828f4aa27eb3b1650fffcdbec76c1a8b2c540 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 23 Mar 2022 08:16:31 +0000 Subject: [PATCH 329/382] =?UTF-8?q?glib-networking:=202.72.beta=20?= =?UTF-8?q?=E2=86=92=202.72.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib-networking/-/compare/2.72.beta...2.72.0 --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 97de614912d..fce73f74660 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.72.beta"; + version = "2.72.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dOcEz5prXwCxzc9bKb+Fnt8dN1+HM2YDxxjHBj0eI1U="; + sha256 = "EAquuzaShQQd5S2kIra3FnidXk11SaOnG6WHuTLggjs="; }; patches = [ From 18a72ef69f0ea398d8619b4c0703899577860bdd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 23 Mar 2022 13:12:15 +0100 Subject: [PATCH 330/382] gnome.aisleriot: Fix build pygame dependency of pysolc does not currently build but it would not do anything without a path being explicitly specified anyway. --- pkgs/desktops/gnome/games/aisleriot/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 21e38c548e9..50c50c8d43f 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -9,7 +9,6 @@ , librsvg , libxml2 , desktop-file-utils -, pysolfc , guile , libcanberra-gtk3 , ninja @@ -46,7 +45,6 @@ stdenv.mkDerivation rec { librsvg guile libcanberra-gtk3 - pysolfc ]; prePatch = '' From 5d92c840ed00d3a6b9f979e6bd14193d1b2f231d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 23 Mar 2022 17:26:22 +0800 Subject: [PATCH 331/382] blueberry: fix build with meson 0.61 --- pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix b/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix index 07b77c04994..cf0028cf833 100644 --- a/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix +++ b/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , gnome , meson , ninja @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"; }; + patches = [ + # Fix build with meson 0.61. + # sendto/meson.build:24:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/commit/755fd758f866d3a3f7ca482942beee749f13a91e.patch"; + sha256 = "sha256-N0MJ0pYO411o2CTNZHWmEoG2m5TGUjR6YW6HSXHTR/A="; + }) + ]; + nativeBuildInputs = [ meson ninja From ca71a3f375b7758e02b74ff48fe3b6505341d66d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 23 Mar 2022 22:16:36 +0800 Subject: [PATCH 332/382] =?UTF-8?q?gnome.aisleriot:=203.22.20=20=E2=86=92?= =?UTF-8?q?=203.22.21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/aisleriot/-/compare/3.22.20...3.22.21 --- pkgs/desktops/gnome/games/aisleriot/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 50c50c8d43f..5a7446862bd 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab , nix-update-script , pkg-config @@ -9,7 +10,7 @@ , librsvg , libxml2 , desktop-file-utils -, guile +, guile_3_0 , libcanberra-gtk3 , ninja , appstream-glib @@ -18,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.20"; + version = "3.22.21"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "sha256-5xFwlhT9qjtvNDQ8kfGd2BeK2KcJDzpfsEC8z4Ei3ns="; + sha256 = "sha256-dpzuePxSoJcwUlj314r5G9A8aF1Yz49r+DxNTfA8/Ks="; }; nativeBuildInputs = [ @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg - guile + guile_3_0 libcanberra-gtk3 ]; From b43e9c65ebd4729ae9c6cf789f7cd3cebeda8ae3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 23 Mar 2022 15:56:28 +0000 Subject: [PATCH 333/382] =?UTF-8?q?folks:=200.15.4=20=E2=86=92=200.15.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/folks/-/compare/0.15.4...0.15.5 --- pkgs/development/libraries/folks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 965016e1c74..f6161535df5 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.15.4"; + version = "0.15.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5xCZr8noj61OdXrhNLw/1j4SuQGtYrDtVTavt5Ekr18="; + sha256 = "D/+KiWMwzYKu5FmDJPflQciE0DN1NiEnI7S+s4x1kIY="; }; nativeBuildInputs = [ From 50bc0910b6b381f8755f3ab3590f7c6b14501781 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Mar 2022 15:08:22 +0800 Subject: [PATCH 334/382] gtranslator: fix build with meson 0.61 --- pkgs/tools/text/gtranslator/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index d065a48d8db..d5e7922831e 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -30,6 +32,15 @@ stdenv.mkDerivation rec { sha256 = "E28R/gOhlJkMQ6/jOL0eoK0U5+H26Gjlv3xbUsTF5eE="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:15:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch"; + sha256 = "aRg6dYweftV8F7FXykO7m0G+p4SLTFnhTcZx72UCMDE="; + }) + ]; + nativeBuildInputs = [ meson ninja From 57b7111537a079a7109b6231758c6bc9a5c27dda Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 24 Mar 2022 13:14:45 +0000 Subject: [PATCH 335/382] =?UTF-8?q?gnome.gnome-initial-setup:=2042.0=20?= =?UTF-8?q?=E2=86=92=2042.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/42.0...42.0.1 --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 2d5ef1409a7..7f6724ce63a 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "42.0"; + version = "42.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "y/PjhtKstfTsuxGP+3A9oSkB6EuAwkR0lCgQHqxH6qc="; + sha256 = "/PQ/L75NwEw6wq5QVjP+se8w2nDKleq8YeIAaxkuXlU="; }; patches = [ From 5ad177b59ce3064460322c51f6c861010fc13505 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Mar 2022 13:13:18 +0000 Subject: [PATCH 336/382] =?UTF-8?q?libnma:=201.8.34=20=E2=86=92=201.8.36?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libnma/-/compare/1.8.34...1.8.36 --- pkgs/tools/networking/networkmanager/libnma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index c039b47d169..63642cf60e7 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "libnma"; - version = "1.8.34"; + version = "1.8.36"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "9eLnOOD8p/KlSQeSkLLYAXUR1IWoMiDDbfOAo7R1MwQ="; + sha256 = "2ZQV9M3/ZCIwAZ7FzdKx+/HsVQqK6GUhn3VIKmQre3o="; }; patches = [ From 13f70082dc9cabc795dc3d0edf42eb9e5c714b0f Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Fri, 25 Mar 2022 22:49:54 +0800 Subject: [PATCH 337/382] godns: 2.7 -> 2.7.1 --- pkgs/tools/networking/godns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index b2744b8ed97..0e026e5d571 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.7"; + version = "2.7.1"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-PD/3WIxNPtC7s4+2ogWG5DEm717rYQLMx9XA06Q6ebo="; + sha256 = "sha256-4PkG8u0wYHHFWR9s4s08tkeBbXdxTUv48HRZsSraNak="; }; vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850="; From ad15abe7ffbc68ba8a41fdb9270c31b75e2e7fd8 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 3 Mar 2022 11:14:03 -0600 Subject: [PATCH 338/382] squid: 4.17 -> 5.4.1 * enable HTCP * enable systemd support * add NixOS option "services.squid.package" --- nixos/modules/services/networking/squid.nix | 17 ++++++++++++++--- pkgs/servers/squid/default.nix | 14 ++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index 4f3881af8bb..db4f0d26b6f 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -111,6 +111,13 @@ in description = "Whether to run squid web proxy."; }; + package = mkOption { + default = pkgs.squid; + defaultText = literalExpression "pkgs.squid"; + type = types.package; + description = "Squid package to use."; + }; + proxyAddress = mkOption { type = types.nullOr types.str; default = null; @@ -157,17 +164,21 @@ in users.groups.squid = {}; systemd.services.squid = { - description = "Squid caching web proxy"; + description = "Squid caching proxy"; + documentation = [ "man:squid(8)" ]; after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target"]; preStart = '' mkdir -p "/var/log/squid" chown squid:squid "/var/log/squid" + ${cfg.package}/bin/squid --foreground -z -f ${squidConfig} ''; serviceConfig = { - Type="forking"; PIDFile="/run/squid.pid"; - ExecStart = "${pkgs.squid}/bin/squid -YCs -f ${squidConfig}"; + ExecStart = "${cfg.package}/bin/squid --foreground -YCs -f ${squidConfig}"; + ExecReload="kill -HUP $MAINPID"; + KillMode="mixed"; + NotifyAccess="all"; }; }; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index dae9d21c7f5..70b9c869f11 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl, pkg-config +, expat, libxml2, openssl, pkg-config, systemd }: stdenv.mkDerivation rec { pname = "squid"; - version = "4.17"; + version = "5.4.1"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "sha256-y5KKwIx8hrFRscj4J6vhqE2DGBoqhuDVEihhY+HjFBg="; + url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz"; + sha256 = "sha256-300xCpFmOuWcKbD4GD8iYjxeb3MYaa95OAWYerlMpBw="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl - ] ++ lib.optionals stdenv.isLinux [ libcap pam ]; + ] ++ lib.optionals stdenv.isLinux [ libcap pam systemd ]; configureFlags = [ "--enable-ipv6" @@ -26,7 +26,9 @@ stdenv.mkDerivation rec { "--enable-removal-policies=lru,heap" "--enable-delay-pools" "--enable-x-accelerator-vary" - ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; + "--enable-htcp" + ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) + "--enable-linux-netfilter"; meta = with lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; From 4ec35ff6d6298f3fc70be458ea1fea68ee85b1e9 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 26 Feb 2022 10:53:26 -0600 Subject: [PATCH 339/382] nixos: init programs/nncp module The NNCP utilities read a configuration at "/etc/nncp.hjson" by default. Add a NixOS module for generating this configuration. --- .../from_md/release-notes/rl-2205.section.xml | 6 ++ .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/nncp.nix | 101 ++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 nixos/modules/programs/nncp.nix 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 0b01c4e0884..abb17619613 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 @@ -1660,6 +1660,12 @@ + + + The programs.nncp options were added for + generating host-global NNCP configuration. + + diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 5b93b644eea..909b6cd8b7b 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -587,4 +587,6 @@ In addition to numerous new and upgraded packages, this release has the followin - Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`. - The `spark3` package is now usable on `aarch64-darwin` as a result of [#158613](https://github.com/NixOS/nixpkgs/pull/158613) and [#158992](https://github.com/NixOS/nixpkgs/pull/158992). +- The `programs.nncp` options were added for generating host-global NNCP configuration. + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 93172aa0824..a4c389e6937 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -184,6 +184,7 @@ ./programs/nix-ld.nix ./programs/neovim.nix ./programs/nm-applet.nix + ./programs/nncp.nix ./programs/npm.nix ./programs/noisetorch.nix ./programs/oblogout.nix diff --git a/nixos/modules/programs/nncp.nix b/nixos/modules/programs/nncp.nix new file mode 100644 index 00000000000..29a703eadf1 --- /dev/null +++ b/nixos/modules/programs/nncp.nix @@ -0,0 +1,101 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + nncpCfgFile = "/run/nncp.hjson"; + programCfg = config.programs.nncp; + settingsFormat = pkgs.formats.json { }; + jsonCfgFile = settingsFormat.generate "nncp.json" programCfg.settings; + pkg = programCfg.package; +in { + options.programs.nncp = { + + enable = + mkEnableOption "NNCP (Node to Node copy) utilities and configuration"; + + group = mkOption { + type = types.str; + default = "uucp"; + description = '' + The group under which NNCP files shall be owned. + Any member of this group may access the secret keys + of this NNCP node. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.nncp; + defaultText = literalExpression "pkgs.nncp"; + description = "The NNCP package to use system-wide."; + }; + + secrets = mkOption { + type = with types; listOf str; + example = [ "/run/keys/nncp.hjson" ]; + description = '' + A list of paths to NNCP configuration files that should not be + in the Nix store. These files are layered on top of the values at + . + ''; + }; + + settings = mkOption { + type = settingsFormat.type; + description = '' + NNCP configuration, see + . + At runtime these settings will be overlayed by the contents of + into the file + ${nncpCfgFile}. Node keypairs go in + secrets, do not specify them in + settings as they will be leaked into + /nix/store! + ''; + default = { }; + }; + + }; + + config = mkIf programCfg.enable { + + environment = { + systemPackages = [ pkg ]; + etc."nncp.hjson".source = nncpCfgFile; + }; + + programs.nncp.settings = { + spool = mkDefault "/var/spool/nncp"; + log = mkDefault "/var/spool/nncp/log"; + }; + + systemd.tmpfiles.rules = [ + "d ${programCfg.settings.spool} 0770 root ${programCfg.group}" + "f ${programCfg.settings.log} 0770 root ${programCfg.group}" + ]; + + systemd.services.nncp-config = { + path = [ pkg ]; + description = "Generate NNCP configuration"; + wantedBy = [ "basic.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + umask u=rw + nncpCfgDir=$(mktemp --directory nncp.XXX) + for f in ${jsonCfgFile} ${toString config.programs.nncp.secrets}; do + tmpdir=$(mktemp --directory nncp.XXX) + nncp-cfgdir -cfg $f -dump $tmpdir + find $tmpdir -size 1c -delete + cp -a $tmpdir/* $nncpCfgDir/ + rm -rf $tmpdir + done + nncp-cfgdir -load $nncpCfgDir > ${nncpCfgFile} + rm -rf $nncpCfgDir + chgrp ${programCfg.group} ${nncpCfgFile} + chmod g+r ${nncpCfgFile} + ''; + }; + }; + + meta.maintainers = with lib.maintainers; [ ehmry ]; +} From de23459252f7708643c62fd2822157f28898c2a5 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 9 Mar 2022 08:27:52 -0600 Subject: [PATCH 340/382] littlefs-fuse: init at 2.4.1 --- .../filesystems/littlefs-fuse/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/filesystems/littlefs-fuse/default.nix diff --git a/pkgs/tools/filesystems/littlefs-fuse/default.nix b/pkgs/tools/filesystems/littlefs-fuse/default.nix new file mode 100644 index 00000000000..daec12b5041 --- /dev/null +++ b/pkgs/tools/filesystems/littlefs-fuse/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, fuse }: + +stdenv.mkDerivation rec { + pname = "littlefs-fuse"; + version = "2.4.1"; + src = fetchFromGitHub { + owner = "littlefs-project"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+EUZluBtgZiziTEIfXIhkRIBu/Pe78qmL18TQHkfHO4="; + }; + buildInputs = [ fuse ]; + installPhase = '' + runHook preInstall + install -D lfs $out/bin/${pname} + ln -s $out/bin/${pname} $out/bin/mount.littlefs + ln -s $out/bin $out/sbin + runHook postInstall + ''; + meta = src.meta // { + description = "A FUSE wrapper that puts the littlefs in user-space"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ehmry ]; + inherit (fuse.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a48a923d76d..d69ddef73cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7233,6 +7233,8 @@ with pkgs; lfs = callPackage ../tools/filesystems/lfs { }; + littlefs-fuse = callPackage ../tools/filesystems/littlefs-fuse { }; + lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; lldpd = callPackage ../tools/networking/lldpd { }; From df26b72fe7fad5f792a41a789d11a8b84fbc9629 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Fri, 25 Mar 2022 16:31:39 +0000 Subject: [PATCH 341/382] exploitdb: 2022-03-22 -> 2022-03-24 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 9df04ca0627..e589ca529c6 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-03-22"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-2V6levydKfYtpctgcyBuLES0OujWi8eqlB3x/YoOyHY="; + sha256 = "sha256-G2KFDNNM4NJ7DgQu1+uNjgixzyLFnF0G0YQ29PgYZ/0="; }; From c70a466d21fbd72f73cfc263e93f967e79953e73 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 11 Aug 2021 20:28:30 +0200 Subject: [PATCH 342/382] nixos/systemd: Allow creation of unit directories This patch allows creation of files like /etc/systemd/system/user-.slice.d/limits.conf with systemd.units."user-.slice.d/limits.conf" = { text = '' [Slice] CPUAccounting=yes CPUQuota=50% ''; }; which previously threw an error Also renames the systemd-unit-path test to sytsemd-misc, and extends it to test that `systemd.units` can handle directories. In this case we make sure that resource limits specified in user slices apply. --- nixos/lib/systemd-lib.nix | 10 ++++++---- nixos/tests/all-tests.nix | 2 +- .../{systemd-unit-path.nix => systemd-misc.nix} | 17 ++++++++++++++++- 3 files changed, 23 insertions(+), 6 deletions(-) rename nixos/tests/{systemd-unit-path.nix => systemd-misc.nix} (74%) diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index a472d97f5cc..37900b0b16f 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -23,8 +23,9 @@ in rec { inherit (unit) text; } '' - mkdir -p $out - echo -n "$text" > $out/${shellEscape name} + name=${shellEscape name} + mkdir -p "$out/$(dirname "$name")" + echo -n "$text" > "$out/$name" '' else pkgs.runCommand "unit-${mkPathSafeName name}-disabled" @@ -32,8 +33,9 @@ in rec { allowSubstitutes = false; } '' - mkdir -p $out - ln -s /dev/null $out/${shellEscape name} + name=${shellEscape name} + mkdir -p "$out/$(dirname "$name")" + ln -s /dev/null "$out/$name" ''; boolValues = [true false "yes" "no"]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8d54f78a948..5105890029b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -518,7 +518,7 @@ in systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; - systemd-unit-path = handleTest ./systemd-unit-path.nix {}; + systemd-misc = handleTest ./systemd-misc.nix {}; taskserver = handleTest ./taskserver.nix {}; teeworlds = handleTest ./teeworlds.nix {}; telegraf = handleTest ./telegraf.nix {}; diff --git a/nixos/tests/systemd-unit-path.nix b/nixos/tests/systemd-misc.nix similarity index 74% rename from nixos/tests/systemd-unit-path.nix rename to nixos/tests/systemd-misc.nix index 5998a187188..e416baa8b5f 100644 --- a/nixos/tests/systemd-unit-path.nix +++ b/nixos/tests/systemd-misc.nix @@ -29,10 +29,23 @@ let }; in { - name = "systemd-unit-path"; + name = "systemd-misc"; machine = { pkgs, lib, ... }: { boot.extraSystemdUnitPaths = [ "/etc/systemd-rw/system" ]; + + users.users.limited = { + isNormalUser = true; + uid = 1000; + }; + + systemd.units."user-1000.slice.d/limits.conf" = { + text = '' + [Slice] + TasksAccounting=yes + TasksMax=100 + ''; + }; }; testScript = '' @@ -43,5 +56,7 @@ in ) machine.succeed("systemctl start example.service") machine.succeed("systemctl status example.service | grep 'Active: active'") + + machine.succeed("systemctl show --property TasksMax --value user-1000.slice | grep 100") ''; }) From 534a73511ef95355ef9b11f31bf6deb9fdb84521 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Mar 2022 19:01:22 +0100 Subject: [PATCH 343/382] inkscape: fix build with poppler 22.03 --- pkgs/applications/graphics/inkscape/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 12d6332af5d..0958676cc99 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,6 +5,7 @@ , cairo , cmake , fetchurl +, fetchpatch , gettext , ghostscript , glib @@ -71,6 +72,13 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + + # Fix build with poppler 22.03 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/4187 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch"; + sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg="; + }) ]; postPatch = '' From ea031515d4a44a8474cec6fab3568aec0d14208d Mon Sep 17 00:00:00 2001 From: TANIGUCHI Kohei Date: Sat, 26 Mar 2022 03:04:40 +0900 Subject: [PATCH 344/382] unused: 0.2.3 -> 0.4.0 --- pkgs/development/tools/misc/unused/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix index 4c387237714..de12e527a29 100644 --- a/pkgs/development/tools/misc/unused/default.nix +++ b/pkgs/development/tools/misc/unused/default.nix @@ -1,18 +1,18 @@ { lib, fetchFromGitHub, rustPlatform, cmake }: rustPlatform.buildRustPackage rec { pname = "unused"; - version = "0.2.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "unused-code"; repo = pname; rev = version; - sha256 = "sha256-1R50oCVvk+XJG4EhLusY1aY6RjWNeZvlIDS8PJXIA7o="; + sha256 = "sha256-+1M8dUfjjrT4llS0C6WYDyNxJ9QZ5s9v+W185TbgwMw="; }; nativeBuildInputs = [ cmake ]; - cargoSha256 = "sha256-PjCR+kHlgPWkTkhN0idotGmLSe/FaKkgI9AMEJtoRz8="; + cargoSha256 = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs="; meta = with lib; { description = "A tool to identify potentially unused code"; From f318d3b5605aaed8b2ee8ba645656fc4f65cfd41 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Thu, 24 Mar 2022 13:16:36 -0600 Subject: [PATCH 345/382] python3Packages.unicorn: fix build on aarch64-darwin closes #165181 --- pkgs/development/python-modules/unicorn/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 1f2876bdc69..8a568a47c0e 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -20,7 +20,10 @@ buildPythonPackage rec { ''; # needed on non-x86 linux - setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]; + setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ] + # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. + # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--plat-name" "macosx_11_0" ]; propagatedBuildInputs = [ setuptools From e446f7b091cee5f0924b5284802ee12fb3a77a43 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Thu, 24 Mar 2022 13:27:25 -0600 Subject: [PATCH 346/382] python3Packages.capstone: fix build on aarch64-darwin closes #165679 --- pkgs/development/python-modules/capstone/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index c99c392841e..f1a37fb70a0 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { substituteInPlace setup.py --replace manylinux1 manylinux2014 ''; + # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. + # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. + setupPyBuildFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--plat-name" "macosx_11_0" ]; + propagatedBuildInputs = [ setuptools ]; checkPhase = '' From 91024781530c66bc61f09074c9fcd9bce7d11a87 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Mar 2022 19:17:22 +0100 Subject: [PATCH 347/382] libreoffice: fix build with Poppler 22.03 --- pkgs/applications/office/libreoffice/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 1fe7598d0e1..5ebde5e10de 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -82,7 +82,15 @@ in (mkDrv rec { tar -xf ${srcs.translations} ''; - patches = [ ./skip-failed-test-with-icu70.patch ]; + patches = [ + ./skip-failed-test-with-icu70.patch + + # Fix build with poppler 22.03 + (fetchurl { + url = "https://github.com/archlinux/svntogit-packages/raw/f82958b9538f86e41b51f1ba7134968d2f3788d1/trunk/poppler-22.03.0.patch"; + sha256 = "5h4qJmx6Q3Q3dHUlSi8JXBziN2mAswGVWk5aDTLTwls="; + }) + ]; ### QT/KDE # From 532e6eba753555011cfe9c3dc1af41b74252bd74 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 24 Mar 2022 16:37:11 -0700 Subject: [PATCH 348/382] buf: 1.1.1 -> 1.3.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index c46cd0d0a41..0f7904fe9bb 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w/P9pNHxaBRlAly5jE7I0JsjjFeDctFaXOTbzDESaCo="; + sha256 = "sha256-rOT7HuvbJFRyBOmCNmx5Vic4zckYgS+1BB0PcpwD9OQ="; }; - vendorSha256 = "sha256-AM/MN4vdcsHEbYdOEuVOvkMCdMDnk2UiW5vUnXcj+wY="; + vendorSha256 = "sha256-qIWZYsl1hFV4Ts27WSyjQAQ+jWjtLLG+A+yS0Ms7hfI="; patches = [ # Skip a test that requires networking to be available to work. From 158789753f6d8ba7a55a83c79674e9667069a13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Fri, 25 Mar 2022 17:22:19 +0100 Subject: [PATCH 349/382] linux_testing_bcachefs: 2022-03-09 -> 2022-03-21 This should fix a bug causing kernel panics when your fs has snapshots enabled. See: https://lore.kernel.org/all/bc622d24-9fad-7b3-22cb-da4bf2dd32d@ewheeler.net/T/ This patch also bumps the kernel version to 5.16, as bcachefs is devel- oping against that now. --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- pkgs/top-level/linux-kernels.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 63d47dd8a38..e86f6fced56 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-03-09" -, commit ? "2280551cebc1735f74eef75d650dd5e175461657" -, diffHash ? "1mrrydidbapdq0fs0vpqhs88k6ghdrvmjpk2zi7xlwj7j32h0nwp" +, date ? "2022-03-21" +, commit ? "c38b7167aa5f3b1b91dcc93ade57f30e95064590" +, diffHash ? "04lgwnng7p2rlz9sxn74n22750kh524xwfws3agqs12pcrvfsm0j" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index e73b5ebda1d..bd7bacf3000 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -186,7 +186,7 @@ in { else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_15; + kernel = linux_5_16; kernelPatches = kernel.kernelPatches; }; From d2784592945822ef3f469fb92af066c1d38bf4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Fri, 25 Mar 2022 17:23:06 +0100 Subject: [PATCH 350/382] bcachefs-tools: 2022-03-09 -> 2022-03-22 --- 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 aa049682b83..e5325b1f988 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-03-09"; + version = "unstable-2022-03-22"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "3e2e3d468eed1d5ebbb4c6309d2eaebd081912c5"; - sha256 = "1sb0dj2whlp3dxgf642z7yx7s8va5ah82zi6r4qni7l64qy1n554"; + rev = "f3cdace86c8b60a4efaced23b2d31c16dc610da9"; + sha256 = "1hg4cjrs4yr0mx3mmm1jls93w1skpq5wzp2dzx9rq4w5il2xmx19"; }; postPatch = '' From 44c7781ee802a89dd48615801d18da3df296f19c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Mar 2022 19:50:31 +0100 Subject: [PATCH 351/382] lxqt.lxqt-build-tools: Fix finding GLib 2.72 Without this build of packages using this (e.g. lxqt.libqtxdg) will fail. --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 15bc1941af3..5d5134d38d2 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -22,11 +22,16 @@ mkDerivation rec { sha256 = "1hb04zgpalxv6da3myf1dxsbjix15dczzfq8a24g5dg2zfhwpx21"; }; - # Nix clang on darwin identifies as 'Clang', not 'AppleClang' - # Without this, dependants fail to link. postPatch = '' + # Nix clang on darwin identifies as 'Clang', not 'AppleClang' + # Without this, dependants fail to link. substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \ --replace AppleClang Clang + + # GLib 2.72 moved the file from gio-unix-2.0 to gio-2.0. + # https://github.com/lxqt/lxqt-build-tools/pull/74 + substituteInPlace cmake/find-modules/FindGLIB.cmake \ + --replace gio/gunixconnection.h gio/gunixfdlist.h ''; nativeBuildInputs = [ From 9adc2089f943115bc7634ba7e381e9c4ed072188 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Mar 2022 20:21:09 +0100 Subject: [PATCH 352/382] plasma5Packages.kitinerary: fix build with Poppler 22.03 --- pkgs/applications/kde/kitinerary.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index f69e705bb2f..83763ba965a 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules +{ mkDerivation, fetchpatch, lib, extra-cmake-modules , qtdeclarative, ki18n, kmime, kpkpass , poppler, kcontacts, kcalendarcore , shared-mime-info @@ -10,6 +10,15 @@ mkDerivation { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; }; + + patches = [ + # Fix build with poppler 22.03 + (fetchpatch { + url = "https://github.com/KDE/kitinerary/commit/e21d1ffc5fa81a636245f49c97fe7cda63abbb1d.patch"; + sha256 = "1/zgq9QIOCPplqplDqgpoqzuYFf/m1Ixxawe50t2F04="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info # for update-mime-database From 7904ab42d861b316c7628e5367fb385b08ab021b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Mar 2022 20:31:12 +0100 Subject: [PATCH 353/382] =?UTF-8?q?pdf2djvu:=200.9.17.1=20=E2=86=92=200.9.?= =?UTF-8?q?18.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/jwilk/pdf2djvu/releases/tag/0.9.18 https://github.com/jwilk/pdf2djvu/releases/tag/0.9.18.1 https://github.com/jwilk/pdf2djvu/releases/tag/0.9.18.2 --- pkgs/tools/typesetting/pdf2djvu/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 33f8481bc1a..08730ef9ab1 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , gettext , libtool @@ -16,25 +15,16 @@ }: stdenv.mkDerivation rec { - version = "0.9.17.1"; + version = "0.9.18.2"; pname = "pdf2djvu"; src = fetchFromGitHub { owner = "jwilk"; repo = "pdf2djvu"; rev = version; - sha256 = "1igabfy3fd7qndihmkfk9incc15pjxpxh2cn5pfw5fxfwrpjrarn"; + sha256 = "s6n7nDO15DZSJ1EOPoNvjdFv/QtOoGiUa2b/k3kzWe8="; }; - patches = [ - # Not included in 0.9.17.1, but will be in the next version. - (fetchpatch { - name = "no-poppler-splash.patch"; - url = "https://github.com/jwilk/pdf2djvu/commit/2ec7eee57a47bbfd296badaa03dc20bf71b50201.patch"; - sha256 = "03kap7k2j29r16qgl781cxpswzg3r2yn513cqycgl0vax2xj3gly"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ @@ -62,6 +52,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Required by Poppler + # https://github.com/jwilk/pdf2djvu/commit/373e065faf2f0d868a3700788d20a96e9528bb12 + CXXFLAGS = "-std=c++17"; + meta = with lib; { description = "Creates djvu files from PDF files"; homepage = "https://jwilk.net/software/pdf2djvu"; From 013594c801af8616a0011ed8d8e4e7278f63a10d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Mar 2022 20:27:57 +0100 Subject: [PATCH 354/382] pdf2djvu: fix build with Poppler 22.03 --- pkgs/tools/typesetting/pdf2djvu/default.nix | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 08730ef9ab1..6921c64d85f 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoreconfHook , gettext , libtool @@ -25,6 +26,30 @@ stdenv.mkDerivation rec { sha256 = "s6n7nDO15DZSJ1EOPoNvjdFv/QtOoGiUa2b/k3kzWe8="; }; + patches = [ + # Fix build with Poppler 22.03. + (fetchpatch { + url = "https://github.com/jwilk/pdf2djvu/commit/e170ad557d5f13daeeac047dfaa79347bbe5062f.patch"; + sha256 = "OPK2UWVs+E2uOEaxPtLWmVL28yCxaeJKscY9ziAbS7E="; + }) + (fetchpatch { + url = "https://github.com/jwilk/pdf2djvu/commit/956fedc7e0831126b9006efedad5519c14201c52.patch"; + sha256 = "JF1xvvL2WyMu6GjdrPLlRC6eC6vGLbVurQcNy3AOOXA="; + }) + (fetchpatch { + url = "https://github.com/jwilk/pdf2djvu/commit/dca43e8182174bc04e107eaefcafcfdfdf9bcd61.patch"; + sha256 = "0JcfDaVZpuv6VfUJ2HuxRqgntZ/t8AzU0RG/E83BWGY="; + }) + (fetchpatch { + url = "https://github.com/jwilk/pdf2djvu/commit/81b635e014ebd0240a8719cc39b6a1b759cc6a98.patch"; + sha256 = "LBmT4eflLd23X7gg7IbqGe3PfTGldEGFLEKImV4nbB0="; + postFetch = '' + # The file was renamed after the release. + sed -i "s/main.cc/pdf2djvu.cc/g" "$out" + ''; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ From 3d12c9ce1c1a0fb44518646fd5f3ac69e4f0bfc5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Mar 2022 21:35:53 +0100 Subject: [PATCH 355/382] scribusUnstable: Fix build with Poppler 22.03 --- pkgs/applications/office/scribus/unstable.nix | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 21adb90cab9..754c9ba03d4 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -54,6 +54,36 @@ mkDerivation rec { url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch"; sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y="; }) + # For Poppler 22.02 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch"; + sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch"; + sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c="; + }) + # For Poppler 22.03 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch"; + sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch"; + sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch"; + sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch"; + sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch"; + sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ="; + }) ]; nativeBuildInputs = [ From 206e030ce23c1623b7f45993eb11c67e4ef94a1e Mon Sep 17 00:00:00 2001 From: Daniel Kilimnik Date: Tue, 15 Feb 2022 16:02:23 +0100 Subject: [PATCH 356/382] installer/cd-dvd/iso-image: add syslinuxTheme config option It was not possible to change the theme used by syslinux when building an iso image. --- nixos/modules/installer/cd-dvd/iso-image.nix | 53 ++++++++++++-------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 3ff1b3d670e..860e240b43d 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -91,29 +91,9 @@ let SERIAL 0 115200 TIMEOUT ${builtins.toString syslinuxTimeout} UI vesamenu.c32 - MENU TITLE NixOS MENU BACKGROUND /isolinux/background.png - MENU RESOLUTION 800 600 - MENU CLEAR - MENU ROWS 6 - MENU CMDLINEROW -4 - MENU TIMEOUTROW -3 - MENU TABMSGROW -2 - MENU HELPMSGROW -1 - MENU HELPMSGENDROW -1 - MENU MARGIN 0 - # FG:AARRGGBB BG:AARRGGBB shadow - MENU COLOR BORDER 30;44 #00000000 #00000000 none - MENU COLOR SCREEN 37;40 #FF000000 #00E2E8FF none - MENU COLOR TABMSG 31;40 #80000000 #00000000 none - MENU COLOR TIMEOUT 1;37;40 #FF000000 #00000000 none - MENU COLOR TIMEOUT_MSG 37;40 #FF000000 #00000000 none - MENU COLOR CMDMARK 1;36;40 #FF000000 #00000000 none - MENU COLOR CMDLINE 37;40 #FF000000 #00000000 none - MENU COLOR TITLE 1;36;44 #00000000 #00000000 none - MENU COLOR UNSEL 37;44 #FF000000 #00000000 none - MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std + ${config.isoImage.syslinuxTheme} DEFAULT boot @@ -601,6 +581,37 @@ in ''; }; + isoImage.syslinuxTheme = mkOption { + default = '' + MENU TITLE NixOS + MENU RESOLUTION 800 600 + MENU CLEAR + MENU ROWS 6 + MENU CMDLINEROW -4 + MENU TIMEOUTROW -3 + MENU TABMSGROW -2 + MENU HELPMSGROW -1 + MENU HELPMSGENDROW -1 + MENU MARGIN 0 + + # FG:AARRGGBB BG:AARRGGBB shadow + MENU COLOR BORDER 30;44 #00000000 #00000000 none + MENU COLOR SCREEN 37;40 #FF000000 #00E2E8FF none + MENU COLOR TABMSG 31;40 #80000000 #00000000 none + MENU COLOR TIMEOUT 1;37;40 #FF000000 #00000000 none + MENU COLOR TIMEOUT_MSG 37;40 #FF000000 #00000000 none + MENU COLOR CMDMARK 1;36;40 #FF000000 #00000000 none + MENU COLOR CMDLINE 37;40 #FF000000 #00000000 none + MENU COLOR TITLE 1;36;44 #00000000 #00000000 none + MENU COLOR UNSEL 37;44 #FF000000 #00000000 none + MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std + ''; + type = types.str; + description = '' + The syslinux theme used for BIOS boot. + ''; + }; + isoImage.appendToMenuLabel = mkOption { default = " Installer"; example = " Live System"; From 0f3e905834308026457885cc9eb8bcf5980848b5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 25 Mar 2022 22:56:26 +0200 Subject: [PATCH 357/382] dwarf-fortress.themes: add -theme suffix to name --- pkgs/games/dwarf-fortress/themes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index c6987a1d16b..d2e2ec5fd19 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -6,7 +6,7 @@ listToAttrs (map (v: { inherit (v) name; value = fetchFromGitHub { - name = "${v.name}-${v.version}"; + name = "${v.name}-theme-${v.version}"; owner = "DFgraphics"; repo = v.name; rev = v.version; From 7f618b06a0cbab03d77fbed1289d338d0d57f1e1 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 25 Mar 2022 20:20:26 +0000 Subject: [PATCH 358/382] nerdctl: 0.17.1 -> 0.18.0 --- pkgs/applications/networking/cluster/nerdctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 48ac2dc983e..936e7682348 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fWev5KgJEuL2pDm17kxdqRKo7t3+dDt5UD5iTHneJSY="; + sha256 = "sha256-gkfy/tKzh6EO+nyjuiU3InSErKvGcJp/X7oqYk0Msr0="; }; - vendorSha256 = "sha256-7L5xA/2uQnu10QGZn49K3oJf4HBEvt8q/sOR6BRXlo0="; + vendorSha256 = "sha256-hjhZYNpqt9yFNrDVpFlguESUAAqU+AhpUQTCvyMadPk="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 6d33b26fd1c51f309b3bad8113893f4c7814d335 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Fri, 25 Mar 2022 20:36:04 +0100 Subject: [PATCH 359/382] fish: 3.4.0 -> 3.4.1 --- pkgs/shells/fish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index e320b920cfa..4c45fd3a75f 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -134,7 +134,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,7 +144,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tbSKuEhrGe9xajL39GuIuepTVhVfDpZ+6Z9Ak2RUE8U="; + sha256 = "sha256-tvI7OEOwTbawqQ/qH28NDkDMAntKcyCYIAhj8oZKlOo="; }; # Fix FHS paths in tests From ddf58f2d55066fd29510933a63f4c2ad8e5aa6d3 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Fri, 25 Mar 2022 18:37:23 -0300 Subject: [PATCH 360/382] argocd: 2.3.1 -> 2.3.2 --- pkgs/applications/networking/cluster/argocd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 042249d547f..211c2ce211e 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "argocd"; - version = "2.3.1"; + version = "2.3.2"; tag = "v${version}"; # Update commit to match the tag above # TODO make updadeScript - commit = "b65c1699fa2a2daa031483a3890e6911eac69068"; + commit = "ecc2af9dcaa12975e654cde8cbbeaffbb315f75c"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-YijhJz7m5wy8kR9V6IHSNYjiWh7H2ph6il9nMsrePOE="; + sha256 = "sha256-n+C4l4U3cDU+fgCnGWOYLdyjknw7n/xPEtC1i8AaU4o="; }; - vendorSha256 = "sha256-uA9sOMuVHKRRhSGoLyoKcUYU6NxtprVUITvVC+tot1g="; + vendorSha256 = "sha256-Km+1o6yuuxJs+DNTQ/XVTUFurD5gM5ohwDc7MwJuu5s="; # Set target as ./cmd per release-cli # https://github.com/argoproj/argo-cd/blob/master/Makefile#L222 From c4c1d7839db6b05c1fa12b8c28fd214e12eb6a35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 21:17:51 +0000 Subject: [PATCH 361/382] python310Packages.mkdocs-material: 8.2.6 -> 8.2.7 --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 228aa1913c5..dc67a515824 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.2.6"; + version = "8.2.7"; src = fetchFromGitHub { owner = "squidfunk"; repo = pname; rev = version; - sha256 = "sha256-4t9LBZc73V8eAIUO+BAZPgak+AX3o2YKZJWug+b6TBY="; + sha256 = "sha256-Jh0FmtBCYCEk6mYFLOKb1HQXQ4Wc9Z6JCHFVu420IBk="; }; propagatedBuildInputs = [ From c7fc7f25f12583e5d3766cad3335cf9fc10d3221 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 09:58:26 +0000 Subject: [PATCH 362/382] python310Packages.affine: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/affine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix index 89062cde4d9..4b7696223a7 100644 --- a/pkgs/development/python-modules/affine/default.nix +++ b/pkgs/development/python-modules/affine/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "affine"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "00jil4q3b17qml6azim7s7zar6qb1vhsf0g888y637m23bpms11f"; + sha256 = "sha256-1nbeZhV61q+Z/9lOD1Tonfw1sPtyUurS7QrS3KQxvdA="; }; checkInputs = [ pytest ]; From 08903014a5fe4cf3fb4b4806d696926ccc66d02d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 21:56:55 +0000 Subject: [PATCH 363/382] snd: 22.1 -> 22.2 --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 52789d64d10..01e8f5d2361 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "22.1"; + version = "22.2"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-jrH0XRvPj9ySd8FSrOKf6qP5T1YSKrYBNHl6fz5dhkI="; + sha256 = "sha256-MZ8Vm/d+0r7YsXdySKcH5rqXBh4iFLyUe44LBOD58E0="; }; nativeBuildInputs = [ pkg-config ]; From a15467886a7e06c72bfb62ac2b82f1196dfc22cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 14:35:43 +0000 Subject: [PATCH 364/382] python310Packages.diff-cover: 6.4.4 -> 6.4.5 --- pkgs/development/python-modules/diff-cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 5414f7522db..cbb44fb7ca4 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "6.4.4"; + version = "6.4.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - sha256 = "b1d782c1ce53ad4b2c5545f8b7aa799eb61a0b12a62b376a18e2313c6f2d77f1"; + sha256 = "sha256-qUuMHBfcJEmJF/con+ODtFfYrU7yo//KgKiSpByLWKY="; }; propagatedBuildInputs = [ From 38d6c62a98506b368e75fb1c31d63ad405bb65c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 22:51:34 +0000 Subject: [PATCH 365/382] thermald: 2.4.8 -> 2.4.9 --- pkgs/tools/system/thermald/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index f2fae161daa..96fa0c19df3 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.4.8"; + version = "2.4.9"; outputs = [ "out" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-Mup88vNS0iApwsZTdPnpXmkA0LNpSOzxBmbejcWIC+0="; + sha256 = "sha256-82O4vrUo3lMNzGOI5WyV1eponF0za0WM6mtd54xqUh8="; }; nativeBuildInputs = [ From 4bbf1a90c4919b2918c2f2123179d8ccb60e8dde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 02:58:14 +0000 Subject: [PATCH 366/382] dictdDBs.wiktionary: 20210920 -> 20220301 --- pkgs/servers/dict/wiktionary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix index 98e22301048..9ebbfb76739 100644 --- a/pkgs/servers/dict/wiktionary/default.nix +++ b/pkgs/servers/dict/wiktionary/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dict-db-wiktionary"; - version = "20210920"; + version = "20220301"; src = fetchurl { url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "UeufbpSpRL+JrU3SkhxzWJncEsrM1es88grRmFwGABk="; + sha256 = "Gobilm9Rlb7qtZU+hlsYOl1/BAjj/MtNp5z2GQx8NN8="; }; # script in nixpkgs does not support python2 From f3180f4cdc01bb8626426149032e5e2dd1830349 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 00:01:40 +0000 Subject: [PATCH 367/382] tboot: 1.10.4 -> 1.10.5 --- pkgs/tools/security/tboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index a33c26419e1..0b7ecca4f24 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tboot"; - version = "1.10.4"; + version = "1.10.5"; src = fetchurl { url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz"; - sha256 = "sha256-iEn6mZ0tuDBA1a2POpJEBaIM0TMVDohbVvp/6OO4nAY="; + sha256 = "sha256-O0vhbAPLwlBx7x1L2gtP1VDu2G2sbH9+/fAkI8VRs5M="; }; buildInputs = [ openssl trousers zlib ]; From b2fa8a507054f86f1fb18cebae6e7c93ed0faf6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 00:18:26 +0000 Subject: [PATCH 368/382] python310Packages.py-synologydsm-api: 1.0.7 -> 1.0.8 --- .../development/python-modules/py-synologydsm-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 24c4b3c9f59..0ebd218aa9c 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "mib1185"; repo = "synologydsm-api"; rev = "v${version}"; - sha256 = "sha256-VhAzR/knvun6hJj8/YREqMfNvOKpTyYNI9fk9hsbHDQ="; + sha256 = "sha256-9bh7uLt9+uda6yFCWV6xUh//jFC4DgiS+KtRXQrU3A8="; }; nativeBuildInputs = [ From 01bcf1b1a0b93279ff326a34913302c971718837 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Mar 2022 16:36:33 +0100 Subject: [PATCH 369/382] home-assistant: 2022.3.5 -> 2022.3.6 https://github.com/home-assistant/core/releases/tag/2022.3.6 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7f765eb9fd8..53d1cb6b836 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.3.5"; + version = "2022.3.6"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9e7fc76e4e3..94899c7a81f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -164,7 +164,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.3.5"; + hassVersion = "2022.3.6"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -182,7 +182,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-VXE2zQH/HHhogo5qjneC0zlo9892wgGN1qd3ZFKfyqw="; + hash = "sha256-Cw3OLUDHkbGsxY3gQaAXcfoKeh5udODS8vVlT0Qta9Y="; }; # leave this in, so users don't have to constantly update their downstream patch handling From d1ba752c47a3d4fae73ac58582c5b5e29ae32ea9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 16:55:09 +0100 Subject: [PATCH 370/382] python3Packages.metar: patch flaky test --- pkgs/development/python-modules/metar/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix index 4a7bf9edc5a..2c518561b99 100644 --- a/pkgs/development/python-modules/metar/default.nix +++ b/pkgs/development/python-modules/metar/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook }: @@ -15,6 +16,14 @@ buildPythonPackage rec { sha256 = "sha256-pl2NWRfFCYyM2qvBt4Ic3wgbGkYZvAO6pX2Set8zYW8="; }; + patches = [ + (fetchpatch { + # Fix flapping test; https://github.com/python-metar/python-metar/issues/161 + url = "https://github.com/python-metar/python-metar/commit/716fa76682e6c2936643d1cf62e3d302ef29aedd.patch"; + hash = "sha256-y82NN+KDryOiH+eG+2ycXCO9lqQLsah4+YpGn6lM2As="; + }) + ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "metar" ]; From ea2b0aebbf373a5618752f5c711efda1f8ac7bb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 01:12:00 +0000 Subject: [PATCH 371/382] pipenv: 2022.3.23 -> 2022.3.24 --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index bd676389cd4..50b47b3351b 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -19,11 +19,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.3.23"; + version = "2022.3.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pt9BdR31VTfe5UNJ4dy3eB586zS7mFsITphafg3EP8U="; + sha256 = "sha256-gAGY1DDnJPiZ5tsxnMZA1f1toqzbwwHOsaH5Z+mQQos="; }; LC_ALL = "en_US.UTF-8"; From baa2855358997350574d5dc06f2ec410bbf7a7e9 Mon Sep 17 00:00:00 2001 From: Daniel Beckwith Date: Thu, 24 Mar 2022 20:47:57 -0400 Subject: [PATCH 372/382] Add maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4a66ffa1eaf..f46ff4e080d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2824,6 +2824,12 @@ githubId = 49904992; name = "Dawid Sowa"; }; + dbeckwith = { + email = "djbsnx@gmail.com"; + github = "dbeckwith"; + githubId = 1279939; + name = "Daniel Beckwith"; + }; dbirks = { email = "david@birks.dev"; github = "dbirks"; From ac3aa4c073bd09a69b891f5ed08367fda6fa7ea6 Mon Sep 17 00:00:00 2001 From: Daniel Beckwith Date: Thu, 24 Mar 2022 20:48:02 -0400 Subject: [PATCH 373/382] Add cargo-bootimage package --- .../tools/rust/bootimage/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/rust/bootimage/default.nix diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/development/tools/rust/bootimage/default.nix new file mode 100644 index 00000000000..196da4ade59 --- /dev/null +++ b/pkgs/development/tools/rust/bootimage/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +}: + +rustPlatform.buildRustPackage rec { + pname = "bootimage"; + version = "0.10.3"; + + src = fetchFromGitHub { + owner = "rust-osdev"; + repo = pname; + rev = "v${version}"; + sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg"; + }; + + cargoSha256 = "03jximwqgjq7359c5mxbyfja2d04y57h34f87aby8jy0lz99jy2x"; + + meta = with stdenv.lib; { + description = "Creates a bootable disk image from a Rust OS kernel."; + homepage = "https://github.com/rust-osdev/bootimage"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ dbeckwith ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b51c0511229..d43f8783073 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13417,6 +13417,7 @@ with pkgs; cargo-generate = callPackage ../development/tools/rust/cargo-generate { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-bootimage = callPackage ../development/tools/rust/bootimage { }; cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures { inherit (darwin.apple_sdk.frameworks) Security; From 6771dc6346689d755e3529214753d5a4f016aaf7 Mon Sep 17 00:00:00 2001 From: Daniel Beckwith Date: Thu, 24 Mar 2022 21:03:25 -0400 Subject: [PATCH 374/382] Remove unused module arg --- pkgs/development/tools/rust/bootimage/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/development/tools/rust/bootimage/default.nix index 196da4ade59..1014b5f03e0 100644 --- a/pkgs/development/tools/rust/bootimage/default.nix +++ b/pkgs/development/tools/rust/bootimage/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, libiconv }: rustPlatform.buildRustPackage rec { From 6bbf2eda49bbda2235de9809f9da54d7f8b9b91e Mon Sep 17 00:00:00 2001 From: Daniel Beckwith Date: Thu, 24 Mar 2022 21:45:09 -0400 Subject: [PATCH 375/382] Fix lib ref --- pkgs/development/tools/rust/bootimage/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/development/tools/rust/bootimage/default.nix index 1014b5f03e0..9da7aeaa8cc 100644 --- a/pkgs/development/tools/rust/bootimage/default.nix +++ b/pkgs/development/tools/rust/bootimage/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "03jximwqgjq7359c5mxbyfja2d04y57h34f87aby8jy0lz99jy2x"; - meta = with stdenv.lib; { + meta = with lib; { description = "Creates a bootable disk image from a Rust OS kernel."; homepage = "https://github.com/rust-osdev/bootimage"; license = with licenses; [ asl20 mit ]; From bc0f24d02a075573a47cd2354f14632dbafdedc1 Mon Sep 17 00:00:00 2001 From: Hollow Man Date: Thu, 24 Mar 2022 15:24:42 +0800 Subject: [PATCH 376/382] mdbook-pdf: init at 0.1.2 Signed-off-by: Hollow Man --- pkgs/tools/text/mdbook-pdf/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/text/mdbook-pdf/default.nix diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix new file mode 100644 index 00000000000..8c21f50b1d7 --- /dev/null +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, CoreServices }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-pdf"; + version = "0.1.2"; + + src = fetchCrate { + inherit pname version; + sha256 = "1ibmn8x9kyfd058hsyah2ggyzpahzf2w2qjn6rs9qv8mr3bvc0pv"; + }; + + cargoSha256 = "0k47a5yqnjjc599vgk39ijy6fm62rr8xarvz37g0c7fx9cljhihz"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + + # No test. + doCheck = false; + + meta = with lib; { + description = "A backend for mdBook written in Rust for generating PDF"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hollowman6 ]; + homepage = "https://github.com/HollowMan6/mdbook-pdf"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d43f8783073..c219852398c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7373,6 +7373,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-pdf = callPackage ../tools/text/mdbook-pdf { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + mdbook-plantuml = callPackage ../tools/text/mdbook-plantuml { inherit (darwin.apple_sdk.frameworks) CoreServices; }; From f99046bcaba24e145344a8702b52197bac210a60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Mar 2022 04:27:40 +0000 Subject: [PATCH 377/382] taskwarrior-tui: 0.21.0 -> 0.21.1 --- pkgs/applications/misc/taskwarrior-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 036421bbaca..7d730421398 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-HHYObAeJtryZWRV3T+FXRz0TgBIfw/kVL9jwaQmZcEA="; + sha256 = "sha256-fgoK7Y+3h2VFfP8yiR8JM8Xf7UJbkX9PO1RoJRoYLW4="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-oRREvqQLigpfpnTJgVZjAwAvmUs9YSZm+D5xyFYvdb4="; + cargoSha256 = "sha256-3rDvla1mCcQclALbomUTvE3aLzsMeIjcIbEv4KfCKZE="; meta = with lib; { description = "A terminal user interface for taskwarrior "; From 617074f4c800b4793616ef86041c70037f5f6e16 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 23 Mar 2022 18:58:03 +0000 Subject: [PATCH 378/382] shisho: init at 0.5.2 --- pkgs/tools/security/shisho/default.nix | 59 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/tools/security/shisho/default.nix diff --git a/pkgs/tools/security/shisho/default.nix b/pkgs/tools/security/shisho/default.nix new file mode 100644 index 00000000000..5a5995f5da3 --- /dev/null +++ b/pkgs/tools/security/shisho/default.nix @@ -0,0 +1,59 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +, rustfmt +}: + +rustPlatform.buildRustPackage rec { + pname = "shisho"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "flatt-security"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY="; + fetchSubmodules = true; + }; + cargoSha256 = "sha256-xd4andytmDMOIT+3DkmUC9fkxxGJ6yRY2WSdnGB6ZwY="; + + nativeBuildInputs = [ + installShellFiles + # required to build serde-sarif dependency + rustfmt + ]; + + postInstall = '' + installShellCompletion --cmd shisho \ + --bash <($out/bin/shisho completion bash) \ + --fish <($out/bin/shisho completion fish) \ + --zsh <($out/bin/shisho completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/shisho --help + $out/bin/shisho --version | grep "${version}" + + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://docs.shisho.dev/shisho/"; + changelog = "https://docs.shisho.dev/changelog/"; + description = "Lightweight static analyzer for several programming languages"; + longDescription = '' + Shisho is a lightweight static code analyzer designed for developers and + is the core engine for Shisho products. It is, so to speak, like a + pluggable and configurable linter; it gives developers a way to codify + your domain knowledge over your code as rules. With powerful automation + and integration capabilities, the rules will help you find and fix issues + semiautomatically. + ''; + license = licenses.agpl3Only; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c219852398c..75b6c9ed0ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3797,6 +3797,8 @@ with pkgs; shipyard = callPackage ../tools/virtualization/shipyard { }; + shisho = callPackage ../tools/security/shisho { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; simplenes = callPackage ../applications/emulators/simplenes { }; From 7bd96c43cf54088e660967940f6d02056e0c0c8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 16:46:29 +0000 Subject: [PATCH 379/382] difftastic: 0.22.0 -> 0.23.0 --- pkgs/tools/text/difftastic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 14c95bd2f3b..981c5f0e931 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-VV4nCR+BGly+EdCkyI4KeS0Zmn6NkfRsMs//0Sj3E20="; + sha256 = "sha256-y1rwuZlkrxO1iOSN2o8pIewbNENs0xsntzLEZgfUgZ4="; }; - cargoSha256 = "sha256-MyCi5PuUs9MJArDFaBgjjBInYJAS/SAPe1iNTs9feLY="; + cargoSha256 = "sha256-mH6pkfWc8xXLXV/07LQ1jgk9hgt8WcIGdaNPpk7deLQ="; meta = with lib; { description = "A syntax-aware diff"; From 0e78d578e643f353d6db74a8514bab28099760dc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 26 Mar 2022 03:34:58 +0100 Subject: [PATCH 380/382] glib: Fix docs on Darwin They are failing due to a Meson bug. Doing it this hacky way to avoid rebuilding the world. --- pkgs/development/libraries/glib/default.nix | 5 +- .../tools/build-managers/meson/default.nix | 5 + ...when-using-multiple-apple-frameworks.patch | 176 ++++++++++++++++++ 3 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 02e2293d173..ecae47b3d2d 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -115,7 +115,10 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ - meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2 + (meson.override { + withDarwinFrameworksGtkDocPatch = stdenv.isDarwin; + }) + ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2 ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index aeddf457f48..8744407fb96 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -5,6 +5,7 @@ , pkg-config , python3 , substituteAll +, withDarwinFrameworksGtkDocPatch ? false }: python3.pkgs.buildPythonApplication rec { @@ -61,6 +62,10 @@ python3.pkgs.buildPythonApplication rec { # Meson tries to update ld.so.cache which breaks when the target architecture # differs from the build host's. ./do-not-update-ldconfig-cache.patch + ] ++ lib.optionals withDarwinFrameworksGtkDocPatch [ + # Fix building gtkdoc for GLib + # https://github.com/mesonbuild/meson/pull/10186 + ./fix-gtkdoc-when-using-multiple-apple-frameworks.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch b/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch new file mode 100644 index 00000000000..eb6d9718bcb --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch @@ -0,0 +1,176 @@ +From 0a008a6c7ecee19f35c8b7ab17b1470d0d1a8a15 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Sat, 26 Mar 2022 02:26:27 +0100 +Subject: [PATCH] gnome: Fix gtkdoc when using multiple Apple frameworks + +The `-framework Foundation -framework CoreFoundation` ended up +de-duplicated by OrderedSet into `-framework Foundation CoreFoundation`. + +Picked from https://github.com/mesonbuild/meson/pull/10186 + +Also pick https://github.com/mesonbuild/meson/commit/68e684d51f1e469e0d9f4b499ffda15146cad98a when resolving conflict. + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 7113f28d2..d3269b53f 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -384,13 +384,14 @@ class GnomeModule(ExtensionModule): + def _get_link_args(self, state, lib, depends, include_rpath=False, + use_gir_args=False): + link_command = [] ++ new_depends = list(depends) + # Construct link args + if isinstance(lib, build.SharedLibrary): + libdir = os.path.join(state.environment.get_build_dir(), state.backend.get_target_dir(lib)) + link_command.append('-L' + libdir) + if include_rpath: + link_command.append('-Wl,-rpath,' + libdir) +- depends.append(lib) ++ new_depends.append(lib) + # Needed for the following binutils bug: + # https://github.com/mesonbuild/meson/issues/1911 + # However, g-ir-scanner does not understand -Wl,-rpath +@@ -404,18 +405,24 @@ class GnomeModule(ExtensionModule): + link_command.append('--extra-library=' + lib.name) + else: + link_command.append('-l' + lib.name) +- return link_command +- +- def _get_dependencies_flags(self, deps, state, depends, include_rpath=False, +- use_gir_args=False, separate_nodedup=False): +- cflags = OrderedSet() +- internal_ldflags = OrderedSet() +- external_ldflags = OrderedSet() ++ return link_command, new_depends ++ ++ def _get_dependencies_flags_raw( ++ self, deps, ++ state, ++ depends, ++ include_rpath: bool = False, ++ use_gir_args: bool = False, ++ ) -> T.Tuple[OrderedSet[str], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[str], ++ T.List]: ++ cflags: OrderedSet[str] = OrderedSet() + # External linker flags that can't be de-duped reliably because they +- # require two args in order, such as -framework AVFoundation +- external_ldflags_nodedup = [] +- gi_includes = OrderedSet() ++ # require two args in order, such as -framework AVFoundation will be stored as a tuple. ++ internal_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet() ++ external_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet() ++ gi_includes: OrderedSet[str] = OrderedSet() + deps = mesonlib.listify(deps) ++ depends = list(depends) + + for dep in deps: + if isinstance(dep, Dependency): +@@ -427,21 +434,20 @@ class GnomeModule(ExtensionModule): + cflags.update(state.get_include_args(dep.include_directories)) + for lib in dep.libraries: + if isinstance(lib, build.SharedLibrary): +- internal_ldflags.update(self._get_link_args(state, lib, depends, include_rpath)) +- libdepflags = self._get_dependencies_flags(lib.get_external_deps(), state, depends, include_rpath, +- use_gir_args, True) ++ _ld, depends = self._get_link_args(state, lib, depends, include_rpath) ++ internal_ldflags.update(_ld) ++ libdepflags = self._get_dependencies_flags_raw(lib.get_external_deps(), state, depends, include_rpath, ++ use_gir_args) + cflags.update(libdepflags[0]) + internal_ldflags.update(libdepflags[1]) + external_ldflags.update(libdepflags[2]) +- external_ldflags_nodedup += libdepflags[3] +- gi_includes.update(libdepflags[4]) +- extdepflags = self._get_dependencies_flags(dep.ext_deps, state, depends, include_rpath, +- use_gir_args, True) ++ gi_includes.update(libdepflags[3]) ++ extdepflags = self._get_dependencies_flags_raw(dep.ext_deps, state, depends, include_rpath, ++ use_gir_args) + cflags.update(extdepflags[0]) + internal_ldflags.update(extdepflags[1]) + external_ldflags.update(extdepflags[2]) +- external_ldflags_nodedup += extdepflags[3] +- gi_includes.update(extdepflags[4]) ++ gi_includes.update(extdepflags[3]) + for source in dep.sources: + if isinstance(source, GirTarget): + gi_includes.update([os.path.join(state.environment.get_build_dir(), +@@ -469,7 +475,7 @@ class GnomeModule(ExtensionModule): + # If it's a framework arg, slurp the framework name too + # to preserve the order of arguments + if lib == '-framework': +- external_ldflags_nodedup += [lib, next(ldflags)] ++ external_ldflags.update([(lib, next(ldflags))]) + else: + external_ldflags.update([lib]) + elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): +@@ -480,21 +486,43 @@ class GnomeModule(ExtensionModule): + continue + + if use_gir_args and self._gir_has_option('--extra-library'): +- def fix_ldflags(ldflags): +- fixed_ldflags = OrderedSet() ++ def fix_ldflags(ldflags: T.Iterable[T.Union[str, T.Tuple[str, str]]]) -> OrderedSet[T.Union[str, T.Tuple[str, str]]]: ++ fixed_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet() + for ldflag in ldflags: +- if ldflag.startswith("-l"): ++ if isinstance(ldflag, str) and ldflag.startswith("-l"): + ldflag = ldflag.replace('-l', '--extra-library=', 1) + fixed_ldflags.add(ldflag) + return fixed_ldflags + internal_ldflags = fix_ldflags(internal_ldflags) + external_ldflags = fix_ldflags(external_ldflags) +- if not separate_nodedup: +- external_ldflags.update(external_ldflags_nodedup) +- return cflags, internal_ldflags, external_ldflags, gi_includes +- else: +- return cflags, internal_ldflags, external_ldflags, external_ldflags_nodedup, gi_includes ++ return cflags, internal_ldflags, external_ldflags, gi_includes, depends ++ ++ def _get_dependencies_flags( ++ self, deps, ++ state, ++ depends, ++ include_rpath: bool = False, ++ use_gir_args: bool = False, ++ ) -> T.Tuple[OrderedSet[str], T.List[str], T.List[str], OrderedSet[str], ++ T.List]: ++ ++ cflags, internal_ldflags_raw, external_ldflags_raw, gi_includes, depends = self._get_dependencies_flags_raw(deps, state, depends, include_rpath, use_gir_args) ++ internal_ldflags: T.List[str] = [] ++ external_ldflags: T.List[str] = [] ++ ++ # Extract non-deduplicable argument groups out of the tuples. ++ for ldflag in internal_ldflags_raw: ++ if isinstance(ldflag, str): ++ internal_ldflags.append(ldflag) ++ else: ++ internal_ldflags.extend(ldflag) ++ for ldflag in external_ldflags_raw: ++ if isinstance(ldflag, str): ++ external_ldflags.append(ldflag) ++ else: ++ external_ldflags.extend(ldflag) + ++ return cflags, internal_ldflags, external_ldflags, gi_includes, depends + def _unwrap_gir_target(self, girtarget, state): + if not isinstance(girtarget, (build.Executable, build.SharedLibrary, + build.StaticLibrary)): +@@ -875,7 +903,7 @@ class GnomeModule(ExtensionModule): + # ldflags will be misinterpreted by gir scanner (showing + # spurious dependencies) but building GStreamer fails if they + # are not used here. +- dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes = \ ++ dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes, depends = \ + self._get_dependencies_flags(deps, state, depends, use_gir_args=True) + scan_cflags = [] + scan_cflags += list(self._get_scanner_cflags(cflags)) +@@ -1170,7 +1198,7 @@ class GnomeModule(ExtensionModule): + deps = extract_as_list(kwargs, 'dependencies') + cflags = [] + cflags.extend(mesonlib.stringlistify(kwargs.pop('c_args', []))) +- deps_cflags, internal_ldflags, external_ldflags, gi_includes = \ ++ deps_cflags, internal_ldflags, external_ldflags, gi_includes, depends = \ + self._get_dependencies_flags(deps, state, depends, include_rpath=True) + inc_dirs = mesonlib.extract_as_list(kwargs, 'include_directories') + for incd in inc_dirs: From 3186c367cea0b0b23748f4b9620eac5d6a075049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihai-Drosi=20C=C3=A2ju?= Date: Sat, 9 Oct 2021 10:07:54 +0300 Subject: [PATCH 381/382] nixos/waydroid: Misc fixes * With the upgrade to waydroid to 1.2.0, dependencies that previously were shipped in the service's path have been moved to the waydroid package. * Make sure /var/lib/misc exists when starting waydroid. As required by dnsmasq --- nixos/modules/virtualisation/waydroid.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix index 4fc798ff39f..2c0b658948d 100644 --- a/nixos/modules/virtualisation/waydroid.nix +++ b/nixos/modules/virtualisation/waydroid.nix @@ -56,8 +56,6 @@ in wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ getent iptables iproute kmod nftables util-linux which ]; - unitConfig = { ConditionPathExists = "/var/lib/waydroid/lxc/waydroid"; }; @@ -68,6 +66,10 @@ in ExecStopPost = "${pkgs.waydroid}/bin/waydroid session stop"; }; }; + + systemd.tmpfiles.rules = [ + "d /var/lib/misc 0755 root root -" # for dnsmasq.leases + ]; }; } From fc8fa47cdebe1cd63ba36bafe85115db85b2a7fb Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 11 Mar 2022 10:36:54 +0000 Subject: [PATCH 382/382] podman-tui: 0.1.0 -> 0.2.0 --- .../virtualization/podman-tui/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index cfeee8a8718..7a8ed6fed28 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -4,17 +4,20 @@ , buildGoModule , btrfs-progs , gpgme +, libassuan , lvm2 +, testVersion +, podman-tui }: buildGoModule rec { pname = "podman-tui"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - sha256 = "sha256-qPQSu6l1WkX6sddVr5h1DqKQCyw6vy8S6lXC/ZO4DL8="; + sha256 = "sha256-y5bFr31CQ4JES6tjvThyy7qmoKFC59uwtDMG5r+r8K4="; }; vendorSha256 = null; @@ -24,12 +27,17 @@ buildGoModule rec { buildInputs = [ btrfs-progs gpgme + libassuan lvm2 ]; ldflags = [ "-s" "-w" ]; - subPackages = [ "." ]; + passthru.tests.version = testVersion { + package = podman-tui; + command = "podman-tui version"; + version = "v${version}"; + }; meta = with lib; { homepage = "https://github.com/containers/podman-tui";