From 09abb91d144afc26689d557afa0933e319b6eda6 Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Thu, 15 Oct 2020 12:14:59 -0700 Subject: [PATCH 001/505] buildMaven: Update buildMaven to pure Nix Change the code that builds the maven repository to one using pure nix rather than a bash script. --- pkgs/build-support/build-maven.nix | 85 ++++++++++++++++-------------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix index f47e3ebc61c2..7ac8afdde225 100644 --- a/pkgs/build-support/build-maven.nix +++ b/pkgs/build-support/build-maven.nix @@ -1,52 +1,60 @@ -{ stdenv, maven, runCommand, writeText, fetchurl, lib, requireFile }: -/* Takes an info file generated by mvn2nix - * (https://github.com/NixOS/mvn2nix-maven-plugin) and builds the maven - * project with it. - * - * repo: A local maven repository with the project's dependencies. - * - * settings: A settings.xml to pass to maven to use the repo. - * - * build: A simple build derivation that uses mvn compile and package to build - * the project. - */ -infoFile: let +{ stdenv, maven, runCommand, writeText, fetchurl, lib, requireFile, linkFarm }: +# Takes an info file generated by mvn2nix +# (https://github.com/NixOS/mvn2nix-maven-plugin) and builds the maven +# project with it. +# +# repo: A local maven repository with the project's dependencies. +# +# settings: A settings.xml to pass to maven to use the repo. +# +# build: A simple build derivation that uses mvn compile and package to build +# the project. +# +# @example +# project = pkgs.buildMaven ./project-info.json +infoFile: +let info = lib.importJSON infoFile; - script = writeText "build-maven-repository.sh" '' - ${lib.concatStrings (map (dep: let + dependencies = lib.flatten (map (dep: + let inherit (dep) sha1 groupId artifactId version metadata repository-id; - versionDir = dep.unresolved-version or version; authenticated = dep.authenticated or false; url = dep.url or ""; - fetch = if (url != "") then ((if authenticated then requireFile else fetchurl) { - inherit url sha1; - }) else ""; + fetch = if (url != "") then + ((if authenticated then requireFile else fetchurl) { + inherit url sha1; + }) + else + ""; fetchMetadata = (if authenticated then requireFile else fetchurl) { inherit (metadata) url sha1; }; - in '' - dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${versionDir} - mkdir -p $dir - ${lib.optionalString (fetch != "") '' - ln -sv ${fetch} $dir/${fetch.name} - ''} - ${lib.optionalString (dep ? metadata) '' - ln -svf ${fetchMetadata} $dir/maven-metadata-${repository-id}.xml - ${lib.optionalString (fetch != "") '' - ln -sv ${fetch} $dir/$(echo ${fetch.name} | sed 's|${version}|${dep.unresolved-version}|') - ''} - ''} - '') info.dependencies)} - ''; + layout = "${ + builtins.replaceStrings [ "." ] [ "/" ] groupId + }/${artifactId}/${versionDir}"; + in lib.optional (url != "") { + layout = "${layout}/${fetch.name}"; + drv = fetch; + } ++ lib.optionals (dep ? metadata) ([{ + layout = "${layout}/maven-metadata-${repository-id}.xml"; + drv = fetchMetadata; + }] ++ lib.optional (fetch != "") { + layout = "${layout}/${ + builtins.replaceStrings [ version ] [ dep.unresolved-version ] + fetch.name + }"; + drv = fetch; + })) info.dependencies); - repo = runCommand "maven-repository" {} '' - bash ${script} - ''; + repo = linkFarm "maven-repository" (lib.forEach dependencies (dependency: { + name = dependency.layout; + path = dependency.drv; + })); settings = writeText "settings.xml" '' Date: Sat, 24 Sep 2022 12:28:11 +0100 Subject: [PATCH 002/505] lib.types.unspecified: Make name match attribute name again @Infinisil: This isn't right, the name shouldn't be changed, but instead a description should be added https://github.com/NixOS/nixpkgs/pull/191353#discussion_r978983401 --- lib/types.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 3750ba965558..061c17e010bc 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -250,7 +250,8 @@ rec { }; unspecified = mkOptionType { - name = "unspecified value"; + name = "unspecified"; + description = "unspecified value"; descriptionClass = "noun"; }; From 9984d87f051c90ebb7af035813a4f88bc1394cc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 20:40:29 +0000 Subject: [PATCH 003/505] gsasl: 2.0.1 -> 2.2.0 --- pkgs/development/libraries/gsasl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 2f990a3cbe64..cbfddde09a02 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gsasl"; - version = "2.0.1"; + version = "2.2.0"; src = fetchurl { url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz"; - sha256 = "sha256-Mix1QgCIQbzYukrgkzsiAhHRkKe1anDdYfZVbezAG3o="; + sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k="; }; buildInputs = [ libidn libkrb5 ]; From c800d3fc4002c4034558699079cf9608e3c7c981 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 1 Oct 2022 01:21:20 +0200 Subject: [PATCH 004/505] python3Packages.sphinx-basic-ng: 0.0.1.a12 -> 1.0.0.beta1 https://github.com/pradyunsg/sphinx-basic-ng/releases/tag/1.0.0.beta1 --- .../python-modules/sphinx-basic-ng/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/pkgs/development/python-modules/sphinx-basic-ng/default.nix index e6da481b9671..e7f17aac9217 100644 --- a/pkgs/development/python-modules/sphinx-basic-ng/default.nix +++ b/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -2,30 +2,21 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , sphinx }: buildPythonPackage rec { pname = "sphinx-basic-ng"; - version = "0.0.1.a12"; + version = "1.0.0.beta1"; disable = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pradyunsg"; repo = "sphinx-basic-ng"; rev = version; - sha256 = "sha256-3/a/xHPNO96GEMLgWGTLdFoojVsjNyxYgY1gAZr75S0="; + sha256 = "sha256-Zh9KvKs4js+AVSfIk0pAj6Kzq/O2m/MGTF+HCwYJTXk="; }; - patches = [ - (fetchpatch { - name = "fix-import-error.patch"; - url = "https://github.com/pradyunsg/sphinx-basic-ng/pull/32/commits/323a0085721b908aa11bc3c36c51e16f517ee023.patch"; - sha256 = "sha256-/G1wLG/08u2s3YENSKSYekLrV1fUkxDAlxc3crTQNHk="; - }) - ]; - propagatedBuildInputs = [ sphinx ]; From bc8d6d8f968fcc37b6495526b805e0de18f9f849 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 9 Oct 2022 00:00:18 +0200 Subject: [PATCH 005/505] nixos/networkd: `DHCPv6PrefixDelegation` -> `DHCPPrefixDelegation` Adapt to changes introduced in Systemd 250: > The [DHCPv6PrefixDelegation] section in .network file is renamed to > [DHCPPrefixDelegation], as now the prefix delegation is also > supported with DHCPv4 protocol by enabling the Use6RD= setting. Replaces the `dhcpV6PrefixDelegationConfig` with `dhcpPrefixDelegationConfig` and throws an error if the old option is used. Also adapt the respective IPv6 prefix delegation test. --- nixos/modules/system/boot/networkd.nix | 26 +++++++++++++------ ...ystemd-networkd-ipv6-prefix-delegation.nix | 2 +- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index cb60117f0eb8..7b6739e62d6a 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -526,7 +526,7 @@ let "IPv6ProxyNDP" "IPv6ProxyNDPAddress" "IPv6SendRA" - "DHCPv6PrefixDelegation" + "DHCPPrefixDelegation" "IPv6MTUBytes" "Bridge" "Bond" @@ -569,7 +569,7 @@ let (assertValueOneOf "IPv4ProxyARP" boolValues) (assertValueOneOf "IPv6ProxyNDP" boolValues) (assertValueOneOf "IPv6SendRA" boolValues) - (assertValueOneOf "DHCPv6PrefixDelegation" boolValues) + (assertValueOneOf "DHCPPrefixDelegation" boolValues) (assertByteFormat "IPv6MTUBytes") (assertValueOneOf "ActiveSlave" boolValues) (assertValueOneOf "PrimarySlave" boolValues) @@ -766,15 +766,20 @@ let (assertInt "IAID") ]; - sectionDHCPv6PrefixDelegation = checkUnitConfig "DHCPv6PrefixDelegation" [ + sectionDHCPPrefixDelegation = checkUnitConfig "DHCPPrefixDelegation" [ (assertOnlyFields [ + "UplinkInterface" "SubnetId" "Announce" "Assign" "Token" + "ManageTemporaryAddress" + "RouteMetric" ]) (assertValueOneOf "Announce" boolValues) (assertValueOneOf "Assign" boolValues) + (assertValueOneOf "ManageTemporaryAddress" boolValues) + (assertRange "RouteMetric" 0 4294967295) ]; sectionIPv6AcceptRA = checkUnitConfig "IPv6AcceptRA" [ @@ -1338,12 +1343,17 @@ let }; dhcpV6PrefixDelegationConfig = mkOption { + visible = false; + apply = _: throw "The option `systemd.network.networks..dhcpV6PrefixDelegationConfig` has been renamed to `systemd.network.networks..dhcpPrefixDelegationConfig`."; + }; + + dhcpPrefixDelegationConfig = mkOption { default = {}; example = { SubnetId = "auto"; Announce = true; }; - type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPv6PrefixDelegation; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPPrefixDelegation; description = lib.mdDoc '' Each attribute in this set specifies an option in the - `[DHCPv6PrefixDelegation]` section of the unit. See + `[DHCPPrefixDelegation]` section of the unit. See {manpage}`systemd.network(5)` for details. ''; }; @@ -1789,9 +1799,9 @@ let [DHCPv6] ${attrsToSection def.dhcpV6Config} '' - + optionalString (def.dhcpV6PrefixDelegationConfig != { }) '' - [DHCPv6PrefixDelegation] - ${attrsToSection def.dhcpV6PrefixDelegationConfig} + + optionalString (def.dhcpPrefixDelegationConfig != { }) '' + [DHCPPrefixDelegation] + ${attrsToSection def.dhcpPrefixDelegationConfig} '' + optionalString (def.ipv6AcceptRAConfig != { }) '' [IPv6AcceptRA] diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 37a89fc21e44..4e04617acd6e 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -176,7 +176,7 @@ import ./make-test-python.nix ({pkgs, ...}: { IPv6AcceptRA = false; # Delegate prefixes from the DHCPv6 PD pool. - DHCPv6PrefixDelegation = true; + DHCPPrefixDelegation = true; IPv6SendRA = true; }; From 036489ffaa477774a0cfad0377598aaf3120aa58 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 9 Oct 2022 00:14:53 +0200 Subject: [PATCH 006/505] nixos/networkd: adapt `dhcpV6Config` * Remove `ForceDHCPv6PDOtherInformation=` * Add a missing `WithoutRA=` option Systemd 250: > The ForceDHCPv6PDOtherInformation= setting in the [DHCPv6] section > has been removed. Please use the WithoutRA= and UseDelegatedPrefix= > settings in the [DHCPv6] section and the DHCPv6Client= setting in the > [IPv6AcceptRA] section to control when the DHCPv6 client is started > and how the delegated prefixes are handled by the DHCPv6 client. --- nixos/modules/system/boot/networkd.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 7b6739e62d6a..ad6c95257ad1 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -745,7 +745,6 @@ let "MUDURL" "RequestOptions" "SendVendorOption" - "ForceDHCPv6PDOtherInformation" "PrefixDelegationHint" "WithoutRA" "SendOption" @@ -760,8 +759,7 @@ let (assertValueOneOf "UseNTP" boolValues) (assertInt "RouteMetric") (assertValueOneOf "RapidCommit" boolValues) - (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) - (assertValueOneOf "WithoutRA" ["solicit" "information-request"]) + (assertValueOneOf "WithoutRA" ["no" "solicit" "information-request"]) (assertRange "SendOption" 1 65536) (assertInt "IAID") ]; From 4367b782bc0371702ec398256d68a9e43b95decc Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 9 Oct 2022 00:46:33 +0200 Subject: [PATCH 007/505] nixos/networkd: deprecate `IPv6Token=` > The IPv6Token= section in the [Network] section is deprecated, and >> the [IPv6AcceptRA] section gained the Token= setting for its >> replacement. The [IPv6Prefix] section also gained the Token= setting. >> The Token= setting gained 'eui64' mode to explicitly configure an >> address with the EUI64 algorithm based on the interface MAC address. >> The 'prefixstable' mode can now optionally take a secret key. The >> Token= setting in the [DHCPPrefixDelegation] section now supports all >> algorithms supported by the same settings in the other sections. --- nixos/modules/system/boot/networkd.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index ad6c95257ad1..2ec238d9275f 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -501,7 +501,6 @@ let "LinkLocalAddressing" "IPv4LLRoute" "DefaultRouteOnDevice" - "IPv6Token" "LLMNR" "MulticastDNS" "DNSOverTLS" @@ -795,6 +794,10 @@ let "RouteAllowList" "DHCPv6Client" "RouteMetric" + "UseMTU" + "UseGateway" + "UseRoutePrefix" + "Token" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) @@ -877,6 +880,7 @@ let "Prefix" "PreferredLifetimeSec" "ValidLifetimeSec" + "Token" ]) (assertValueOneOf "AddressAutoconfiguration" boolValues) (assertValueOneOf "OnLink" boolValues) From 4f442dde0ec8412d7eeb024dcb568620787901b3 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 9 Oct 2022 00:27:52 +0200 Subject: [PATCH 008/505] nixos/networkd: add new options Systemd 250: > DHCPv4 client support in systemd-networkd learnt a new Label= option > for configuring the address label to apply to configure IPv4 > addresses. > The [IPv6AcceptRA] section of .network files gained support for a new > UseMTU= setting that may be used to control whether to apply the > announced MTU settings to the local interface. > The [DHCPv4] section in .network file gained a new Use6RD= boolean > setting to control whether the DHCPv4 client request and process the > DHCP 6RD option. > The [DHCPv6] section in .network file gained a new setting > UseDelegatedPrefix= to control whether the delegated prefixes will be > propagated to the downstream interfaces. > The [IPv6AcceptRA] section of .network files now understands two new > settings UseGateway=/UseRoutePrefix= for explicitly configuring > whether to use the relevant fields from the IPv6 Router Advertisement > records. > The [RoutingPolicyRule] section of .network file gained a new > SuppressInterfaceGroup= setting. > The IgnoreCarrierLoss= setting in the [Network] section of .network > files now allows a duration to be specified, controlling how long to > wait before reacting to carrier loss. Systemd 246: > systemd-networkd's [DHCPv4] section gained a new setting UseGateway= > which may be used to turn off use of the gateway information provided > by the DHCP lease. A new FallbackLeaseLifetimeSec= setting may be > used to configure how to process leases that lack a lifetime option. --- nixos/modules/system/boot/networkd.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 2ec238d9275f..a9b81dd116bb 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -573,7 +573,6 @@ let (assertValueOneOf "ActiveSlave" boolValues) (assertValueOneOf "PrimarySlave" boolValues) (assertValueOneOf "ConfigureWithoutCarrier" boolValues) - (assertValueOneOf "IgnoreCarrierLoss" boolValues) (assertValueOneOf "KeepConfiguration" (boolValues ++ ["static" "dhcp-on-stop" "dhcp"])) ]; @@ -618,6 +617,7 @@ let "User" "SuppressPrefixLength" "Type" + "SuppressInterfaceGroup" ]) (assertInt "TypeOfService") (assertRange "TypeOfService" 0 255) @@ -631,6 +631,7 @@ let (assertInt "SuppressPrefixLength") (assertRange "SuppressPrefixLength" 0 128) (assertValueOneOf "Type" ["blackhole" "unreachable" "prohibit"]) + (assertRange "SuppressInterfaceGroup" 0 2147483647) ]; sectionRoute = checkUnitConfig "Route" [ @@ -710,6 +711,9 @@ let "BlackList" "RequestOptions" "SendOption" + "FallbackLeaseLifetimeSec" + "Label" + "Use6RD" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "RoutesToDNS" boolValues) @@ -732,6 +736,8 @@ let (assertPort "ListenPort") (assertValueOneOf "SendRelease" boolValues) (assertValueOneOf "SendDecline" boolValues) + (assertValueOneOf "FallbackLeaseLifetimeSec" ["forever" "infinity"]) + (assertValueOneOf "Use6RD" boolValues) ]; sectionDHCPv6 = checkUnitConfig "DHCPv6" [ @@ -752,6 +758,7 @@ let "DUIDType" "DUIDRawData" "IAID" + "UseDelegatedPrefix" ]) (assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseDNS" boolValues) @@ -761,6 +768,7 @@ let (assertValueOneOf "WithoutRA" ["no" "solicit" "information-request"]) (assertRange "SendOption" 1 65536) (assertInt "IAID") + (assertValueOneOf "UseDelegatedPrefix" boolValues) ]; sectionDHCPPrefixDelegation = checkUnitConfig "DHCPPrefixDelegation" [ @@ -805,6 +813,9 @@ let (assertValueOneOf "UseAutonomousPrefix" boolValues) (assertValueOneOf "UseOnLinkPrefix" boolValues) (assertValueOneOf "DHCPv6Client" (boolValues ++ ["always"])) + (assertValueOneOf "UseMTU" boolValues) + (assertValueOneOf "UseGateway" boolValues) + (assertValueOneOf "UseRoutePrefix" boolValues) ]; sectionDHCPServer = checkUnitConfig "DHCPServer" [ From 1d6b5d368e9efdefceeecd93a73d965bf0edf61c Mon Sep 17 00:00:00 2001 From: BattleCh1cken Date: Mon, 10 Oct 2022 11:04:59 -0400 Subject: [PATCH 009/505] Added BattleCh1cken to the maintainer list. --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2195778492eb..0428e656783e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1541,6 +1541,12 @@ githubId = 576355; name = "Bas van Dijk"; }; + BattleCh1cken = { + email = "BattleCh1cken@larkov.de"; + github = "BattleCh1cken"; + githubId = 75806385; + name = "Felix Hass"; + }; Baughn = { email = "sveina@gmail.com"; github = "Baughn"; From 3f2a81f1ba8fc6f6ea2a864528493bade28438d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Oct 2022 19:24:59 +0000 Subject: [PATCH 010/505] fheroes2: 0.9.19 -> 0.9.20 --- pkgs/games/fheroes2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 673c7d3e6d37..5f3bb86d51d7 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.19"; + version = "0.9.20"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-GLF5OXPEc1V1r9INbEdIM17tm7pKq1ZuOuShtAnqXjM="; + sha256 = "sha256-IF8ESbMDvermghBGLMq+GdE67Hg5XedX0REGGnWQhRA="; }; buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; From dee4fee1c7beeeaea4a27a3c88bf5cf0eed761ff Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:36:21 +0000 Subject: [PATCH 011/505] =?UTF-8?q?rocm-smi:=205.2.3=20=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/system/rocm-smi/cmake.patch | 89 ++++++++++++++++++++++++++ pkgs/tools/system/rocm-smi/default.nix | 27 ++------ 2 files changed, 93 insertions(+), 23 deletions(-) create mode 100644 pkgs/tools/system/rocm-smi/cmake.patch diff --git a/pkgs/tools/system/rocm-smi/cmake.patch b/pkgs/tools/system/rocm-smi/cmake.patch new file mode 100644 index 000000000000..2634ea46a1f8 --- /dev/null +++ b/pkgs/tools/system/rocm-smi/cmake.patch @@ -0,0 +1,89 @@ +diff --git a/rocm_smi-backward-compat.cmake b/rocm_smi-backward-compat.cmake +index aa8fd9c..59afce5 100644 +--- a/rocm_smi-backward-compat.cmake ++++ b/rocm_smi-backward-compat.cmake +@@ -72,7 +72,12 @@ function(generate_wrapper_header) + set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") + #set #include statement + get_filename_component(file_name ${header_file} NAME) +- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${ROCM_SMI}/${file_name}\"\n") ++ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") ++ else() ++ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") ++ endif() ++ set(include_statements "${include_statements}#include \"${include_dir}/${ROCM_SMI}/${file_name}\"\n") + configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${RSMI_WRAPPER_INC_DIR}/${file_name}) + unset(include_guard) + unset(include_statements) +@@ -90,7 +95,12 @@ function(generate_wrapper_header) + set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") + #set #include statement + get_filename_component(file_name ${header_file} NAME) +- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${OAM_TARGET_NAME}/${file_name}\"\n") ++ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") ++ else() ++ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") ++ endif() ++ set(include_statements "${include_statements}#include \"${include_dir}/${OAM_TARGET_NAME}/${file_name}\"\n") + configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${OAM_WRAPPER_INC_DIR}/${file_name}) + unset(include_guard) + unset(include_statements) +@@ -123,11 +133,16 @@ function(create_library_symlink) + set(library_files "${LIB_RSMI}") + endif() + ++ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) ++ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") ++ else() ++ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") ++ endif() + foreach(file_name ${library_files}) + add_custom_target(link_${file_name} ALL + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E create_symlink +- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) ++ ${install_libdir}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) + endforeach() + + file(MAKE_DIRECTORY ${OAM_WRAPPER_LIB_DIR}) +@@ -151,11 +166,16 @@ function(create_library_symlink) + set(library_files "${LIB_OAM}") + endif() + ++ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) ++ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") ++ else() ++ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") ++ endif() + foreach(file_name ${library_files}) + add_custom_target(link_${file_name} ALL + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E create_symlink +- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) ++ ${install_libdir}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) + endforeach() + + endfunction() +diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt +index c594eeb..d3ed39d 100755 +--- a/rocm_smi/CMakeLists.txt ++++ b/rocm_smi/CMakeLists.txt +@@ -105,10 +105,15 @@ endif () + #file reorganization changes + #rocm_smi.py moved to libexec/rocm_smi. so creating rocm-smi symlink + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) ++if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBEXECDIR}) ++ set(install_libexecdir "${CMAKE_INSTALL_LIBEXECDIR}") ++else() ++ set(install_libexecdir "../${CMAKE_INSTALL_LIBEXECDIR}") ++endif() + add_custom_target(link-rocm-smi ALL + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E create_symlink +- ../${CMAKE_INSTALL_LIBEXECDIR}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) ++ ${install_libexecdir}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) + + ## Add the install directives for the runtime library. + install(TARGETS ${ROCM_SMI_TARGET} diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 8f7859be7dcb..7f3f1ef03531 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,37 +2,18 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${version}"; - hash = "sha256-D3ZH6xJe2C9rUCsJPOf9QlStecU90/iYi4wrXVvPff0="; + hash = "sha256-UbGbkH2vhQ9gv3sSoG+mXap+MdcrP61TN5DcP5F/5nQ="; }; nativeBuildInputs = [ cmake wrapPython ]; - postPatch = '' - # Upstream ROCm is installed in an /opt directory. For this reason, - # it does not completely follow FHS layout, creating top-level - # rocm_smi, oam, and bindings top-level directories. Since rocm-smi - # is a package that is typically installed, we change the paths to - # follow FHS more closely. - - # rocm_smi libraries and headers go into lib and include. Bindings - # go into lib/rocm_smi/bindings. - substituteInPlace rocm_smi/CMakeLists.txt \ - --replace "DESTINATION rocm_smi/" "DESTINATION " \ - --replace "DESTINATION bindings" "DESTINATION lib/rocm_smi/bindings" \ - --replace "../rocm_smi/bindings/rsmiBindings.py" "../lib/rocm_smi/bindings/rsmiBindings.py" \ - --replace 'DESTINATION ''${ROCM_SMI}/' "DESTINATION " - - # oam libraries and headers go into lib and include. - substituteInPlace oam/CMakeLists.txt \ - --replace "DESTINATION oam/" "DESTINATION " \ - --replace 'DESTINATION ''${OAM_NAME}/' "DESTINATION " - ''; + patches = [ ./cmake.patch ]; postInstall = '' wrapPythonProgramsIn $out @@ -49,7 +30,7 @@ stdenv.mkDerivation rec { description = "System management interface for AMD GPUs supported by ROCm"; homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = [ "x86_64-linux" ]; }; } From 3bdbc120f80f25bdf5b808efc9c13c02eac0c97a Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:36:30 +0000 Subject: [PATCH 012/505] =?UTF-8?q?rocm-cmake:=205.2.0=20=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/tools/build-managers/rocm-cmake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 2526957ccbce..efd2e3a05e53 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - hash = "sha256-2YALk3G5BhrsXZZHjGSSuk8tCi5sNGuB2VB4uvozyZo="; + hash = "sha256-AOn3SLprHdeo2FwojQdhRAttUHuaWkO6WlymK8Q8lbc="; }; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ Flakebi ]; platforms = platforms.unix; }; } From 421b8086f0cc09778fb11d5d873eb17b5aedd240 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:36:39 +0000 Subject: [PATCH 013/505] =?UTF-8?q?rocm-thunk:=205.2.1=20=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/rocm-thunk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index c2a67a6f1462..d7add50386e7 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-iXhlEofPAQNxeZzDgdF1DdflIKfSI7rHGTqOybHnnHM="; + hash = "sha256-cM78Bx6uYsxhvdqSVNgmqOUYQnUJVCA7mNpRNNSFv6k="; }; preConfigure = '' @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; }; } From 79ef038e49d4dfe806bd3f20395cbe42dc48ccba Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:36:50 +0000 Subject: [PATCH 014/505] =?UTF-8?q?rocm-runtime:=205.2.0=20=E2=86=92=205.3?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/rocm-runtime/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 36d178ea0433..563632b9d7f5 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -4,8 +4,10 @@ , writeScript , addOpenGLRunpath , cmake +, pkg-config , xxd , elfutils +, libdrm , llvm , numactl , rocm-device-libs @@ -13,28 +15,33 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-TY0YPgNzxBLXAj7fncLQ01cSJyydveOLHrimCmLS32o="; + hash = "sha256-26E7vA2JlC50zmpaQfDrFMlgjAqmfTdp9/A8g5caDqI="; }; sourceRoot = "source/src"; - nativeBuildInputs = [ cmake xxd ]; + nativeBuildInputs = [ cmake pkg-config xxd ]; - buildInputs = [ elfutils llvm numactl ]; + buildInputs = [ elfutils libdrm llvm numactl ]; - cmakeFlags = [ - "-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode" - "-DCMAKE_PREFIX_PATH=${rocm-thunk}" - ]; + cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ]; postPatch = '' patchShebangs image/blit_src/create_hsaco_ascii_file.sh + patchShebangs core/runtime/trap_handler/create_trap_handler_header.sh + + substituteInPlace CMakeLists.txt \ + --replace 'hsa/include/hsa' 'include/hsa' + + # We compile clang before rocm-device-libs, so patch it in afterwards + substituteInPlace image/blit_src/CMakeLists.txt \ + --replace '-cl-denorms-are-zero' '-cl-denorms-are-zero --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode' ''; fixupPhase = '' @@ -52,6 +59,6 @@ stdenv.mkDerivation rec { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; }; } From 8ec49a85c560892f324da9265b7459da0636f772 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:36:59 +0000 Subject: [PATCH 015/505] =?UTF-8?q?rocm-opencl-runtime:=205.2.1=20?= =?UTF-8?q?=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/rocm-opencl-runtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 699f00449cc7..fc5f8fba5250 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-Mk7Wssz34Uxtb9PRIEGrTn/tXtqxLMrq0damA/p/DsY="; + hash = "sha256-QvAF25Zfq9d1M/KIsr2S+Ggxzqw/MQ2OVcm9ZNfjTa8="; }; nativeBuildInputs = [ cmake rocm-cmake ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ acowley lovesegfault ]; + maintainers = with maintainers; [ acowley lovesegfault Flakebi ]; platforms = platforms.linux; }; } From 1d6f9948cb24ee92fdc43798179be21454179874 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:37:09 +0000 Subject: [PATCH 016/505] =?UTF-8?q?rocm-device-libs:=205.2.0=20=E2=86=92?= =?UTF-8?q?=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/rocm-device-libs/cmake.patch | 43 +++++++++++++++++++ .../libraries/rocm-device-libs/default.nix | 8 ++-- 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/rocm-device-libs/cmake.patch diff --git a/pkgs/development/libraries/rocm-device-libs/cmake.patch b/pkgs/development/libraries/rocm-device-libs/cmake.patch new file mode 100644 index 000000000000..500ff37a9905 --- /dev/null +++ b/pkgs/development/libraries/rocm-device-libs/cmake.patch @@ -0,0 +1,43 @@ +diff --git a/cmake/Packages.cmake b/cmake/Packages.cmake +index 07c60eb..c736b3e 100644 +--- a/cmake/Packages.cmake ++++ b/cmake/Packages.cmake +@@ -12,24 +12,29 @@ set_target_properties(${target} PROPERTIES + IMPORTED_LOCATION \"${target_path}\")") + endforeach() + configure_file(AMDDeviceLibsConfig.cmake.in +- ${PACKAGE_PREFIX}/AMDDeviceLibsConfig.cmake ++ lib/cmake/AMDDeviceLibs/AMDDeviceLibsConfig.cmake + @ONLY) + + + set(install_path_suffix "amdgcn/bitcode") + + # Generate the install-tree package. +-# We do not know the absolute path to the intall tree until we are installed, +-# so we calculate it dynamically in AMD_DEVICE_LIBS_PREFIX_CODE and use +-# relative paths in the target imports in AMD_DEVICE_LIBS_TARGET_CODE. +-set(AMD_DEVICE_LIBS_PREFIX_CODE " ++if(IS_ABSOLUTE "${CMAKE_INSTALL_PREFIX}") ++ set(AMD_DEVICE_LIBS_PREFIX_CODE "set(AMD_DEVICE_LIBS_PREFIX \"${CMAKE_INSTALL_PREFIX}\")") ++else() ++ # We do not know the absolute path to the install tree until we are installed, ++ # so we calculate it dynamically in AMD_DEVICE_LIBS_PREFIX_CODE and use ++ # relative paths in the target imports in AMD_DEVICE_LIBS_TARGET_CODE. ++ set(AMD_DEVICE_LIBS_PREFIX_CODE " + # Derive absolute install prefix from config file path. + get_filename_component(AMD_DEVICE_LIBS_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") +-string(REGEX REPLACE "/" ";" count "${PACKAGE_PREFIX}") +-foreach(p ${count}) +- set(AMD_DEVICE_LIBS_PREFIX_CODE "${AMD_DEVICE_LIBS_PREFIX_CODE} ++ string(REGEX REPLACE "/" ";" count "${PACKAGE_PREFIX}") ++ foreach(p ${count}) ++ set(AMD_DEVICE_LIBS_PREFIX_CODE "${AMD_DEVICE_LIBS_PREFIX_CODE} + get_filename_component(AMD_DEVICE_LIBS_PREFIX \"\${AMD_DEVICE_LIBS_PREFIX}\" PATH)") +-endforeach() ++ endforeach() ++endif() ++ + set(AMD_DEVICE_LIBS_TARGET_CODE) + foreach(target ${AMDGCN_LIB_LIST}) + get_target_property(target_name ${target} ARCHIVE_OUTPUT_NAME) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 08690f3fa450..c94e1f2753e0 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-TBCSznHyiaiOcBR9irybCnOgfqPiNNn4679PCQwrLhA="; + hash = "sha256-rKMe0B/pkDek/ZU37trnJNa8aqvlwxobPb1+VTx/bJU="; }; nativeBuildInputs = [ cmake ]; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { "-DCLANG=${clang}/bin/clang" ]; + patches = [ ./cmake.patch ]; + passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; } From 6bd359374957bae5df7ba8c4da83995b1fcfa3d4 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:37:19 +0000 Subject: [PATCH 017/505] =?UTF-8?q?rocm-comgr:=205.2.0=20=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/rocm-comgr/cmake.patch | 343 ++++++++++++------ .../libraries/rocm-comgr/default.nix | 7 +- 2 files changed, 245 insertions(+), 105 deletions(-) diff --git a/pkgs/development/libraries/rocm-comgr/cmake.patch b/pkgs/development/libraries/rocm-comgr/cmake.patch index 0c599e2403c5..ae966745171c 100644 --- a/pkgs/development/libraries/rocm-comgr/cmake.patch +++ b/pkgs/development/libraries/rocm-comgr/cmake.patch @@ -1,19 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index eac270a..27610ec 100644 +index 62b857b..d21c7f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -53,10 +53,6 @@ set(SOURCES - - if(COMGR_BUILD_SHARED_LIBS) - add_library(amd_comgr SHARED ${SOURCES}) -- # Windows doesn't have a strip utility, so CMAKE_STRIP won't be set. -- if((CMAKE_BUILD_TYPE STREQUAL "Release") AND NOT ("${CMAKE_STRIP}" STREQUAL "")) -- add_custom_command(TARGET amd_comgr POST_BUILD COMMAND ${CMAKE_STRIP} $) -- endif() - else() - add_library(amd_comgr STATIC ${SOURCES}) - endif() -@@ -141,8 +137,8 @@ if (UNIX) +@@ -147,8 +147,8 @@ if (UNIX) list(APPEND AMD_COMGR_PUBLIC_LINKER_OPTIONS -pthread) if (NOT APPLE AND COMGR_BUILD_SHARED_LIBS) configure_file( @@ -24,17 +13,7 @@ index eac270a..27610ec 100644 list(APPEND AMD_COMGR_PRIVATE_LINKER_OPTIONS "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/src/exportmap") # When building a shared library with -fsanitize=address we can't be -@@ -154,6 +150,9 @@ if (UNIX) - -Wl,--no-undefined) - endif() - endif() -+ -+ # Strip in release build -+ set_target_properties(amd_comgr PROPERTIES LINK_FLAGS_RELEASE -s) - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS - "/wd4244" #[[Suppress 'argument' : conversion from 'type1' to 'type2', possible loss of data]] -@@ -169,10 +168,6 @@ endif() +@@ -175,10 +175,6 @@ endif() # the shared header. list(APPEND AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS AMD_COMGR_EXPORT) @@ -45,100 +24,209 @@ index eac270a..27610ec 100644 include(bc2h) include(opencl_pch) include(DeviceLibs) -@@ -203,8 +198,11 @@ target_compile_definitions(amd_comgr - PRIVATE "${AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS}") - target_include_directories(amd_comgr - PUBLIC -- $ -- $) -+ $) -+ +@@ -212,10 +208,14 @@ target_include_directories(amd_comgr + $ + $) + +configure_file( + include/amd_comgr.h.in + include/amd_comgr.h @ONLY) - ++ set(AMD_COMGR_CONFIG_NAME amd_comgr-config.cmake) set(AMD_COMGR_TARGETS_NAME amd_comgr-targets.cmake) -@@ -220,29 +218,30 @@ if (NOT COMGR_BUILD_SHARED_LIBS) + set(AMD_COMGR_VERSION_NAME amd_comgr-config-version.cmake) +-set(AMD_COMGR_PACKAGE_PREFIX ${CMAKE_INSTALL_LIBDIR}/cmake/amd_comgr) ++set(AMD_COMGR_PACKAGE_PREFIX cmake/amd_comgr) + + # Generate the build-tree package. + set(AMD_COMGR_PREFIX_CODE) +@@ -226,13 +226,13 @@ if (NOT COMGR_BUILD_SHARED_LIBS) endif() set(AMD_COMGR_TARGETS_PATH - "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") --set(AMD_COMGR_VERSION_PATH ++ "${CMAKE_CURRENT_BINARY_DIR}/lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") + set(AMD_COMGR_VERSION_PATH - "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") --export(TARGETS amd_comgr ++ "${CMAKE_CURRENT_BINARY_DIR}/lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") + export(TARGETS amd_comgr - FILE "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") -+ "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") ++ FILE "lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" - "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" -+ ${AMD_COMGR_CONFIG_NAME} ++ "lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" @ONLY) --write_basic_package_version_file("${AMD_COMGR_VERSION_PATH}" -+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_VERSION_NAME}" + write_basic_package_version_file("${AMD_COMGR_VERSION_PATH}" VERSION "${amd_comgr_VERSION}" - COMPATIBILITY SameMajorVersion) - - install(TARGETS amd_comgr - EXPORT amd_comgr_export -- COMPONENT amd-comgr -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ COMPONENT amd-comgr) -+install(EXPORT amd_comgr_export -+ DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -+ FILE "${AMD_COMGR_TARGETS_NAME}") - - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/include/amd_comgr.h" - COMPONENT amd-comgr - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES -+ "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}" -+ "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_VERSION_NAME}" -+ COMPONENT amd-comgr -+ DESTINATION ${AMD_COMGR_PACKAGE_PREFIX}) - - install(FILES - "README.md" -@@ -251,37 +250,6 @@ install(FILES - COMPONENT amd-comgr - DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr) - --# Generate the install-tree package. --set(AMD_COMGR_PREFIX_CODE " --# Derive absolute install prefix from config file path. --get_filename_component(AMD_COMGR_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") +@@ -266,7 +266,7 @@ install(FILES + set(AMD_COMGR_PREFIX_CODE " + # Derive absolute install prefix from config file path. + get_filename_component(AMD_COMGR_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") -string(REGEX REPLACE "/" ";" count "${AMD_COMGR_PACKAGE_PREFIX}") --foreach(p ${count}) -- set(AMD_COMGR_PREFIX_CODE "${AMD_COMGR_PREFIX_CODE} --get_filename_component(AMD_COMGR_PREFIX \"\${AMD_COMGR_PREFIX}\" PATH)") --endforeach() -- --if (NOT COMGR_BUILD_SHARED_LIBS) -- string(APPEND AMD_COMGR_PREFIX_CODE "\ninclude(CMakeFindDependencyMacro)\n") -- string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(Clang REQUIRED)\n") -- string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(LLD REQUIRED)\n") --endif() -- --set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") --configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" -- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" -- @ONLY) --install(FILES -- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" -- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -- RENAME "${AMD_COMGR_CONFIG_NAME}") --install(EXPORT amd_comgr_export -- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -- FILE "${AMD_COMGR_TARGETS_NAME}") --install(FILES -- "${AMD_COMGR_VERSION_PATH}" -- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") -- - set(CLANG_LIBS - clangFrontendTool) ++string(REGEX REPLACE "/" ";" count "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}") + foreach(p ${count}) + set(AMD_COMGR_PREFIX_CODE "${AMD_COMGR_PREFIX_CODE} + get_filename_component(AMD_COMGR_PREFIX \"\${AMD_COMGR_PREFIX}\" PATH)") +@@ -278,20 +278,20 @@ if (NOT COMGR_BUILD_SHARED_LIBS) + string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(LLD REQUIRED)\n") + endif() +-set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") ++set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") + configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" +- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" ++ "${AMD_COMGR_CONFIG_NAME}.install" + @ONLY) + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" +- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}" + RENAME "${AMD_COMGR_CONFIG_NAME}") + install(EXPORT amd_comgr_export +- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}" + FILE "${AMD_COMGR_TARGETS_NAME}") + install(FILES + "${AMD_COMGR_VERSION_PATH}" +- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}") + + if(TARGET clangFrontendTool) + set(CLANG_LIBS +diff --git a/cmake/DeviceLibs.cmake b/cmake/DeviceLibs.cmake +index 27e9546..dfe1b57 100644 +--- a/cmake/DeviceLibs.cmake ++++ b/cmake/DeviceLibs.cmake +@@ -1,8 +1,7 @@ + set(INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) + + set(GEN_LIBRARY_INC_FILE ${INC_DIR}/libraries.inc) +- +-file(WRITE ${GEN_LIBRARY_INC_FILE} "// Automatically generated file; DO NOT EDIT.\n") ++set(GEN_LIBRARY_DEFS_INC_FILE ${INC_DIR}/libraries_defs.inc) + + # cmake does not provide a way to query targets produced by a project, + # so we have to make one up. Ordinarily, individual library target +@@ -23,6 +22,7 @@ if(NOT AMD_DEVICE_LIBS_TARGETS) + message(FATAL_ERROR "Could not find list of device libraries") + endif() + ++set(TARGETS_INCLUDES "") + foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) + set(header ${AMDGCN_LIB_TARGET}.inc) + +@@ -54,75 +54,52 @@ foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) + add_custom_target(${AMDGCN_LIB_TARGET}_header DEPENDS ${INC_DIR}/${header}) + add_dependencies(amd_comgr ${AMDGCN_LIB_TARGET}_header) + +- file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"${header}\"\n") ++ list(APPEND TARGETS_INCLUDES "#include \"${header}\"") ++endforeach() ++ ++list(JOIN TARGETS_INCLUDES "\n" TARGETS_INCLUDES) ++file(GENERATE OUTPUT ${GEN_LIBRARY_INC_FILE} CONTENT "${TARGETS_INCLUDES}") ++ ++foreach(OPENCL_VERSION 1.2 2.0) ++ string(REPLACE . _ OPENCL_UNDERSCORE_VERSION ${OPENCL_VERSION}) ++ add_custom_command(OUTPUT ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc ++ COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl${OPENCL_VERSION}-c.pch ++ ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc ++ opencl${OPENCL_UNDERSCORE_VERSION}_c ++ DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl${OPENCL_VERSION}-c.pch ++ COMMENT "Generating opencl${OPENCL_VERSION}-c.inc" ++ ) ++ set_property(DIRECTORY APPEND PROPERTY ++ ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc) ++ add_custom_target(opencl${OPENCL_VERSION}-c.inc_target DEPENDS ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc) ++ add_dependencies(amd_comgr opencl${OPENCL_VERSION}-c.inc_target) + endforeach() + +-add_custom_command(OUTPUT ${INC_DIR}/opencl1.2-c.inc +- COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.pch +- ${INC_DIR}/opencl1.2-c.inc +- opencl1_2_c +- DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.pch +- COMMENT "Generating opencl1.2-c.inc" +-) +-set_property(DIRECTORY APPEND PROPERTY +- ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl1.2-c.inc) +-add_custom_target(opencl1.2-c.inc_target DEPENDS ${INC_DIR}/opencl1.2-c.inc) +-add_dependencies(amd_comgr opencl1.2-c.inc_target) +-file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"opencl1.2-c.inc\"\n") +- +-add_custom_command(OUTPUT ${INC_DIR}/opencl2.0-c.inc +- COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.pch +- ${INC_DIR}/opencl2.0-c.inc +- opencl2_0_c +- DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.pch +- COMMENT "Generating opencl2.0-c.inc" +-) +-set_property(DIRECTORY APPEND PROPERTY +- ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl2.0-c.inc) +-add_custom_target(opencl2.0-c.inc_target DEPENDS ${INC_DIR}/opencl2.0-c.inc) +-add_dependencies(amd_comgr opencl2.0-c.inc_target) +-file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"opencl2.0-c.inc\"\n") +- +-# Generate function to select libraries for a given GFXIP number. +-file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"llvm/ADT/StringRef.h\"\n") +-file(APPEND ${GEN_LIBRARY_INC_FILE} +- "static std::tuple get_oclc_isa_version(llvm::StringRef gfxip) {") ++set(TARGETS_DEFS "") ++list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_TARGET\n#define AMD_DEVICE_LIBS_TARGET(t)\n#endif") ++list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_GFXIP\n#define AMD_DEVICE_LIBS_GFXIP(t, g)\n#endif") ++list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_FUNCTION\n#define AMD_DEVICE_LIBS_FUNCTION(t, f)\n#endif") ++list(APPEND TARGETS_DEFS "") + foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) ++ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_TARGET(${AMDGCN_LIB_TARGET})") ++ # Generate function to select libraries for a given GFXIP number. + if (${AMDGCN_LIB_TARGET} MATCHES "^oclc_isa_version_.+$") + string(REGEX REPLACE "^oclc_isa_version_(.+)$" "\\1" gfxip ${AMDGCN_LIB_TARGET}) +- file(APPEND ${GEN_LIBRARY_INC_FILE} +- "if (gfxip == \"${gfxip}\") return std::make_tuple(\"${AMDGCN_LIB_TARGET}.bc\", ${AMDGCN_LIB_TARGET}_lib, ${AMDGCN_LIB_TARGET}_lib_size);") ++ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_GFXIP(${AMDGCN_LIB_TARGET}, \"${gfxip}\")") + endif() +-endforeach() +-file(APPEND ${GEN_LIBRARY_INC_FILE} +- "return std::make_tuple(nullptr, nullptr, 0); }") +- +-# Generate function to select libraries for given feature. +-foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) ++ # Generate function to select libraries for given feature. + if (${AMDGCN_LIB_TARGET} MATCHES "^oclc_.*_on$") + string(REGEX REPLACE "^oclc_(.*)_on" "\\1" function ${AMDGCN_LIB_TARGET}) +- file(APPEND ${GEN_LIBRARY_INC_FILE} +- "static std::tuple get_oclc_${function}(bool on) { \ +- return std::make_tuple( \ +- on ? \"oclc_${function}_on_lib.bc\" : \"oclc_${function}_off_lib.bc\", \ +- on ? oclc_${function}_on_lib : oclc_${function}_off_lib, \ +- on ? oclc_${function}_on_lib_size : oclc_${function}_off_lib_size \ +- ); }") ++ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_FUNCTION(${AMDGCN_LIB_TARGET}, ${function})") + endif() + endforeach() + +-# Generate function yield all libraries. +-file(APPEND ${GEN_LIBRARY_INC_FILE} "\n#include \"llvm/ADT/ArrayRef.h\"\n") +-file(APPEND ${GEN_LIBRARY_INC_FILE} +- "llvm::ArrayRef> COMGR::getDeviceLibraries() { \ +- static std::tuple DeviceLibs[] = {") +-foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) +- file(APPEND ${GEN_LIBRARY_INC_FILE} +- "{\"${AMDGCN_LIB_TARGET}.bc\", llvm::StringRef(reinterpret_cast(${AMDGCN_LIB_TARGET}_lib), ${AMDGCN_LIB_TARGET}_lib_size)},") +-endforeach() +-file(APPEND ${GEN_LIBRARY_INC_FILE} +- "}; \ +- return DeviceLibs; \ +- }") ++list(APPEND TARGETS_DEFS "") ++list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_TARGET") ++list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_GFXIP") ++list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_FUNCTION") ++ ++list(JOIN TARGETS_DEFS "\n" TARGETS_DEFS) ++file(GENERATE OUTPUT ${GEN_LIBRARY_DEFS_INC_FILE} CONTENT "${TARGETS_DEFS}") + + include_directories(${INC_DIR}) diff --git a/cmake/bc2h.cmake b/cmake/bc2h.cmake index 146fe2b..9134985 100644 --- a/cmake/bc2h.cmake @@ -222,3 +310,56 @@ index 146fe2b..9134985 100644 add_executable(bc2h ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c) if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +diff --git a/src/comgr-device-libs.cpp b/src/comgr-device-libs.cpp +index 4d2b914..80786d1 100644 +--- a/src/comgr-device-libs.cpp ++++ b/src/comgr-device-libs.cpp +@@ -35,7 +35,7 @@ + + #include "comgr-device-libs.h" + #include "comgr.h" +-#include "libraries.inc" ++#include "comgr-libraries.h" + #include "llvm/ADT/StringSwitch.h" + #include + +diff --git a/src/comgr-libraries.h b/src/comgr-libraries.h +new file mode 100644 +index 0000000..3caa0a0 +--- /dev/null ++++ b/src/comgr-libraries.h +@@ -0,0 +1,34 @@ ++#include "libraries.inc" ++#include "opencl1.2-c.inc" ++#include "opencl2.0-c.inc" ++#include "llvm/ADT/StringRef.h" ++#include "llvm/ADT/ArrayRef.h" ++ ++static std::tuple get_oclc_isa_version(llvm::StringRef gfxip) { ++#define AMD_DEVICE_LIBS_GFXIP(target, target_gfxip) \ ++ if (gfxip == target_gfxip) return std::make_tuple(#target ".bc", target##_lib, target##_lib_size); ++#include "libraries_defs.inc" ++ ++ return std::make_tuple(nullptr, nullptr, 0); ++} ++ ++#define AMD_DEVICE_LIBS_FUNCTION(target, function) \ ++ static std::tuple get_oclc_##function(bool on) { \ ++ return std::make_tuple( \ ++ on ? "oclc_" #function "_on_lib.bc" : "oclc_" #function "_off_lib.bc", \ ++ on ? oclc_##function##_on_lib : oclc_##function##_off_lib, \ ++ on ? oclc_##function##_on_lib_size : oclc_##function##_off_lib_size \ ++ ); \ ++ } ++#include "libraries_defs.inc" ++ ++llvm::ArrayRef> COMGR::getDeviceLibraries() { ++ static std::tuple DeviceLibs[] = { ++#define AMD_DEVICE_LIBS_TARGET(target) \ ++ {#target ".bc", llvm::StringRef(reinterpret_cast(target##_lib), target##_lib_size)}, ++#include "libraries_defs.inc" ++ }; ++ return DeviceLibs; ++} ++ ++ diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index db9e012e4eec..e7f07380758b 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-5C5bRdrt3xZAlRgtiIRTMAuwsFvVM4Win96P5+Pf5ZM="; + hash = "sha256-LQyMhqcWm8zqt6138fnT7EOq/F8bG3Iuf04PTemVQmg="; }; sourceRoot = "source/lib/comgr"; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ clang rocm-device-libs llvm ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_C_COMPILER=${clang}/bin/clang" "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm" @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; } From 692bc4c5496219bf96ec275d5fb71f731661f213 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:37:29 +0000 Subject: [PATCH 018/505] =?UTF-8?q?rocclr:=205.2.3=20=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/rocclr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 4de1f3909e26..a9e254d9d349 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-DER6PBYXmZRgwFNVU5rpn87HrXMR+HnQf8cwHioUals="; + hash = "sha256-l14+l8FkiFmGuRZ9dyD/PEYH9nHVRRg1vMXMnVhg3K4="; }; patches = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "Source package of the Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; # rocclr seems to have some AArch64 ifdefs, but does not seem # to be supported yet by the build infrastructure. Recheck in # the future. From 4ee2665a6d9d7a04004054562abdfe4604aa8d17 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:37:38 +0000 Subject: [PATCH 019/505] =?UTF-8?q?rocminfo:=205.1.1=20=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/rocminfo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index a7f895f8917f..1761227045b7 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -7,13 +7,13 @@ # compilers to determine the desired target. , defaultTargets ? []}: stdenv.mkDerivation rec { - version = "5.1.1"; + version = "5.3.0"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; rev = "rocm-${version}"; - sha256 = "sha256-x+QJJtUvgtNS4116tJFWdJOUS8yV4o10mbTAUuxerkE="; + sha256 = "sha256-4wZTm5AZgG8xEd6uYqxWq4bWZgcSYZ2WYA1z4RAPF8U="; }; enableParallelBuilding = true; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "ROCm Application for Reporting System Info"; homepage = "https://github.com/RadeonOpenCompute/rocminfo"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; } From 72aaaa782ab3e1950b4c9e80afb7c0f9e9f19b73 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 10:38:58 +0000 Subject: [PATCH 020/505] =?UTF-8?q?llvmPackages=5Frocm.llvm:=205.2.3=20?= =?UTF-8?q?=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/llvm/rocm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index a3e50ab4761d..a952615a6c24 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: let - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-sudH8hnjReyuCFm2CBEPd8W88SjAARgCd1MTIJaDjTI="; + hash = "sha256-MN7W4Gl6+a1nCozdn9gMzIXOiBPquoOP87x26boeSCA="; }; in rec { clang = wrapCCWith rec { From 01819daec129639a040e86804af87842bdf734ca Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 5 Oct 2022 11:52:20 +0000 Subject: [PATCH 021/505] =?UTF-8?q?hip:=205.2.3=20=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/hip/default.nix | 19 ++++++++----- .../compilers/hip/hip-config-paths.patch | 9 +++--- .../compilers/hip/hipamd-config-paths.patch | 28 ++++++++++++++++++- 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 329d523ddc23..fff2886246ff 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -29,13 +29,13 @@ let hip = stdenv.mkDerivation rec { pname = "hip"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; rev = "rocm-${version}"; - hash = "sha256-QaN666Rku2Tkio2Gm5/3RD8D5JgmCZLe0Yun1fGxa8U="; + hash = "sha256-UAodlVUiTU4n/EyvTIuQekTGh4izmBjKCRXOHXVKY4M="; }; patches = [ @@ -102,20 +102,20 @@ let description = "C++ Heterogeneous-Compute Interface for Portability"; homepage = "https://github.com/ROCm-Developer-Tools/HIP"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; }; in stdenv.mkDerivation rec { pname = "hip"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; rev = "rocm-${version}"; - hash = "sha256-9YZBFn1jpOiX0X9rcpsFDNhas9vfxNkNnbsWSi7unPU="; + hash = "sha256-gZGZiDP/HbdmzLQkG9Jq9lyMP9hoD6UzTMiX9cUmQNA="; }; nativeBuildInputs = [ cmake python3 makeWrapper perl ]; @@ -133,11 +133,16 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./hipamd-config-paths.patch; - inherit llvm hip; + inherit clang llvm hip; rocm_runtime = rocm-runtime; }) ]; + prePatch = '' + sed -e 's,#!/bin/bash,#!${stdenv.shell},' \ + -i src/hip_embed_pch.sh + ''; + preConfigure = '' export HIP_CLANG_PATH=${clang}/bin export DEVICE_LIB_PATH=${rocm-device-libs}/lib @@ -189,7 +194,7 @@ stdenv.mkDerivation rec { description = "C++ Heterogeneous-Compute Interface for Portability"; homepage = "https://github.com/ROCm-Developer-Tools/hipamd"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/hip/hip-config-paths.patch b/pkgs/development/compilers/hip/hip-config-paths.patch index 71e804c74482..25fa3b8da95a 100644 --- a/pkgs/development/compilers/hip/hip-config-paths.patch +++ b/pkgs/development/compilers/hip/hip-config-paths.patch @@ -2,7 +2,7 @@ diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in index 1a72643a..7f35031f 100644 --- a/hip-lang-config.cmake.in +++ b/hip-lang-config.cmake.in -@@ -72,8 +72,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) +@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY @@ -13,19 +13,18 @@ index 1a72643a..7f35031f 100644 find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} -@@ -88,10 +88,7 @@ endif() +@@ -87,9 +87,7 @@ endif() #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH= find_path(HSA_HEADER hsa/hsa.h PATHS - "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY - "${_IMPORT_PREFIX}/include" - "${ROCM_PATH}/include" -- /opt/rocm/include + "@rocm_runtime@/include" ) - if (HSA_HEADER-NOTFOUND) -@@ -99,7 +96,7 @@ if (HSA_HEADER-NOTFOUND) + if (NOT HSA_HEADER) +@@ -97,7 +94,7 @@ if (HSA_HEADER-NOTFOUND) endif() get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) diff --git a/pkgs/development/compilers/hip/hipamd-config-paths.patch b/pkgs/development/compilers/hip/hipamd-config-paths.patch index 605b73f75c7a..78838836e9aa 100644 --- a/pkgs/development/compilers/hip/hipamd-config-paths.patch +++ b/pkgs/development/compilers/hip/hipamd-config-paths.patch @@ -7,7 +7,7 @@ index 89d1224e..120b68c6 100755 endif() else() - set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm") -+ set(HIP_CLANG_ROOT "@llvm@") ++ set(HIP_CLANG_ROOT "@clang@") endif() if(NOT HIP_CXX_COMPILER) set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) @@ -45,3 +45,29 @@ index 89d1224e..120b68c6 100755 ) endif() endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 83866d83..4125d3aa 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -178,7 +178,7 @@ if(__HIP_ENABLE_PCH) + ${ROCM_PATH}/llvm) + # find_package(LLVM) returns the lib/cmake/llvm location. We require the root. + if(NOT DEFINED HIP_LLVM_ROOT) +- set(HIP_LLVM_ROOT "${LLVM_DIR}/../../..") ++ set(HIP_LLVM_ROOT "@clang@") + endif() + + execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/hip_embed_pch.sh ${HIP_COMMON_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC) +diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh +index 0a1572b2..aa855d63 100755 +--- a/src/hip_embed_pch.sh ++++ b/src/hip_embed_pch.sh +@@ -149,7 +149,7 @@ EOF + + $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui && + +- $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && ++ @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && + + rm -rf $tmp + } From 9c64673e4d59c1979cfa891056b05ace91c44eb2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:56 +0000 Subject: [PATCH 022/505] =?UTF-8?q?glib:=202.72.3=20=E2=86=92=202.73.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.72.3...2.73.2 Changelog-Reviewed-By: jtojnar --- pkgs/development/libraries/glib/default.nix | 18 ++++-- .../libraries/glib/split-dev-programs.patch | 62 +++++++++---------- ...hared-libs-if-default_library-static.patch | 8 +-- 3 files changed, 49 insertions(+), 39 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c6da42738c6a..ca47b8f6bf91 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 -, libiconv, zlib, libffi, pcre, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt +, libiconv, zlib, libffi, pcre2, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null , buildPackages @@ -44,11 +44,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.72.3"; + version = "2.73.2"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "Sjmi9iS4US1QDVhAFz7af6hfUcEJBS6ugGrOzoXTRfA="; + sha256 = "Xz7jbjT0qqs5PD49xG+wGzL36tbIjUHX8g2IpJze8dk="; }; patches = optionals stdenv.isDarwin [ @@ -90,6 +90,14 @@ stdenv.mkDerivation (finalAttrs: { # * gio-launch-desktop ./split-dev-programs.patch + # Fix build on Darwin + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2914 + (fetchpatch { + name = "gio-properly-guard-use-of-utimensat.patch"; + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/7f7171e68a420991b537d3e9e63263a0b2871618.patch"; + sha256 = "kKEqmBqx/RlvFT3eixu+NnM7JXhHb34b9NLRfAt+9h0="; + }) + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2866 (fetchpatch { name = "tests-skip-g-file-info-test-if-atime-unsupported.patch"; @@ -107,7 +115,9 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; buildInputs = [ - libelf finalAttrs.setupHook pcre + libelf + finalAttrs.setupHook + pcre2 ] ++ optionals (!stdenv.hostPlatform.isWindows) [ bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch index 9a949ea1226c..58e1b6d7dfcf 100644 --- a/pkgs/development/libraries/glib/split-dev-programs.patch +++ b/pkgs/development/libraries/glib/split-dev-programs.patch @@ -1,8 +1,8 @@ diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build -index 5ea6bae2f..e0b584a86 100644 +index bf25cdaeb..bff7016cc 100644 --- a/gio/gdbus-2.0/codegen/meson.build +++ b/gio/gdbus-2.0/codegen/meson.build -@@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) +@@ -19,7 +19,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) # Install gdbus-codegen executable gdbus_codegen = configure_file(input : 'gdbus-codegen.in', output : 'gdbus-codegen', @@ -12,10 +12,10 @@ index 5ea6bae2f..e0b584a86 100644 ) # Provide tools for others when we're a subproject and they use the Meson GNOME module diff --git a/gio/meson.build b/gio/meson.build -index 3535788ab..99c3b48d6 100644 +index ca969309a..68a072714 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,14 +831,15 @@ pkg.generate(libgio, +@@ -844,14 +844,15 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -36,7 +36,7 @@ index 3535788ab..99c3b48d6 100644 'gsettings=' + join_paths('${bindir}', 'gsettings')], version : glib_version, install_dir : glib_pkgconfigreldir, -@@ -939,12 +940,14 @@ executable('gio', gio_tool_sources, +@@ -952,12 +953,14 @@ executable('gio', gio_tool_sources, executable('gresource', 'gresource-tool.c', install : true, @@ -51,27 +51,27 @@ index 3535788ab..99c3b48d6 100644 c_args : gio_c_args, # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, -@@ -953,6 +956,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -966,6 +969,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu glib_compile_schemas = executable('glib-compile-schemas', - [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'], + ['glib-compile-schemas.c'], install : true, + install_dir : get_option('devbindir'), # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, - dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) -@@ -960,6 +964,7 @@ glib_compile_schemas = executable('glib-compile-schemas', + dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep]) +@@ -973,6 +977,7 @@ glib_compile_schemas = executable('glib-compile-schemas', glib_compile_resources = executable('glib-compile-resources', - [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'], + [gconstructor_as_data_h, 'glib-compile-resources.c'], install : true, + install_dir : get_option('devbindir'), c_args : gio_c_args, # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, diff --git a/glib/meson.build b/glib/meson.build -index aaf5f00f5..09edd291a 100644 +index 6062c11a1..ce242629a 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -375,9 +375,10 @@ pkg.generate(libglib, +@@ -392,9 +392,10 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -85,7 +85,7 @@ index aaf5f00f5..09edd291a 100644 version : glib_version, install_dir : glib_pkgconfigreldir, filebase : 'glib-2.0', -@@ -413,6 +414,7 @@ if host_system == 'windows' +@@ -431,6 +432,7 @@ if host_system == 'windows' else gtester = executable('gtester', 'gtester.c', install : true, @@ -93,7 +93,7 @@ index aaf5f00f5..09edd291a 100644 c_args : ['-UG_DISABLE_ASSERT'], include_directories : configinc, dependencies : [libglib_dep]) -@@ -424,7 +426,7 @@ report_conf.set('PYTHON', python_name) +@@ -442,7 +444,7 @@ report_conf.set('PYTHON', python_name) configure_file( input: 'gtester-report.in', output: 'gtester-report', @@ -103,10 +103,10 @@ index aaf5f00f5..09edd291a 100644 install_mode: 'rwxr-xr-x' ) diff --git a/gobject/meson.build b/gobject/meson.build -index 85e283bab..386ad5e4e 100644 +index 07d096f36..865891e8c 100644 --- a/gobject/meson.build +++ b/gobject/meson.build -@@ -75,7 +75,7 @@ foreach tool: python_tools +@@ -79,7 +79,7 @@ foreach tool: python_tools input : tool + '.in', output : tool, configuration : python_tools_conf, @@ -115,7 +115,7 @@ index 85e283bab..386ad5e4e 100644 ) # Set variables for later use -@@ -145,6 +145,7 @@ libgobject_dep = declare_dependency(link_with : libgobject, +@@ -154,6 +154,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep) executable('gobject-query', 'gobject-query.c', install : true, @@ -123,21 +123,8 @@ index 85e283bab..386ad5e4e 100644 dependencies : [libglib_dep, libgobject_dep]) install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) -diff --git a/meson.build b/meson.build -index 484f4c750..c7f9327d9 100644 ---- a/meson.build -+++ b/meson.build -@@ -2122,7 +2122,7 @@ if have_sh - gettextize_conf.set('datarootdir', glib_datadir) - gettextize_conf.set('datadir', glib_datadir) - configure_file(input : 'glib-gettextize.in', -- install_dir : glib_bindir, -+ install_dir : get_option('devbindir'), - output : 'glib-gettextize', - configuration : gettextize_conf) - endif diff --git a/meson_options.txt b/meson_options.txt -index 2c831e37e..5d8928577 100644 +index a52eed9d2..b70b69e35 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,6 +3,11 @@ option('runtime_libdir', @@ -152,3 +139,16 @@ index 2c831e37e..5d8928577 100644 option('iconv', type : 'combo', choices : ['auto', 'libc', 'external'], +diff --git a/tools/meson.build b/tools/meson.build +index d550a0e37..cff7fdae5 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -8,7 +8,7 @@ if have_sh + gettextize_conf.set('datarootdir', glib_datadir) + gettextize_conf.set('datadir', glib_datadir) + configure_file(input : 'glib-gettextize.in', +- install_dir : glib_bindir, ++ install_dir : get_option('devbindir'), + output : 'glib-gettextize', + configuration : gettextize_conf) + endif diff --git a/pkgs/development/libraries/glib/tests-skip-shared-libs-if-default_library-static.patch b/pkgs/development/libraries/glib/tests-skip-shared-libs-if-default_library-static.patch index 681e361896e4..106ba4f99a97 100644 --- a/pkgs/development/libraries/glib/tests-skip-shared-libs-if-default_library-static.patch +++ b/pkgs/development/libraries/glib/tests-skip-shared-libs-if-default_library-static.patch @@ -13,7 +13,7 @@ Part-of: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2867 --- gio/tests/meson.build | 43 +++++++++++++++++++++++------------------- glib/tests/meson.build | 2 +- - tests/meson.build | 30 +++++++++++++++-------------- + gmodule/tests/meson.build | 30 +++++++++++++++-------------- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build @@ -95,10 +95,10 @@ index 301158e0f..6203ff45e 100644 glib_tests += { 'gutils-user-database' : { 'depends' : [ -diff --git a/tests/meson.build b/tests/meson.build +diff --git a/gmodule/tests/meson.build b/gmodule/tests/meson.build index c95fa1d00..25144c941 100644 ---- a/tests/meson.build -+++ b/tests/meson.build +--- a/gmodule/tests/meson.build ++++ b/gmodule/tests/meson.build @@ -72,20 +72,22 @@ if ['darwin', 'ios'].contains(host_machine.system()) module_suffix = 'so' endif From feda72e7d89bfde19ffba072a912b5fe5139e441 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:47:15 +0000 Subject: [PATCH 023/505] =?UTF-8?q?gobject-introspection:=201.72.0=20?= =?UTF-8?q?=E2=86=92=201.73.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.72.0...1.73.0 Changelog-Reviewed-By: Jan Tojnar --- 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 175a149e5c6b..e301c49050b4 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.72.0"; + version = "1.73.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 @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - sha256 = "Av6OWQhh2I+DBg3TnNpcyqYLLaHSHQ+VSZMBsYa+qrw="; + sha256 = "1kUhjOFFEoW4tPCTXjXbweQZ9QzrZDt9ZvWeOPzAh3Y="; }; patches = [ From 8440950a2d9d2df1b867d62e6da80bad4cfaa43d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:57 +0000 Subject: [PATCH 024/505] =?UTF-8?q?glib-networking:=202.72.2=20=E2=86=92?= =?UTF-8?q?=202.74.alpha?= 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.2...2.74.alpha Changelog-Reviewed-By: Jan Tojnar --- 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 489e92648a99..5ecba800de74 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.2"; + version = "2.74.alpha"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "zSoITHu5HXjoSftV1A5HL22PaGLN3J8Sw5FJNZuhgmg="; + sha256 = "YJhlZTXq9NKfpSTmmWlIbMwnbLCM9PmrCFHYo4nY4U8="; }; patches = [ From 8979d027bad27d9037fbebd014025b97c621317b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:52 +0000 Subject: [PATCH 025/505] =?UTF-8?q?gjs:=201.72.2=20=E2=86=92=201.73.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.72.2...1.73.1 Changelog-Reviewed-By: Jan Tojnar --- 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 e24211590054..5195bb7f153c 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -32,13 +32,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.72.2"; + version = "1.73.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3e43m9xafTA6XYlL4rKBvrisVFCGBOfT8geBqGnaOXc="; + sha256 = "sha256-k/XuvxCLrR8uHb6sPBf9NHGs2o7acfQecMhdkDNR8As="; }; patches = [ From f554de212a170e6cb4b9cba46876203eaae476ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:06 +0000 Subject: [PATCH 026/505] =?UTF-8?q?at-spi2-core:=202.44.1=20=E2=86=92=202.?= =?UTF-8?q?45.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit atk and at-spi2-atk were merged into the repo. https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/AT_SPI2_CORE_2_44_1...AT_SPI2_CORE_2_45_1 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/at-spi2-atk/default.nix | 45 ----------- .../libraries/at-spi2-core/default.nix | 10 ++- pkgs/development/libraries/atk/default.nix | 77 ------------------- pkgs/development/libraries/atk/fix_pc.patch | 9 --- pkgs/top-level/all-packages.nix | 6 +- 5 files changed, 11 insertions(+), 136 deletions(-) delete mode 100644 pkgs/development/libraries/at-spi2-atk/default.nix delete mode 100644 pkgs/development/libraries/atk/default.nix delete mode 100644 pkgs/development/libraries/atk/fix_pc.patch diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix deleted file mode 100644 index 7989cfd85777..000000000000 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv -, fetchurl - -, meson -, ninja -, pkg-config - -, at-spi2-core -, atk -, dbus -, glib -, libxml2 - -, gnome # To pass updateScript -}: - -stdenv.mkDerivation rec { - pname = "at-spi2-atk"; - version = "2.38.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8="; - }; - - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; - - doCheck = false; # fails with "No test data file provided" - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; - homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 606ff2b34041..1710dfdf5c6e 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -11,6 +11,7 @@ , glib , dconf , libX11 +, libxml2 , libXtst , libXi , libXext @@ -19,13 +20,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.44.1"; + version = "2.45.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "S+sjJwumz3yvILWXNU11GU2Jr7adLvzxX0JxaIum90Y="; + sha256 = "upXzRukxCPuzRixiQ3CB1YIVTbJ5tAUt7cUqcGgosZI="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 + libxml2 # 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 @@ -46,6 +48,7 @@ stdenv.mkDerivation rec { ]; # In atspi-2.pc dbus-1 glib-2.0 + # In atk.pc gobject-2.0 propagatedBuildInputs = [ dbus glib @@ -55,6 +58,7 @@ stdenv.mkDerivation rec { doCheck = false; mesonFlags = [ + "-Dintrospection=${if stdenv.buildPlatform == stdenv.hostPlatform then "yes" else "no"}" # 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 @@ -80,7 +84,7 @@ stdenv.mkDerivation rec { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix deleted file mode 100644 index 268bf43eb3e8..000000000000 --- a/pkgs/development/libraries/atk/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, gettext -, pkg-config -, glib -, fixDarwinDylibNames -, gobject-introspection -, gnome -}: - -stdenv.mkDerivation rec { - pname = "atk"; - version = "2.38.0"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY="; - }; - - patches = [ - # meson builds an incorrect .pc file - # glib should be Requires not Requires.private - ./fix_pc.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - gobject-introspection - glib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - fixDarwinDylibNames - ]; - - buildInputs = [ gobject-introspection ]; - - propagatedBuildInputs = [ - # Required by atk.pc - glib - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = { - description = "Accessibility toolkit"; - - longDescription = '' - ATK is the Accessibility Toolkit. It provides a set of generic - interfaces allowing accessibility technologies such as screen - readers to interact with a graphical user interface. Using the - ATK interfaces, accessibility tools have full access to view and - control running applications. - ''; - - homepage = "https://gitlab.gnome.org/GNOME/atk"; - - license = lib.licenses.lgpl2Plus; - - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; - -} diff --git a/pkgs/development/libraries/atk/fix_pc.patch b/pkgs/development/libraries/atk/fix_pc.patch deleted file mode 100644 index 3d19d9862cbd..000000000000 --- a/pkgs/development/libraries/atk/fix_pc.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -162,5 +162,6 @@ pkgconfig.generate(libatk, - name: 'Atk', - description: 'Accessibility Toolkit', - subdirs: atk_api_name, -+ requires: glib_dep, - filebase: 'atk', - ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78408aa0d6bd..ceb193fa413a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17831,7 +17831,8 @@ with pkgs; at-spi2-core = callPackage ../development/libraries/at-spi2-core { }; - at-spi2-atk = callPackage ../development/libraries/at-spi2-atk { }; + # Not moved to aliases while we decide if we should split the package again. + at-spi2-atk = at-spi2-core; aqbanking = callPackage ../development/libraries/aqbanking { }; @@ -18943,7 +18944,8 @@ with pkgs; ace = callPackage ../development/libraries/ace { }; - atk = callPackage ../development/libraries/atk { }; + # Not moved to aliases while we decide if we should split the package again. + atk = at-spi2-core; atkmm = callPackage ../development/libraries/atkmm { }; From 9402ac6e8136a600a30123c0d1e0f9ab2f33f645 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:48:46 +0000 Subject: [PATCH 027/505] =?UTF-8?q?python3.pkgs.pyatspi:=202.38.2=20?= =?UTF-8?q?=E2=86=92=202.45.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pyatspi2/-/compare/PYATSPI_2_38_2...PYATSPI_2_45_1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/python-modules/pyatspi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index d32a4a1ca3a1..208faffc4462 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.38.2"; + version = "2.45.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DnCJwLYwlhS1NiCDazRi1/kShOQ2/kkpuhYZqEHPEYU="; + sha256 = "u6fCZjQw5VEjpEPzelop5764sBZJvbKWmtPrlB2qwa4="; }; nativeBuildInputs = [ pkg-config ]; From f2ff55e961199dadba4c1cc3bd87124182c2c64e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:48:52 +0000 Subject: [PATCH 028/505] =?UTF-8?q?template-glib:=203.34.1=20=E2=86=92=203?= =?UTF-8?q?.35.0?= 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.1...3.35.0 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/template-glib/default.nix | 52 +++++++++++++++---- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 23d2e8907ff1..8aa3af0c7b71 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,25 +1,57 @@ -{ 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.1"; +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, glib +, gobject-introspection +, flex +, bison +, vala +, gettext +, gnome +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +}: + +stdenv.mkDerivation rec { pname = "template-glib"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.35.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nsm3HgTU9csU91XveQYxzQtFwGA+Ecg2/Hz9niaM0Ho="; + sha256 = "PPAnJkSwiLALcbqdB1Lo5OQd0P/knFd9vct8H+ABhok="; }; - nativeBuildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection ]; - buildInputs = [ glib ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + flex + bison + vala + glib + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + gobject-introspection + ]; + + buildInputs = [ + glib + ]; mesonFlags = [ - "-Denable_gtk_doc=true" + "-Dgtk_doc=true" ]; + doCheck = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 731e02993a98a7cb21863d28f4b2dfdc0d75bc6d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:47:23 +0000 Subject: [PATCH 029/505] =?UTF-8?q?gsettings-desktop-schemas:=2042.0=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= 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.0...43.alpha Changelog-Reviewed-By: Jan Tojnar --- .../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 8a26742ce23e..45d7ffd6ed31 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.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZoYzWp7WI/euInb++lCkENTnHUIxiAgkcUBwyzFzI9I="; + sha256 = "JrGCkfh7bPrF7APRrKrCwCNQMr7gNOZgaOcEfe8CICg="; }; strictDeps = true; From b3e936e45faab94bed416f72ad79f17b85d3b12d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:47:37 +0000 Subject: [PATCH 030/505] =?UTF-8?q?gtksourceview5:=205.4.2=20=E2=86=92=205?= =?UTF-8?q?.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.4.2...5.5.0 Changelog-Reviewed-By: Jan Tojnar --- 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 307fb15e98d8..e01ee637afe5 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.4.2"; + version = "5.5.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "rRQOB+uEGRDeSDwJK9SIWr0puq3W6V+iLZPtLfC3nec="; + sha256 = "V8kgm1ypfVKq7JbwZfenXQj/k6/i5+b0ezVbhVnH94Q="; }; patches = [ From 49c10b0e8a390a1f0caa4c5ffbf39fada56b348d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:48:09 +0000 Subject: [PATCH 031/505] =?UTF-8?q?libhandy:=201.6.3=20=E2=86=92=201.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libhandy/-/compare/1.6.3...1.7.0 Changelog-Reviewed-By: Bobby Rong --- 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 58d9097d8378..51de3f7d536b 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.6.3"; + version = "1.7.0"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R3iL01gE69M8sJkR6XU0TIQ1ngttlSCv0cgh66i6d/8="; + sha256 = "sha256-jJLAaleyavFqJa0LXDdafbfwm1cBKr3m4Wi2KXh3DPc="; }; depsBuildBuild = [ From 665b8c8256943b36de591f6ae3828c86bcbda4d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:48:24 +0000 Subject: [PATCH 032/505] =?UTF-8?q?libsoup=5F3:=203.0.7=20=E2=86=92=203.1.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsoup/-/compare/3.0.7...3.1.1 Changelog-Reviewed-By: jtojnar --- pkgs/development/libraries/libsoup/3.x.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 2b1c6e68795f..a25224599c8e 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -15,19 +15,20 @@ , withVala ? stdenv.buildPlatform == stdenv.hostPlatform , libpsl , python3 +, gi-docgen , brotli , libnghttp2 }: stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.0.7"; + version = "3.1.1"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-69+QzzWZwRrLtoGKnZ4/ydLGjlbrgpuTlilyaD4b98g="; + sha256 = "sha256-RAO/PnpMeoXLPEpSgcm5nSVuKGOfVXMKUq3UMqr84Fw="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { pkg-config glib python3 + gi-docgen ] ++ lib.optionals withIntrospection [ gobject-introspection ] ++ lib.optionals withVala [ @@ -82,6 +84,11 @@ stdenv.mkDerivation rec { patchShebangs libsoup/ ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { propagatedUserEnvPackages = [ glib-networking.out From 71966b77cafea89565fb38c6c1bb5711447a9e76 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 17:40:41 +0200 Subject: [PATCH 033/505] geocode-glib_2: init --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ceb193fa413a..6ffd4ccdb9cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18571,6 +18571,10 @@ with pkgs; geocode-glib = callPackage ../development/libraries/geocode-glib {}; + geocode-glib_2 = geocode-glib.override { + libsoup = libsoup_3; + }; + geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; From 14b322ab55ea60f96fb025b8444ce0a20802afd8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 17:39:54 +0200 Subject: [PATCH 034/505] =?UTF-8?q?libgweather:=204.0.0=20=E2=86=92=204.1.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libsoup3 switch. https://gitlab.gnome.org/GNOME/libgweather/-/tags/4.1.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libgweather/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 77a4b936ae54..bf2b6beac3de 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -7,25 +7,25 @@ , libxml2 , glib , gettext -, libsoup +, libsoup_3 , gi-docgen , gobject-introspection , python3 , tzdata -, geocode-glib +, geocode-glib_2 , vala , gnome }: stdenv.mkDerivation rec { pname = "libgweather"; - version = "4.0.0"; + version = "4.1.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RA1EgBtvcrSMZ25eN/kQnP7hOU/XTMknJeGxuk+ug0w="; + sha256 = "ALuJmOO5qQXzqNMpX8wVZS1rCc2l76Ik5nRN7Xq9plo="; }; patches = [ @@ -52,9 +52,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libsoup + libsoup_3 libxml2 - geocode-glib + geocode-glib_2 ]; mesonFlags = [ From fc8659a6c60f0b19ef2aee8d9457a3485f6548f8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:57 +0000 Subject: [PATCH 035/505] =?UTF-8?q?gnome-desktop:=2042.3=20=E2=86=92=2043.?= =?UTF-8?q?alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/42.3...43.alpha Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gnome-desktop/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 157d7fa84040..7cf1ca9d326d 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.3"; + version = "43.alpha"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2lBBC48Z/X53WwDR/g26Z/xeEVHe0pkVjcJd2tw/qKk="; + sha256 = "sha256-3yLHsaINGFC5fP8ayrGofw32CYefS33ZTjUKxqC4gls="; }; patches = lib.optionals stdenv.isLinux [ @@ -78,8 +78,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Ddesktop_docs=false" - "-Ddate_in_gnome_version=false" - "-Dgnome_distributor=NixOS" ] ++ lib.optionals (!stdenv.isLinux) [ "-Dsystemd=disabled" "-Dudev=disabled" From 634ece114ab9fef2430d68f2a91741452bcffb82 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Jul 2022 01:40:38 +0200 Subject: [PATCH 036/505] gcr_4: init at 3.90.0 https://gitlab.gnome.org/GNOME/gcr/-/compare/3.41.0...3.90.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gcr/4.nix | 115 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 117 insertions(+) create mode 100644 pkgs/development/libraries/gcr/4.nix diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix new file mode 100644 index 000000000000..0346c20f1211 --- /dev/null +++ b/pkgs/development/libraries/gcr/4.nix @@ -0,0 +1,115 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, gettext +, gnupg +, p11-kit +, glib +, libgcrypt +, libtasn1 +, gtk3 +, gtk4 +, pango +, libsecret +, openssh +, systemd +, gobject-introspection +, wrapGAppsHook +, vala +, gi-docgen +, gnome +, python3 +, shared-mime-info +}: + +stdenv.mkDerivation rec { + pname = "gcr"; + version = "3.90.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "5ZB0nsh2A38LDimVDCyyCIEnDAX0fsUmlSCog9iTSE4="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + gobject-introspection + gi-docgen + wrapGAppsHook + vala + gi-docgen + shared-mime-info + ]; + + buildInputs = [ + gnupg + libgcrypt + libtasn1 + pango + libsecret + openssh + systemd + ]; + + propagatedBuildInputs = [ + glib + gtk3 + gtk4 + p11-kit + ]; + + checkInputs = [ + python3 + ]; + + mesonFlags = [ + # We are still using ssh-agent from gnome-keyring. + # https://github.com/NixOS/nixpkgs/issues/140824 + "-Dssh_agent=false" + ]; + + doCheck = false; # fails 21 out of 603 tests, needs dbus daemon + + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + + postPatch = '' + patchShebangs gcr/fixtures/ + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "gcr_4"; + packageName = pname; + }; + }; + + meta = with lib; { + platforms = platforms.unix; + maintainers = teams.gnome.members; + description = "GNOME crypto services (daemon and tools)"; + homepage = "https://gitlab.gnome.org/GNOME/gcr"; + license = licenses.lgpl2Plus; + + longDescription = '' + GCR is a library for displaying certificates, and crypto UI, accessing + key stores. It also provides the viewer for crypto files on the GNOME + desktop. + + GCK is a library for accessing PKCS#11 modules like smart cards, in a + (G)object oriented way. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ffd4ccdb9cb..15f0867c9f86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18547,6 +18547,8 @@ with pkgs; gcr = callPackage ../development/libraries/gcr { }; + gcr_4 = callPackage ../development/libraries/gcr/4.nix { }; + gdl = callPackage ../development/libraries/gdl { }; gdome2 = callPackage ../development/libraries/gdome2 { }; From 753784ec26d0231ac571fb2eb5e433df5c95e3fd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:31 +0000 Subject: [PATCH 037/505] =?UTF-8?q?evolution-data-server:=203.44.4=20?= =?UTF-8?q?=E2=86=92=203.45.1?= 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.44.4...3.45.1 Changelog-Reviewed-By: Jan Tojnar Add a variant with libedataserverui-gtk4. --- .../core/evolution-data-server/default.nix | 39 +++-- .../hardcode-gsettings.cocci | 1 - .../hardcode-gsettings.patch | 146 +++++++++++------- pkgs/top-level/all-packages.nix | 1 + 4 files changed, 114 insertions(+), 73 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index a7d4673158b5..5885d788e0d1 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -11,14 +11,14 @@ , python3 , gobject-introspection , gettext -, libsoup +, libsoup_3 , libxml2 , libsecret , icu , sqlite , tzdata , libcanberra-gtk3 -, gcr +, gcr_4 , p11-kit , db , nspr @@ -33,29 +33,32 @@ , ninja , libkrb5 , openldap -, webkitgtk +, webkitgtk_4_1 +, webkitgtk_5_0 , libaccounts-glib , json-glib , glib , gtk3 +, gtk4 +, withGtk3 ? true +, withGtk4 ? false , libphonenumber , gnome-online-accounts , libgweather , libgdata -, gsettings-desktop-schemas , boost , protobuf }: stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.44.4"; + version = "3.45.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wMZliDjVi6RgQqS55Qo7sRKWkeTNuEteugvzMLLMsus="; + sha256 = "M0t2QR8hDzcEYDsSpCwU/DKY+hL/6abk+/uYeeP+SyI="; }; patches = [ @@ -67,8 +70,7 @@ stdenv.mkDerivation rec { prePatch = '' substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ - --subst-var-by EDS_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ - --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas} + --subst-var-by EDS_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} patches="$patches $PWD/hardcode-gsettings.patch" ''; @@ -86,11 +88,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libsoup - libxml2 - gtk3 + libsoup_3 gnome-online-accounts - gcr + gcr_4 p11-kit libgweather libgdata @@ -100,13 +100,18 @@ stdenv.mkDerivation rec { sqlite libkrb5 openldap - webkitgtk glib-networking libcanberra-gtk3 pcre libphonenumber boost protobuf + ] ++ lib.optionals withGtk3 [ + gtk3 + webkitgtk_4_1 + ] ++ lib.optionals withGtk4 [ + gtk4 + webkitgtk_5_0 ]; propagatedBuildInputs = [ @@ -116,7 +121,8 @@ stdenv.mkDerivation rec { nspr libical libgdata # needed for GObject inspection, https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs - libsoup + libsoup_3 + libxml2 ]; cmakeFlags = [ @@ -125,7 +131,10 @@ stdenv.mkDerivation rec { "-DENABLE_INTROSPECTION=ON" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" "-DWITH_PHONENUMBER=ON" - "-DWITH_GWEATHER4=ON" + "-DENABLE_GTK=${lib.boolToString withGtk3}" + "-DENABLE_EXAMPLES=${lib.boolToString withGtk3}" + "-DENABLE_CANBERRA=${lib.boolToString withGtk3}" + "-DENABLE_GTK4=${lib.boolToString withGtk4}" ]; passthru = { diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci index 9e60e892b711..8f72e4f5d94b 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci @@ -24,7 +24,6 @@ e_s_d_schema_constants = [ ] g_d_s_schema_constants = [ - "\"org.gnome.system.proxy\"", ] def get_schema_directory(schema_path): diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index c756b4bcc2ac..c3e0ef8359e5 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -127,8 +127,32 @@ index 8dfff6d..cd88392 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); +diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c +index d3f130e..9e8edd4 100644 +--- a/src/addressbook/libedata-book/e-book-meta-backend.c ++++ b/src/addressbook/libedata-book/e-book-meta-backend.c +@@ -135,7 +135,18 @@ ebmb_is_power_saver_enabled (void) + GSettings *settings; + gboolean enabled = FALSE; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + + if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { + GPowerProfileMonitor *power_monitor; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index e696861..52af238 100644 +index 42f3457..faac410 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c @@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) @@ -152,10 +176,10 @@ index e696861..52af238 100644 cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index a24ede2..5d2a032 100644 +index 52095a4..e839991 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2477,7 +2477,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2555,7 +2555,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); @@ -176,6 +200,30 @@ index a24ede2..5d2a032 100644 watcher->priv->scheduled = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_reminder_watcher_free_rd_slist); watcher->priv->default_zone = e_cal_util_copy_timezone (zone); watcher->priv->timers_enabled = TRUE; +diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c +index 94a875f..1f914a9 100644 +--- a/src/calendar/libedata-cal/e-cal-meta-backend.c ++++ b/src/calendar/libedata-cal/e-cal-meta-backend.c +@@ -149,7 +149,18 @@ ecmb_is_power_saver_enabled (void) + GSettings *settings; + gboolean enabled = FALSE; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + + if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { + GPowerProfileMonitor *power_monitor; diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c index 8013ba7..ba74769 100644 --- a/src/camel/camel-cipher-context.c @@ -201,10 +249,10 @@ index 8013ba7..ba74769 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 685d3ab..521d91f 100644 +index 205372e..2023704 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c -@@ -571,7 +571,18 @@ gpg_ctx_get_executable_name (void) +@@ -582,7 +582,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; @@ -249,6 +297,30 @@ index e61160c..d17871a 100644 g_signal_connect (mi_user_headers_settings, "changed::camel-message-info-user-headers", G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); +diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c +index 1eeff8d..6d1d58b 100644 +--- a/src/camel/providers/imapx/camel-imapx-server.c ++++ b/src/camel/providers/imapx/camel-imapx-server.c +@@ -5573,7 +5573,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) + if (!skip_old_flags_update) { + GSettings *eds_settings; + +- eds_settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ eds_settings = g_settings_new_full(schema, NULL, NULL); ++ } + + if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { + GPowerProfileMonitor *power_monitor; diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c index f535ad6..30130b9 100644 --- a/src/camel/providers/smtp/camel-smtp-transport.c @@ -298,10 +370,10 @@ index 188f276..7c4db94 100644 settings, "network-monitor-gio-name", object, "gio-name", diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index f9d9056..115d344 100644 +index f215388..3b67126 100644 --- a/src/libedataserver/e-oauth2-service-google.c +++ b/src/libedataserver/e-oauth2-service-google.c -@@ -70,7 +70,18 @@ eos_google_read_settings (EOAuth2Service *service, +@@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -322,10 +394,10 @@ index f9d9056..115d344 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c -index 687c10d..ac1deae 100644 +index 9cff0d0..fd95f0b 100644 --- a/src/libedataserver/e-oauth2-service-outlook.c +++ b/src/libedataserver/e-oauth2-service-outlook.c -@@ -70,7 +70,18 @@ eos_outlook_read_settings (EOAuth2Service *service, +@@ -71,7 +71,18 @@ eos_outlook_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -346,10 +418,10 @@ index 687c10d..ac1deae 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c -index 329a38c..f541393 100644 +index 8e4ee81..bb8f8f7 100644 --- a/src/libedataserver/e-oauth2-service-yahoo.c +++ b/src/libedataserver/e-oauth2-service-yahoo.c -@@ -66,7 +66,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, +@@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -370,10 +442,10 @@ index 329a38c..f541393 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 979095b..ecac6bb 100644 +index 290534d..36331b6 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c -@@ -89,7 +89,18 @@ eos_default_guess_can_process (EOAuth2Service *service, +@@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service, name_len = strlen (name); hostname_len = strlen (hostname); @@ -393,51 +465,11 @@ index 979095b..ecac6bb 100644 values = g_settings_get_strv (settings, "oauth2-services-hint"); g_object_unref (settings); -diff --git a/src/libedataserver/e-proxy.c b/src/libedataserver/e-proxy.c -index bcd07f9..17db26c 100644 ---- a/src/libedataserver/e-proxy.c -+++ b/src/libedataserver/e-proxy.c -@@ -957,8 +957,33 @@ e_proxy_init (EProxy *proxy) - - proxy->priv->type = PROXY_TYPE_SYSTEM; - -- proxy->priv->evolution_proxy_settings = g_settings_new ("org.gnome.evolution.shell.network-config"); -- proxy->priv->proxy_settings = g_settings_new ("org.gnome.system.proxy"); -+ { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution.shell.network-config", -+ FALSE); -+ proxy->priv->evolution_proxy_settings = g_settings_new_full(schema, -+ NULL, -+ NULL); -+ } -+ { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@GDS_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.system.proxy", -+ FALSE); -+ proxy->priv->proxy_settings = g_settings_new_full(schema, -+ NULL, NULL); -+ } - proxy->priv->proxy_http_settings = g_settings_get_child (proxy->priv->proxy_settings, "http"); - proxy->priv->proxy_https_settings = g_settings_get_child (proxy->priv->proxy_settings, "https"); - proxy->priv->proxy_socks_settings = g_settings_get_child (proxy->priv->proxy_settings, "socks"); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 837e940..4bbd00d 100644 +index 6701a3a..6b8ee33 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1769,7 +1769,19 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1764,7 +1764,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); @@ -459,10 +491,10 @@ index 837e940..4bbd00d 100644 g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index d18474d..418ccc2 100644 +index c0c1aea..14e6806 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -1874,7 +1874,19 @@ static void +@@ -1956,7 +1956,19 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { reminders->priv = e_reminders_widget_get_instance_private (reminders); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15f0867c9f86..616a046061fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27850,6 +27850,7 @@ with pkgs; inherit (gnome) evince; evolution-data-server = gnome.evolution-data-server; + evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; From bcd7909d7e0479ea554bdfa4b4e2bfbc8268e2e9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:48:53 +0000 Subject: [PATCH 038/505] =?UTF-8?q?tepl:=206.0.2=20=E2=86=92=206.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/swilmet/tepl/-/compare/6.0.2...6.1.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tepl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index e7918ea56e29..c6c7d265ed7d 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "6.0.2"; + version = "6.1.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "W0qcbGG9AAVT75eZ9MpiXQX1gBA2+ywvkopJRIyQPAk="; + sha256 = "Cv4uyaWNT6ixBntqc0/TxzNqn/+3VyyWPFLqbYckoZs="; }; nativeBuildInputs = [ From a9ca9af388557b1f63f9983a3e19d2df99e072e1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:49:00 +0000 Subject: [PATCH 039/505] =?UTF-8?q?tracker:=203.3.1=20=E2=86=92=203.4.0.al?= =?UTF-8?q?pha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.3.1...3.4.0.alpha Changelog-Reviewed-By: Jan Tojnar --- 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 e8d6ed82ed00..cf869c94eead 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.3.2"; + version = "3.4.0.alpha"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DtK5iRiVbW8WQpxgfdihTIT02gpIlw/S64yTq6PPmRM="; + sha256 = "PIbsVkHpSrf7gCut2BREyFSuT2MmIfvELUUgGRwyQGE="; }; postPatch = '' From 69f486068a51a68f2d0f7552dcc7c45e45978018 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:49:08 +0000 Subject: [PATCH 040/505] =?UTF-8?q?xdg-desktop-portal-gnome:=2042.3=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= 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.3...43.alpha Changelog-Reviewed-By: Jan Tojnar --- .../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 199994038b5b..e76a7dd4ac03 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.3"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TtEFpmfkYyVGcQPcc0bSAj+uwdXsFTvRcxbak49TrOA="; + sha256 = "8HeFvtoVI5E8tP9vjDOk49u4uW0uWYOVRexAGwguVHw="; }; nativeBuildInputs = [ From be87376e3b3ecb9914b487d18f18a9519347d999 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:49:09 +0000 Subject: [PATCH 041/505] =?UTF-8?q?vte:=200.68.0=20=E2=86=92=200.69.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.68.0...0.69.90 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 0ddff4d1812a..739328117a70 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.68.0"; + version = "0.69.90"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-E+fUeJyiFqM3gAMNJGybE92/0ECUxjFu6n/5IoTdF0k="; + sha256 = "sha256-FB6AvuUExv5yWVrqkP2FSvxPNEkXsbW/34OqPIOWBM0="; }; patches = [ From fa15950c225f5675523fa5a977b37792a0ca3105 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:49:13 +0000 Subject: [PATCH 042/505] =?UTF-8?q?tracker-miners:=203.3.1=20=E2=86=92=203?= =?UTF-8?q?.4.0.alpha?= 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.1...3.4.0.alpha Changelog-Reviewed-By: Jan Tojnar --- 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 846346d534b8..87df670ebe42 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.3.1"; + version = "3.4.0.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Pt3G0nLAKWn6TCwV360MSddtAh8aJ+xwi2m+gCU1PJQ="; + sha256 = "P84wGmT1IPGMZLPGPgoRRbtpN5bJNmxBxwfZNJ8XPyY="; }; # TODO: remove me on 3.4.0 From 016265a3ae2963a466029481a7f589b4e8f87e50 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:12 +0000 Subject: [PATCH 043/505] =?UTF-8?q?baobab:=2042.0=20=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/42.0...43.alpha Changelog-Reviewed-By: jtojnar --- 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 7c463e8ed283..de4a236d0f56 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.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Sxqr5rqxWCs/6nmigpvOfyQVu25QYvJTV67t1TF6UNw="; + sha256 = "6co//tYhatoWP8x5Y43+qvw75RPWWCH8+eKeLzn0Aqs="; }; nativeBuildInputs = [ From 2c094ec19a5339d157d0086ff15398421750d3f1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:32 +0000 Subject: [PATCH 044/505] =?UTF-8?q?evince:=2042.3=20=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/42.3...43.alpha Changelog-Reviewed-By: jtojnar --- 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 8f5a81f0bf55..17e09f0ff2c1 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.3"; + version = "43.alpha"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Sa7PhFyUbJbbF7qJ11yAAsWuiWP1BKmwYm0SZ1kUZF4="; + sha256 = "PPVNKPeX74sFBL67HBaKGA1N35JcuDqfnGn+DRie9hE="; }; postPatch = '' From 9c29cf433fdfd725810dd12aceb4b3dc90adfb32 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:37 +0000 Subject: [PATCH 045/505] =?UTF-8?q?evolution-ews:=203.44.4=20=E2=86=92=203?= =?UTF-8?q?.45.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.44.4...3.45.1 Also drop -DWITH_MSPACK CMake flag since it is on by default and make dependencies match CMakeLists.txt. Co-Authored-By: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- .../evolution/evolution-ews/default.nix | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 337aeaba1a2f..f6dbda56045a 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -1,32 +1,55 @@ -{ lib, stdenv, fetchurl, gnome, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution -, sqlite, gtk3, webkitgtk, libgdata, libmspack }: +{ stdenv +, lib +, fetchurl +, gnome +, cmake +, gettext +, intltool +, pkg-config +, evolution-data-server +, evolution +, gtk3 +, libsoup_3 +, libical +, json-glib +, libmspack +, webkitgtk_4_1 +}: stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.4"; + version = "3.45.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "TxgrBaE6wbezOwj7Bm6DlcqpW6fagIiGqpGxQp1tfbM="; + sha256 = "RC1WKetKsz/VCQYau1UDiLhfW9cpAMswNKsDEHY456w="; }; - nativeBuildInputs = [ cmake gettext intltool pkg-config ]; + nativeBuildInputs = [ + cmake + gettext + intltool + pkg-config + ]; buildInputs = [ - evolution-data-server evolution - sqlite libgdata - gtk3 webkitgtk + evolution-data-server + evolution + gtk3 + libsoup_3 + libical + json-glib libmspack + # For evolution-shell-3.0 + webkitgtk_4_1 ]; cmakeFlags = [ - # Building with libmspack as recommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews - "-DWITH_MSPACK=ON" # don't try to install into ${evolution} "-DFORCE_INSTALL_PREFIX=ON" ]; - passthru = { + passthru = { updateScript = gnome.updateScript { packageName = "evolution-ews"; versionPolicy = "odd-unstable"; From 62e5c9bd0ecbcae0d613ca8fe227d66eb810f46a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:39 +0000 Subject: [PATCH 046/505] =?UTF-8?q?epiphany:=2042.3=20=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/42.3...43.alpha Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/epiphany/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 88cbbee0d0be..15201379cfe7 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -15,8 +15,8 @@ , libxml2 , libxslt , itstool -, webkitgtk -, libsoup +, webkitgtk_4_1 +, libsoup_3 , glib-networking , libsecret , gnome-desktop @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "42.3"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cxbTxlAOgl2OVyk/pYBHxWcnvuFs1rasgE/+XZsilWA="; + sha256 = "TVm7+mQ59arqnWD94npf6GdciFP8uugPSmjZ8CjDF0E="; }; patches = lib.optionals withPantheon [ @@ -95,12 +95,12 @@ stdenv.mkDerivation rec { libnotify libarchive libsecret - libsoup + libsoup_3 libxml2 nettle p11-kit sqlite - webkitgtk + webkitgtk_4_1 ]; # Tests need an X display From 321a4b0c8553fa4d57365e61c1a57ff43e93efd5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:44:47 +0000 Subject: [PATCH 047/505] =?UTF-8?q?evolution:=203.44.4=20=E2=86=92=203.45.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.44.4...3.45.1 Co-Authored-By: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- .../mailreaders/evolution/evolution/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 19d6469e96a7..d127a5664251 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -5,7 +5,7 @@ , intltool , fetchurl , libxml2 -, webkitgtk +, webkitgtk_4_1 , highlight , pkg-config , gtk3 @@ -14,7 +14,6 @@ , libpst , gspell , evolution-data-server -, libgdata , libgweather , glib-networking , gsettings-desktop-schemas @@ -34,7 +33,7 @@ , nspr , icu , libcanberra-gtk3 -, geocode-glib +, geocode-glib_2 , cmark , bogofilter , gst_all_1 @@ -46,11 +45,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.44.4"; + version = "3.45.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "8LFuerrTx5RaKcMi8X2rSgjWHpm9fMkbjfNQU8XBLow="; + sha256 = "/iRZq5DdZ86JdtWuu6ekP69gqvBJMeTWnxxG10ensW4="; }; nativeBuildInputs = [ @@ -81,9 +80,8 @@ stdenv.mkDerivation rec { highlight icu libcanberra-gtk3 - geocode-glib + geocode-glib_2 cmark - libgdata libgweather libical libnotify @@ -97,7 +95,7 @@ stdenv.mkDerivation rec { procps shared-mime-info sqlite - webkitgtk + webkitgtk_4_1 ]; propagatedUserEnvPkgs = [ @@ -112,7 +110,6 @@ stdenv.mkDerivation rec { "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn" "-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter" "-DWITH_OPENLDAP=${openldap}" - "-DWITH_GWEATHER4=ON" ]; requiredSystemFeatures = [ From a85b00692db768ef06e70bcf7a0e9042ebb43760 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:07 +0000 Subject: [PATCH 048/505] =?UTF-8?q?gnome.cheese:=2041.1=20=E2=86=92=2043.a?= =?UTF-8?q?lpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/cheese/-/compare/41.1...43.alpha Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/cheese/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index a6d70d162c08..4001e358e851 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "41.1"; + version = "43.alpha"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "UilgyihzD/ZkOQcLBEGMngpLtVVg11v+CLIY2ixn5Uc="; + sha256 = "utrp972m+lch2regi4I3p15TJcDJpmlJj/VPdyFG5M8="; }; nativeBuildInputs = [ From e3767f36a8d4cf46d304b10f16af399064c37ff7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:07 +0000 Subject: [PATCH 049/505] =?UTF-8?q?gnome.devhelp:=2041.2=20=E2=86=92=2043.?= =?UTF-8?q?alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/devhelp/-/compare/41.2...43.alpha Also switch to webkitgtk-4.1 since we are migrating to libsoup-3. Changelog-Reviewed-By: Jan Tojnar --- .../gnome/devtools/devhelp/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index 4a024f6ff413..e9f6249ad010 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -13,7 +12,7 @@ , gobject-introspection , python3 , gi-docgen -, webkitgtk +, webkitgtk_4_1 , gettext , itstool , gsettings-desktop-schemas @@ -22,24 +21,15 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "41.2"; + version = "43.alpha"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "7KqQsPTaqPsgMPbcaQv1M/+Zp3NDf+Dhis/oLZl/YNI="; + sha256 = "8HQxbo51vNjOWx+i1rn0GKrTTmtwt+u4JZkF5eVQjwI="; }; - patches = [ - # Fix build with meson 0.61 - # https://gitlab.gnome.org/GNOME/devhelp/-/issues/59 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/devhelp/-/commit/281bade14c1925cf9e7329fa8e9cf2d82512c66f.patch"; - sha256 = "LmHoeQ0zJwOhuasAUYy8FfpDnEO+UNfEb293uKttYKo="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -56,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - webkitgtk + webkitgtk_4_1 gnome.adwaita-icon-theme gsettings-desktop-schemas ]; From 2176ca6755bdf8dd9208161099665cbfa1b61f7b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:11 +0000 Subject: [PATCH 050/505] =?UTF-8?q?gnome.eog:=2042.3=20=E2=86=92=2043.alph?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/42.3...43.alpha Changelog-Reviewed-By: Jan Tojnar --- 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 3f9333aeb584..d680f034a0d8 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.3"; + version = "43.alpha"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MMGzwovG3ChU2Hjr0xoi6qFb+VnBNCBqKhkEGT5H9Do="; + sha256 = "sha256-8/ERugeyuy56hN0RDZ7EWhvFNvJPyIW5TEbUXJ2khsI="; }; patches = [ From b1dcbc2e5eeb65781ca37773b6018f27ecc12672 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:19 +0000 Subject: [PATCH 051/505] =?UTF-8?q?gnome.ghex:=2042.3=20=E2=86=92=2043.alp?= =?UTF-8?q?ha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/42.3...43.alpha Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/ghex/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 58659d1748e5..3c3925c0aef0 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -12,6 +12,7 @@ , itstool , libxml2 , gtk4 +, libadwaita , glib , atk , gobject-introspection @@ -20,13 +21,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "42.3"; + version = "43.alpha"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rdQPirJJIdsw0nvljwAnMgGXfYf9yNeezq36iw41Te8="; + sha256 = "tJttVHJ8Jmo22JQj0r+1OFB/aVU3Q2IoL8UiLMIxC48="; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 + libadwaita atk glib ]; From e235ce0a18ab1540d5424a4aa9c9d4dbfeb98eed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:25 +0000 Subject: [PATCH 052/505] =?UTF-8?q?gnome.gedit:=2042.2=20=E2=86=92=2043.al?= =?UTF-8?q?pha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gedit/-/compare/42.2...43.alpha Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/apps/gedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index 624ccc36d675..10f39ef94b4a 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "42.2"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PGIpER8KwGauRJZJIHkdEmX1u7VrC9lJppt7EmH8j8o="; + sha256 = "K3iOqhbYeeOVdGmS/OdmC5WtIpQ5OgHs0t5CzdWW95o="; }; patches = [ From 351cd0b5a8ac57432b5170edf81f7fbe305d181d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:27 +0000 Subject: [PATCH 053/505] =?UTF-8?q?gnome.gnome-boxes:=2042.3=20=E2=86=92?= =?UTF-8?q?=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/42.3...43.alpha Co-Authored-By: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- .../desktops/gnome/apps/gnome-boxes/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 0f0d8518e926..6cb4cd672247 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -12,14 +13,13 @@ , libxml2 , gtk3 , gtksourceview4 -, gtk-vnc , libvirt , spice-gtk , python3 , appstream-glib , spice-protocol , libhandy -, libsoup +, libsoup_3 , libosinfo , systemd , tracker @@ -45,7 +45,7 @@ , numactl , libapparmor , json-glib -, webkitgtk +, webkitgtk_4_1 , vte , glib-networking , qemu-utils @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "42.3"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Vu/3+vgwD6oc4U+An468Knu02RWvx7EnNxKXkWBbYNM="; + sha256 = "BEUHGaCDN8/fF1D18N82gwc7Xg6kisynSb4j0Ev7+yY="; }; patches = [ @@ -95,7 +95,6 @@ stdenv.mkDerivation rec { glib-networking gmp gnome.adwaita-icon-theme - gtk-vnc gtk3 gtksourceview4 json-glib @@ -108,7 +107,7 @@ stdenv.mkDerivation rec { libosinfo librsvg libsecret - libsoup + libsoup_3 libusb1 libvirt libvirt-glib @@ -120,7 +119,7 @@ stdenv.mkDerivation rec { tracker tracker-miners vte - webkitgtk + webkitgtk_4_1 yajl ]; From 5d231c68b975286d592b59a79472a7ac1663bae3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:28 +0000 Subject: [PATCH 054/505] =?UTF-8?q?gnome.gnome-calculator:=2042.2=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/42.2...43.alpha Co-Authored-By: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index c31c6de3b9f1..f4fd7918c14e 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -11,7 +11,7 @@ , gtk4 , glib , gtksourceview5 -, wrapGAppsHook +, wrapGAppsHook4 , gobject-introspection , gnome , mpfr @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "42.2"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M9qxvKQ2WNZlIJWLD2dMsK0xhc/TDBLkWef2lIHFxqA="; + sha256 = "SUAYyg8lJQ55pbI1rUx+Pq88RzgV5qGi1tSqJW1F6LE="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { vala gettext itstool - wrapGAppsHook + wrapGAppsHook4 gobject-introspection # for finding vapi files ]; From 58e663e63429112a1ce977ab4fa5c60614a7fe97 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:29 +0000 Subject: [PATCH 055/505] =?UTF-8?q?gnome.gnome-calendar:=2042.2=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/42.2...43.alpha Changelog-Reviewed-By: Jan Tojnar --- .../gnome/apps/gnome-calendar/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 432980300d2d..0e63e106ac35 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -7,14 +7,14 @@ , wrapGAppsHook4 , libgweather , geoclue2 -, geocode-glib +, geocode-glib_2 , gettext , libxml2 , gnome , gtk4 -, evolution-data-server +, evolution-data-server-gtk4 , libical -, libsoup +, libsoup_3 , glib , gsettings-desktop-schemas , libadwaita @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "42.2"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rnzGOq6WoCqlmbbWo0hYX0529ylTbznvt0QwKwW1+70="; + sha256 = "VJOLEzJq0L4xYp/RL9/tJgp0A8AIehU0TaNYxgxGyuc="; }; nativeBuildInputs = [ @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 - evolution-data-server # waiting for GTK4 port + evolution-data-server-gtk4 libical - libsoup + libsoup_3 glib libgweather geoclue2 - geocode-glib + geocode-glib_2 gsettings-desktop-schemas libadwaita ]; From 9a8d59a773eb5672a6c2f9d9eec12e59a1163475 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:33 +0000 Subject: [PATCH 056/505] =?UTF-8?q?gnome.gnome-characters:=2042.0=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/42.0...43.alpha Co-Authored-By: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-characters/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index b4e9eee9712f..52a96322965a 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "42.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XaD/uBb4prRPMDdEyoJ6NAgBGMHJONjXmvF7f+Z5gPg="; + sha256 = "+nsOO5XmJXOvLSPmp/OlbbiXGQZJsB6cp+sAfYkS5cA="; }; patches = [ @@ -63,10 +63,6 @@ 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-characters/-/merge_requests/70 - substituteInPlace meson_post_install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; dontWrapGApps = true; From be82dd7c8f35f65ad7698e09e4b0ac95097f843f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:35 +0000 Subject: [PATCH 057/505] =?UTF-8?q?gnome.gnome-clocks:=2042.0=20=E2=86=92?= =?UTF-8?q?=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/compare/42.0...43.alpha Co-Authored-By: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- .../desktops/gnome/apps/gnome-clocks/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 2700f769b083..a3a02a06e384 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -5,10 +5,10 @@ , ninja , gettext , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , itstool , desktop-file-utils -, vala_0_56 +, vala , gobject-introspection , libxml2 , gtk4 @@ -17,7 +17,7 @@ , sound-theme-freedesktop , gsettings-desktop-schemas , gnome-desktop -, geocode-glib +, geocode-glib_2 , gnome , gdk-pixbuf , geoclue2 @@ -27,21 +27,21 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "42.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "DnEY20oDLjzqMhLZjLuCjWt88i/gXgxfyLORxqPdb+A="; + sha256 = "VLi556iRF3b1hF8INdrZtCFtHpRZtsdb/zKXzyT0d8U="; }; nativeBuildInputs = [ - vala_0_56 + vala meson ninja pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils libxml2 gobject-introspection # for finding vapi files @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gdk-pixbuf gnome-desktop - geocode-glib + geocode-glib_2 geoclue2 libgweather gsound From 056bbc4948bf0edd169255d9e6361b450a86d25c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:46 +0000 Subject: [PATCH 058/505] =?UTF-8?q?gnome.gnome-disk-utility:=2042.0=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= 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.0...43.alpha Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/gnome-disk-utility/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index 89502c8d8830..3b3821c569f1 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -12,7 +12,6 @@ , gtk3 , glib , wrapGAppsHook -, python3 , libnotify , itstool , gnome @@ -21,17 +20,18 @@ , libcanberra-gtk3 , libxslt , docbook-xsl-nons +, desktop-file-utils , libpwquality , systemd }: stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "42.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-G2VkRU1nQmMiyzv8WlVYZTv8ff7qKuCCWx0IYp8BCQs="; + sha256 = "sha256-pfd8XGC9gmdCwjXnRZWok7+aRGC4AUWjLUaxR35ME/s="; }; nativeBuildInputs = [ @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { itstool libxslt docbook-xsl-nons + desktop-file-utils wrapGAppsHook - python3 libxml2 ]; @@ -63,11 +63,6 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas ]; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-disk-utility"; From 623174dc0e5bdb4c8536b0dda27e2a89dd612192 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:47 +0000 Subject: [PATCH 059/505] =?UTF-8?q?gnome.gnome-control-center:=2042.3=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= 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.3...43.alpha Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/gnome-control-center/default.nix | 15 ++------------- .../gnome/core/gnome-control-center/paths.patch | 13 ------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index f0db2b984922..f41e2481fe76 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -63,18 +63,17 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "42.3"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zgrjZQ3ir368sKfh/JkS7dtu/40lfz/lD/iynBk0HH4="; + sha256 = "sha256-Tcdvb4qrgY3ybL5bAlZ134HkkjEAORco9my2y0xFjz4="; }; patches = [ (substituteAll { src = ./paths.patch; gcm = gnome-color-manager; - gnome_desktop = gnome-desktop; inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) @@ -135,16 +134,6 @@ stdenv.mkDerivation rec { upower ]; - # 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" diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index a6787477b814..565d6ecdef0f 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -54,19 +54,6 @@ index a2376f8a4..98769e08f 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; -diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c -index bd0e07762..0e71351f8 100644 ---- a/panels/info-overview/cc-info-overview-panel.c -+++ b/panels/info-overview/cc-info-overview-panel.c -@@ -172,7 +172,7 @@ load_gnome_version (char **version, - gsize length; - g_autoptr(VersionData) data = NULL; - -- if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml", -+ if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml", - &contents, - &length, - &error)) diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c index 6c2cb5614..8f57159cc 100644 --- a/panels/keyboard/cc-input-list-box.c From 6aaabe014e9df762c395cf9b8da34c36cea3ac4a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:47 +0000 Subject: [PATCH 060/505] =?UTF-8?q?gnome.gnome-font-viewer:=2042.0=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= 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.0...43.alpha Changelog-Reviewed-By: Bobby Rong --- 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 64eb22b186d6..17f1801df598 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.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z6K43/8hoQWhoCHa36IT8TYn5qF5p3x7Wf3O2sqEjcw="; + sha256 = "SpLtD3REhZWeCWIzBWEonxuxca49QT6qjR9xGE8RKyU="; }; doCheck = true; From c226b73605d8f0691b471c28833550f7ae595dd1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:48 +0000 Subject: [PATCH 061/505] =?UTF-8?q?gnome.gnome-initial-setup:=2042.2=20?= =?UTF-8?q?=E2=86=92=2043.alpha.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.2...43.alpha.1 Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/gnome-initial-setup/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 21dda0e092fd..bca63606e44e 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -11,7 +11,7 @@ , fontconfig , gdm , geoclue2 -, geocode-glib +, geocode-glib_2 , glib , gnome-desktop , gnome-online-accounts @@ -20,12 +20,12 @@ , json-glib , krb5 , libpwquality -, librest +, librest_1_0 , libsecret , networkmanager , pango , polkit -, webkitgtk +, webkitgtk_4_1 , systemd , libhandy , libnma @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "42.2"; + version = "43.alpha.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TYPZiySavhW7Kz5+eurZxH+Ei8p7agkavJCLdlQavns="; + sha256 = "40CMKAVdMET/bnDcecI35i6b9lTYh9h7v6Ewo9NHPS8="; }; patches = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { fontconfig gdm geoclue2 - geocode-glib + geocode-glib_2 glib gnome-desktop gnome-online-accounts @@ -76,12 +76,12 @@ stdenv.mkDerivation rec { libhandy libnma libpwquality - librest + librest_1_0 libsecret networkmanager pango polkit - webkitgtk + webkitgtk_4_1 ]; mesonFlags = [ From b5749c6b634c9ae303474e1cfaf4531d9f23fc7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:45:58 +0000 Subject: [PATCH 062/505] =?UTF-8?q?gnome.gnome-maps:=2042.3=20=E2=86=92=20?= =?UTF-8?q?43.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v42.3...v43.alpha Co-Authored-By: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- .../desktops/gnome/apps/gnome-maps/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 1b419aa892e6..e3c8f35f7e3e 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -11,30 +11,25 @@ , gobject-introspection , gdk-pixbuf , librest -, librsvg , libgweather , geoclue2 , wrapGAppsHook -, folks , libchamplain +, libsecret , libsoup , gsettings-desktop-schemas -, webkitgtk , gjs -, libgee , libhandy , geocode-glib -, evolution-data-server -, gnome-online-accounts }: stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "42.3"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5FZGf6zzyP0QyThrXnTEPZWVrZ+3Ulf32gFK+YPWnNE="; + sha256 = "sha256-wFE9g8trmJ5HFZz4nHLnsIgejanl6kfI1+c2LY6uE5A="; }; doCheck = true; @@ -49,24 +44,19 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - evolution-data-server - folks gdk-pixbuf geoclue2 geocode-glib gjs - gnome-online-accounts gobject-introspection gsettings-desktop-schemas gtk3 libchamplain - libgee libgweather libhandy librest - librsvg + libsecret libsoup - webkitgtk ]; postPatch = '' From e1ee44809d771a030e61d98e1edb230d50e4cf1a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:04 +0000 Subject: [PATCH 063/505] =?UTF-8?q?gnome.gnome-remote-desktop:=2042.4=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= 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.4...43.alpha Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 6 ++++-- 1 file changed, 4 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 2d034c2d8bca..91391d065be5 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , python3 +, asciidoc , wrapGAppsHook , glib , libepoxy @@ -28,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "42.4"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-TU0jPvov+lRnMGo8w86Le6IyUtQtSxJy1crJ1d5Fy5o="; + hash = "sha256-MGLnrsKcyQYoPZ0hY0q3cv8NGVxS8n4aLFzMdtehKXE="; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + asciidoc wrapGAppsHook ]; From 2d379754f90192c90bca75ec9034a24fe9d5e54b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:08 +0000 Subject: [PATCH 064/505] =?UTF-8?q?gnome.gnome-settings-daemon:=2042.2=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= 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.2...43.alpha Changelog-Reviewed-By: Jan Tojnar --- .../desktops/gnome/core/gnome-settings-daemon/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 7e236dc39fd1..e54e18f606ef 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -30,7 +30,7 @@ , modemmanager , networkmanager , gnome-desktop -, geocode-glib +, geocode-glib_2 , docbook_xsl , wrapGAppsHook , python3 @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "42.2"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA="; + sha256 = "SlKagmJ6aJfhgxW1htr7kKLBQvpiELRAkcp8eVV9ONM="; }; patches = [ @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { libgweather nss polkit - geocode-glib + geocode-glib_2 geoclue2 systemd libgudev From 9da19b7128598f07aada37b7d8012ea9a811b27b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:10 +0000 Subject: [PATCH 065/505] =?UTF-8?q?gnome.gnome-shell-extensions:=2042.3=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= 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.3...43.alpha Changelog-Reviewed-By: Jan Tojnar --- 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 c60e06ea640a..91246c70f03a 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.3"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "DsK+oy6fKKyAWJH2ExlNSPwMCR8JxIMTBlo4hPcic/w="; + sha256 = "zoqztQf0NCz6Z3F/zL/VD8LW0sHOVu3SvnTtDyawlu8="; }; patches = [ From 8c5884ef4e9e5268bc1c2e5d35a87e5068a0868c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:34 +0000 Subject: [PATCH 066/505] =?UTF-8?q?gnome.mutter:=2042.4=20=E2=86=92=2043.a?= =?UTF-8?q?lpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/42.4...43.alpha Co-Authored-By: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/mutter/default.nix | 19 +++---------------- .../gnome/core/mutter/fix-paths.patch | 13 ------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/mutter/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index d49c1e2f6aa5..3c74d4759c12 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -1,5 +1,4 @@ { fetchurl -, substituteAll , runCommand , lib , stdenv @@ -11,7 +10,6 @@ , pango , json-glib , libstartup_notification -, zenity , libcanberra , ninja , xvfb-run @@ -46,26 +44,15 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "42.4"; + version = "43.alpha"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wix/o9GHBh2/KAw4UOEYt7UAkGXQHeMWFqzVAMSYKkA="; + sha256 = "IM4d5uTepo8AEFFihn6s6nJ26WdeconFgXIu/Pou7IA="; }; - patches = [ - # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking - # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 - # ./drop-inheritable.patch - - (substituteAll { - src = ./fix-paths.patch; - inherit zenity; - }) - ]; - mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these @@ -136,7 +123,7 @@ let self = stdenv.mkDerivation rec { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; passthru = { - libdir = "${self}/lib/mutter-10"; + libdir = "${self}/lib/mutter-11"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' diff --git a/pkgs/desktops/gnome/core/mutter/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/fix-paths.patch deleted file mode 100644 index 6ac0a431f61f..000000000000 --- a/pkgs/desktops/gnome/core/mutter/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/util.c b/src/core/util.c -index 57b73747d..f424cc81c 100644 ---- a/src/core/util.c -+++ b/src/core/util.c -@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, - - args = g_ptr_array_new (); - -- append_argument (args, "zenity"); -+ append_argument (args, "@zenity@/bin/zenity"); - append_argument (args, type); - - if (display) From 2b093b267831363c312442ebb4179fbf72447ac6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:11 +0000 Subject: [PATCH 067/505] =?UTF-8?q?gnome.gnome-shell:=2042.4=20=E2=86=92?= =?UTF-8?q?=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes bluetooth and recorder dependencies from meson file but they are still used at runtime. https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/42.4...43.alpha Changelog-Reviewed-By: Jan Tojnar --- 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 833e0575e339..294c7e801fe0 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.4"; + version = "43.alpha"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "h1/ylw6p+3oFUG4yoNUNyRf0G0yjcTS0E3f5yChzxU4="; + sha256 = "79OvceBnO5hxTxxhDGv/ffcBvB0tRoeVG7aJt47jkPw="; }; patches = [ From 6c1bb46ee6934c175ada425cfed5d5631d9200ce Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:12 +0000 Subject: [PATCH 068/505] =?UTF-8?q?gnome.gnome-software:=2042.4=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/42.4...43.alpha Enable malcontent and gudev support. We did not have the former packaged when it was added (https://github.com/NixOS/nixpkgs/commit/59816457b6222ae4ed0ef3c41c5b32a026a2e60a) and probably forgot to introduce the latter (https://github.com/NixOS/nixpkgs/commit/1c1d677149797d6be7e484b020aa4ac69efc55be). Also do not build tests since they require extra dependencies and do not work anyway. Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-software/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index ab35257baa5b..10442fea34c2 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -24,7 +24,9 @@ , gtk4 , gsettings-desktop-schemas , gnome-desktop +, libgudev , libxmlb +, malcontent , json-glib , libsecret , valgrind-light @@ -42,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "42.4"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cRgp7mf58qG2S/oXQTdzuY8NxdIZ649sohfNZXK7SnQ="; + sha256 = "Xx913hkGKXJyBeubS886hP1tpwxAdZAXB6V3sOh5P6g="; }; patches = [ @@ -87,18 +89,19 @@ stdenv.mkDerivation rec { ostree polkit flatpak + libgudev libxmlb + malcontent libsysprof-capture ] ++ lib.optionals withFwupd [ fwupd ]; mesonFlags = [ - "-Dgudev=false" - # FIXME: package malcontent parental controls - "-Dmalcontent=false" # Needs flatpak to upgrade "-Dsoup2=true" + # Requires /etc/machine-id, D-Bus system bus, etc. + "-Dtests=false" ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ]; From 6fe1f9d2e9a4f59100c0a8aa18798f36b92472ef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:17 +0000 Subject: [PATCH 069/505] =?UTF-8?q?gnome.gnome-sudoku:=2042.0=20=E2=86=92?= =?UTF-8?q?=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/42.0...43.alpha Changelog-Reviewed-By: Bobby Rong --- 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 87e7c467d04c..6ff6162a5d80 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 = "42.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HS603bgCa0Q2Rc81hbjfEkTjgo7hwHUYBSslmeHFwo8="; + sha256 = "obATI8CvAcf48ujT4+wEDPkl35ypH671Rr7dSEmXivQ="; }; nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; From 166c53a9d76532b28f8539be8c9ad6bbf80353e3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:23 +0000 Subject: [PATCH 070/505] =?UTF-8?q?gnome.gnome-weather:=2042.0=20=E2=86=92?= =?UTF-8?q?=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/42.0...43.alpha Changelog-Reviewed-By: Jan Tojnar --- 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 c04cd6f2dc96..f2ad091e3745 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.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "V57mkdhT5bs/9Q6Me0P4Wundfls6ZJ4CwlSi2bgHtGU="; + sha256 = "2e+J2ovMWO9gFpcJkHO8/Da39MMuDatWJ7c+cxcLCFs="; }; nativeBuildInputs = [ From 7edbfec1c7c54df0dfa31e0f9ad8c7f4bc8d9c07 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:35 +0000 Subject: [PATCH 071/505] =?UTF-8?q?gnome.nautilus:=2042.2=20=E2=86=92=2043?= =?UTF-8?q?.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/42.2...43.alpha Co-Authored-By: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/nautilus/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 53d68c12080a..37c5ac2aa724 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -7,11 +7,10 @@ , gettext , libxml2 , desktop-file-utils -, python3 -, wrapGAppsHook -, gtk3 -, libhandy -, libportal-gtk3 +, wrapGAppsHook4 +, gtk4 +, libadwaita +, libportal-gtk4 , gnome , gnome-autoar , glib-networking @@ -34,13 +33,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "42.2"; + version = "43.alpha"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "mSEtLrdZlvGBcorQSi4thvJXewZOaKNMi4GnA330zLI="; + sha256 = "hjVoot3dHPgTNmbDe4Cwf4AN6Wbomh0l4QM0mP+iw5k="; }; patches = [ @@ -62,8 +61,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -73,9 +71,9 @@ stdenv.mkDerivation rec { gnome.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base - gtk3 - libhandy - libportal-gtk3 + gtk4 + libadwaita + libportal-gtk4 libexif libnotify libseccomp @@ -83,10 +81,11 @@ stdenv.mkDerivation rec { shared-mime-info tracker tracker-miners + gnome-autoar ]; propagatedBuildInputs = [ - gnome-autoar + gtk4 ]; preFixup = '' @@ -98,10 +97,6 @@ stdenv.mkDerivation rec { ) ''; - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; From 64c9444f9775e9af9a5bd77e3c7d485714d6fda9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Aug 2022 19:27:30 +0000 Subject: [PATCH 072/505] gssdp_1_6: init at 1.5.2 https://gitlab.gnome.org/GNOME/gssdp/-/compare/gssdp-1.4.0.1...gssdp-1.5.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gssdp/1.6.nix | 83 +++++++++++++++++++ pkgs/development/libraries/gssdp/default.nix | 1 + .../libraries/gssdp/standalone-tools.patch | 4 +- pkgs/development/libraries/gssdp/tools.nix | 12 +-- pkgs/top-level/all-packages.nix | 2 + 5 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/gssdp/1.6.nix diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix new file mode 100644 index 000000000000..0408d1544353 --- /dev/null +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, python3 +, libsoup_3 +, glib +, gnome +, gssdp-tools +}: + +stdenv.mkDerivation rec { + pname = "gssdp"; + version = "1.5.2"; + + outputs = [ "out" "dev" ] + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "60CscnTY3AbRonW8iBMlfZlg54qKbZrPPgF6oWoXFh4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + python3 + ]; + + buildInputs = [ + libsoup_3 + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dsniffer=false" + "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + ]; + + doCheck = true; + + postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' + # Move developer documentation to devdoc output. + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ + | while IFS= read -r -d ''' file; do + moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc" + done + ''; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "gssdp_1_6"; + packageName = pname; + }; + + tests = { + inherit gssdp-tools; + }; + }; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "GObject-based API for handling resource discovery and announcement over SSDP"; + homepage = "http://www.gupnp.org/"; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 21af779a5112..3ec5cea99b04 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; + freeze = true; }; tests = { diff --git a/pkgs/development/libraries/gssdp/standalone-tools.patch b/pkgs/development/libraries/gssdp/standalone-tools.patch index f2273a978d67..6491afbe8678 100644 --- a/pkgs/development/libraries/gssdp/standalone-tools.patch +++ b/pkgs/development/libraries/gssdp/standalone-tools.patch @@ -22,9 +22,9 @@ index 40eb8e3..5db545b 100644 +project('gssdp-tools', 'c', version: '@version@') +gnome = import('gnome') + -+gssdp = dependency('gssdp-1.2') ++gssdp = dependency('gssdp-1.6') +gtk = dependency('gtk4', version : '>= 4') -+libsoup = dependency('libsoup-2.4', version : '>= 2.26.1') ++libsoup = dependency('libsoup-3.0', version : '>= 2.99.0') + resource = gnome.compile_resources( 'org.gupnp.GSSDP.DeviceSniffer', diff --git a/pkgs/development/libraries/gssdp/tools.nix b/pkgs/development/libraries/gssdp/tools.nix index 36bc56429008..5fcd0219a945 100644 --- a/pkgs/development/libraries/gssdp/tools.nix +++ b/pkgs/development/libraries/gssdp/tools.nix @@ -5,14 +5,14 @@ , ninja , pkg-config , wrapGAppsHook4 -, gssdp +, gssdp_1_6 , gtk4 -, libsoup +, libsoup_3 }: stdenv.mkDerivation rec { pname = "gssdp-tools"; - inherit (gssdp) version src; + inherit (gssdp_1_6) version src; patches = [ # Allow building tools separately from the library. @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gssdp + gssdp_1_6 gtk4 - libsoup + libsoup_3 ]; preConfigure = '' @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Device Sniffer tool based on GSSDP framework"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; - maintainers = gssdp.meta.maintainers; + maintainers = gssdp_1_6.meta.maintainers; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 616a046061fe..f248f3e0910f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7426,6 +7426,8 @@ with pkgs; gssdp = callPackage ../development/libraries/gssdp { }; + gssdp_1_6 = callPackage ../development/libraries/gssdp/1.6.nix { }; + gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; grype = callPackage ../tools/security/grype { }; From c7df550cbac222ecf10b86a9a2a13e1580ba1010 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Aug 2022 19:27:41 +0000 Subject: [PATCH 073/505] gupnp_1_6: init at 1.5.3 https://gitlab.gnome.org/GNOME/gupnp/-/compare/gupnp-1.4.3...gupnp-1.5.3 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gupnp/1.6.nix | 88 ++++++++++++++++++++ pkgs/development/libraries/gupnp/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 91 insertions(+) create mode 100644 pkgs/development/libraries/gupnp/1.6.nix diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix new file mode 100644 index 000000000000..8aeae4310cf5 --- /dev/null +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -0,0 +1,88 @@ +{ stdenv +, lib +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, glib +, gssdp_1_6 +, libsoup_3 +, libxml2 +, gnome +}: + +stdenv.mkDerivation rec { + pname = "gupnp"; + version = "1.5.3"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-dF4/qzOzqhbbNCYxmK/c/9XjWCKjKA277O9210HEhoc="; + }; + + patches = [ + # Do not use deprecated symbols after libsoup update. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/1296d10eda308792d2924f141d72b8b6818878bd.patch"; + sha256 = "mboJQ9I7oV+HXt0atUSLt6FDTCCT22lbuI7OUb0tDLM="; + }) + + # Fix test after libsoup update. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/fba0ca75445189f6554bd66fb3aa4f022b8f69e9.patch"; + sha256 = "6dkpnDqHVvesrzEIYLbHdoB0dfePr0ll8jQxijuu24E="; + }) + ]; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + ]; + + propagatedBuildInputs = [ + glib + gssdp_1_6 + libsoup_3 + libxml2 + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dintrospection=true" + ]; + + doCheck = true; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "gupnp_1_6"; + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "http://www.gupnp.org/"; + description = "An implementation of the UPnP specification"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index afb6c0d037cb..07b64064ce63 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; + freeze = true; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f248f3e0910f..664f95b56f2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7460,6 +7460,8 @@ with pkgs; gupnp = callPackage ../development/libraries/gupnp { }; + gupnp_1_6 = callPackage ../development/libraries/gupnp/1.6.nix { }; + gupnp-av = callPackage ../development/libraries/gupnp-av {}; gupnp-dlna = callPackage ../development/libraries/gupnp-dlna {}; From 3362cdbe6e21ef8ed385acfd278281be21076e79 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:43 +0000 Subject: [PATCH 074/505] =?UTF-8?q?gnome.rygel:=200.40.4=20=E2=86=92=200.4?= =?UTF-8?q?1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/rygel/-/compare/rygel-0.40.4...rygel-0.41.1 Changelog-Reviewed-By: Jan Tojnar --- .../add-option-for-installation-sysconfdir.patch | 6 +++--- pkgs/desktops/gnome/core/rygel/default.nix | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch index d2319ec13ed3..5204e3518aba 100644 --- a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch +++ b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index 8af2fcf9..0e318307 100644 +index 27bde61f..3d434de9 100644 --- a/meson.build +++ b/meson.build @@ -22,7 +22,11 @@ if not get_option('uninstalled') @@ -12,8 +12,8 @@ index 8af2fcf9..0e318307 100644 + else + rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) + endif - rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') - rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') + rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.8', 'plugins') + rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.8', 'engines') rygel_presetdir = join_paths(rygel_datadir, 'presets') @@ -57,7 +61,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) conf.set_quoted('PLUGIN_DIR', rygel_plugindir) diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index c09fb5450f3f..800456551d56 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -10,13 +10,13 @@ , wrapGAppsHook , python3 , glib -, gssdp -, gupnp +, gssdp_1_6 +, gupnp_1_6 , gupnp-av , gupnp-dlna , gst_all_1 , libgee -, libsoup +, libsoup_3 , gtk3 , libmediaart , sqlite @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.40.4"; + version = "0.41.1"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "c22K2+hhX2y8j8//mEXcmF/RDhZinaI2tLUtvt8KNIs="; + sha256 = "t+ZUlxUjkVSyeHqRizH17WhAQGTQpn72aW9MdwrHNvM="; }; patches = [ @@ -56,12 +56,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gssdp - gupnp + gssdp_1_6 + gupnp_1_6 gupnp-av gupnp-dlna libgee - libsoup + libsoup_3 gtk3 libmediaart sqlite From cfbd446294446f19ccf4c1904b8cae16c37a4a87 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:49 +0000 Subject: [PATCH 075/505] =?UTF-8?q?gnome.totem:=2042.0=20=E2=86=92=2043.al?= =?UTF-8?q?pha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/totem/-/compare/42.0...43.alpha Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/totem/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 44e1319f8d4a..1c3a44d63deb 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -19,6 +19,7 @@ , grilo , grilo-plugins , libpeas +, libportal-gtk3 , libhandy , adwaita-icon-theme , gnome-desktop @@ -29,11 +30,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "42.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "SvBJHduV34szruOZ06UPnHqxfeiNOvYzVlZ8+I9X5qs="; + sha256 = "9pKUwVa0vZU+AQBdY+M+RWOTX5kmMDj65LxNlMEOuII="; }; nativeBuildInputs = [ @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas + libportal-gtk3 libhandy shared-mime-info gdk-pixbuf From b6c3b38a13a2abde86ba132d65e54e53dec7837d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:46:59 +0000 Subject: [PATCH 076/505] =?UTF-8?q?gnome-latex:=203.40.0=20=E2=86=92=203.4?= =?UTF-8?q?1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/swilmet/gnome-latex/-/compare/3.40.0...3.41.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/editors/gnome-latex/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index fe8666fd741b..3a4760265d12 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -15,18 +15,18 @@ , gnome , glib , pkg-config -, intltool +, gettext , itstool , libxml2 }: stdenv.mkDerivation rec { - version = "3.40.0"; + version = "3.41.2"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xad/55vUDjeOooyPRaZjJ/vIzFw7W48PCcAhfufMCpA="; + sha256 = "8xDwoUUEmfDP92y5+cXWaZGpUGH6s9bmcMSlZHOF1jM="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsHook itstool - intltool + gettext ]; buildInputs = [ From 44d40ec13bcae1de91e8f8405218521ce9103262 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:47:04 +0000 Subject: [PATCH 077/505] =?UTF-8?q?gnome-builder:=2042.1=20=E2=86=92=2043.?= =?UTF-8?q?alpha0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/42.1...43.alpha0 Changelog-Reviewed-By: Jan Tojnar --- .../editors/gnome-builder/default.nix | 66 ++++++++++++------- .../fix-finding-test-typelibs.patch | 13 ++++ 2 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 7cfde3a91f39..aa7096a49bc2 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -2,7 +2,6 @@ , lib , ctags , cmark -, appstream-glib , desktop-file-utils , fetchurl , flatpak @@ -10,20 +9,21 @@ , libgit2-glib , gi-docgen , gobject-introspection -, glade -, gspell -, gtk3 -, gtksourceview4 +, enchant +, icu +, gtk4 +, gtksourceview5 , json-glib , jsonrpc-glib -, libdazzle -, libhandy +, libadwaita +, libpanel , libpeas -, libportal-gtk3 +, libportal-gtk4 , libxml2 , meson , ninja , ostree +, d-spy , pcre , pcre2 , pkg-config @@ -31,26 +31,39 @@ , sysprof , template-glib , vala -, vte -, webkitgtk -, wrapGAppsHook +, vte-gtk4 +, webkitgtk_5_0 +, wrapGAppsHook4 , dbus , xvfb-run }: stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "42.1"; + version = "43.alpha0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XU1RtwKGW0gBcgHwxgfiSifXIDGo9ciNT86HW1VFZwo="; + sha256 = "SSjohWD2mn6riFR8CBeHzadbzi85XMWivgj4K8b5ujY="; }; + patches = [ + # The test environment hardcodes `GI_TYPELIB_PATH` environment variable to direct dependencies of libide & co. + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2ce510b0ec0518c29427a29b386bb2ac1a121edf + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2964f7c2a0729f2f456cdca29a0f5b7525baf7c1 + # + # But Nix does not have a fallback path for typelibs like /usr/lib on FHS distros and relies solely + # on `GI_TYPELIB_PATH` environment variable. So, when Ide started to depend on Vte, which + # depends on Pango, among others, GIrepository was unable to find these indirect dependencies + # and crashed with: + # + # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) + ./fix-finding-test-typelibs.patch + ]; + nativeBuildInputs = [ - appstream-glib desktop-file-utils gi-docgen gobject-introspection @@ -59,35 +72,35 @@ stdenv.mkDerivation rec { pkg-config python3 python3.pkgs.wrapPython - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ ctags cmark flatpak - gnome.devhelp - glade libgit2-glib libpeas - libportal-gtk3 - vte - gspell - gtk3 - gtksourceview4 + libportal-gtk4 + vte-gtk4 + enchant + icu + gtk4 + gtksourceview5 json-glib jsonrpc-glib - libdazzle - libhandy + libadwaita + libpanel libxml2 ostree + d-spy pcre pcre2 python3 sysprof template-glib vala - webkitgtk + webkitgtk_5_0 ]; checkInputs = [ @@ -109,7 +122,10 @@ stdenv.mkDerivation rec { doCheck = true; postPatch = '' + # Drop after https://gitlab.gnome.org/GNOME/gnome-builder/-/merge_requests/609 patchShebangs build-aux/meson/post_install.py + substituteInPlace build-aux/meson/post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; checkPhase = '' diff --git a/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch b/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch new file mode 100644 index 000000000000..1c6c663c69a7 --- /dev/null +++ b/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index c9a44e418..cd9e466d6 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -35,7 +35,7 @@ foreach test_typelib_dep: test_typelib_deps + test_gi_typelib_path += [join_paths(test_typelib_dep.get_variable('libdir'), 'girepository-1.0')] + endforeach + test_env = [ +- 'GI_TYPELIB_PATH=@0@'.format(':'.join(test_gi_typelib_path)), ++ 'GI_TYPELIB_PATH=@0@:@1@'.format(':'.join(test_gi_typelib_path), run_command('sh', ['-c', 'echo "$GI_TYPELIB_PATH"']).stdout().strip()), + 'G_TEST_SRCDIR=@0@/tests'.format(meson.current_source_dir()), + 'G_TEST_BUILDDIR=@0@/tests'.format(meson.current_build_dir()), + 'G_DEBUG=gc-friendly', From 0315bbcf369a4a435dea7b1a519246ff0aa2e620 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:47:06 +0000 Subject: [PATCH 078/505] =?UTF-8?q?gnome-online-accounts:=203.44.0=20?= =?UTF-8?q?=E2=86=92=203.45.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.44.0...3.45.1 Changelog-Reviewed-By: Jan Tojnar --- .../gnome-online-accounts/default.nix | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 1fed0b470691..e8410ed61054 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab +, fetchpatch , pkg-config , vala , glib @@ -8,16 +10,17 @@ , python3 , libxslt , gtk3 -, webkitgtk +, webkitgtk_4_1 , json-glib -, librest +, librest_1_0 +, libxml2 , libsecret , gtk-doc , gobject-introspection , gettext , icu , glib-networking -, libsoup +, libsoup_3 , docbook-xsl-nons , docbook_xml_dtd_412 , gnome @@ -30,7 +33,9 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.44.0"; + version = "3.45.1"; + + outputs = [ "out" "man" "dev" "devdoc" ]; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,10 +43,16 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-8dp3cizyQVHegDxX9G6iGLW5g44audn431hCPMS/KlA="; + sha256 = "sha256-1FqOJ+nKQdK5r2fP7oAvh1LfG+T1S1NSJ+9kNZ5I76Q="; }; - outputs = [ "out" "man" "dev" "devdoc" ]; + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/95 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/commit/2da899c48795e9941661f3eb06fc4fc04ec7b0fa.patch"; + sha256 = "5qDiKnX9gx7eo//Qxa0+M9rsFKpg8dplA3IUZHuacmA="; + }) + ]; mesonFlags = [ "-Dfedora=false" # not useful in NixOS or for NixOS users. @@ -75,10 +86,11 @@ stdenv.mkDerivation rec { icu json-glib libkrb5 - librest + librest_1_0 + libxml2 libsecret - libsoup - webkitgtk + libsoup_3 + webkitgtk_4_1 ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; From adb4ce49149cb1a344cb4ba8c29a1ad5073a2b9c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:47:07 +0000 Subject: [PATCH 079/505] =?UTF-8?q?gnome-text-editor:=2042.2=20=E2=86=92?= =?UTF-8?q?=2043.alpha0?= 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.2...43.alpha0 Changelog-Reviewed-By: Jan Tojnar --- 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 faf32952cfc2..f7a30d5bc4ff 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.2"; + version = "43.alpha0"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5W1KjNy86KjxwIgbRd55n4slIF7Ay/ImnlMgJXYcxdo="; + sha256 = "sha256-4I7wRiGD7RAkJfdLXgsEMsoM5NlGyBKyOQuFB/5rb6A="; }; nativeBuildInputs = [ From 760846f2a4da20bb2b4076186d43e9afe6b63966 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:48:41 +0000 Subject: [PATCH 080/505] =?UTF-8?q?orca:=2042.3=20=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_42_3...ORCA_43_ALPHA Changelog-Reviewed-By: Jan Tojnar --- 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 639ad2175b41..9b3ed3990bad 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.3"; + version = "43.alpha"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+ty6C/6uHmZyJmJk529j/lq/jw77NL4Ri1qXP7by9yQ="; + sha256 = "6dZU+qBlHLm2UAvEsxj52X/Z8zvZ2Ut/JKGyeZarnkU="; }; patches = [ From 0f4c9742abd1142f1045f7d1ba6ef9b45b1549fe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:48:52 +0000 Subject: [PATCH 081/505] =?UTF-8?q?sysprof:=203.44.0=20=E2=86=92=203.45.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sysprof/-/compare/3.44.0...3.45.0 Changelog-Reviewed-By: Jan Tojnar --- .../tools/profiling/sysprof/capture.nix | 9 +++++---- .../tools/profiling/sysprof/default.nix | 19 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index e6690fc0c68b..913351ce540a 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dwith_sysprofd=none" + "-Dsysprofd=none" + "-Dgtk=false" "-Dlibsysprof=false" "-Dlibunwind=false" "-Dhelp=false" - "-Denable_tools=false" - "-Denable_tests=false" - "-Denable_examples=false" + "-Dtools=false" + "-Dtests=false" + "-Dexamples=false" ]; meta = sysprof.meta // { diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 118b55197da5..7f03c2d6db80 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -4,10 +4,10 @@ , fetchurl , gettext , glib -, gtk3 +, gtk4 , json-glib , itstool -, libdazzle +, libadwaita , libunwind , libxml2 , meson @@ -17,19 +17,19 @@ , polkit , shared-mime-info , systemd -, wrapGAppsHook +, wrapGAppsHook4 , gnome }: stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.44.0"; + version = "3.45.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "q12fW3GXOzCI1Yob/fHcI8OaAvX85OXpxz4DSxeLAFs="; + sha256 = "dpAWjFpDJ9++7b1fD+td79Z2zR1hN8Pn14/Inz1lXy8="; }; nativeBuildInputs = [ @@ -41,18 +41,17 @@ stdenv.mkDerivation rec { ninja pkg-config shared-mime-info - wrapGAppsHook - gnome.adwaita-icon-theme - glib + wrapGAppsHook4 ]; buildInputs = [ - gtk3 + glib + gtk4 json-glib pango polkit systemd - libdazzle + libadwaita libunwind ]; From a5e128ab333a6799e724ad5d3620f57ccb208f7d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:48:56 +0000 Subject: [PATCH 082/505] =?UTF-8?q?shotwell:=200.30.16=20=E2=86=92=200.31.?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/shotwell/-/compare/shotwell-0.30.16...shotwell-0.31.5 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/graphics/shotwell/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a4eb30682397..251dfdef32f4 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -6,11 +6,11 @@ , libexif , libgphoto2 , libwebp -, libsoup +, libsoup_3 , libxml2 , vala , sqlite -, webkitgtk +, webkitgtk_4_1 , pkg-config , gnome , gst_all_1 @@ -30,7 +30,6 @@ , wrapGAppsHook , gobject-introspection , itstool -, libgdata , libchamplain , libsecret , gsettings-desktop-schemas @@ -41,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.16"; + version = "0.31.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo="; + sha256 = "sha256-OwSPxs6ZsjLR4OqbjbB0CDyGyI07bWMTaiz4IXqkXBk="; }; nativeBuildInputs = [ @@ -66,10 +65,10 @@ stdenv.mkDerivation rec { libexif libgphoto2 libwebp - libsoup + libsoup_3 libxml2 sqlite - webkitgtk + webkitgtk_4_1 gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-plugins-base @@ -87,7 +86,6 @@ stdenv.mkDerivation rec { librest gcr gnome.adwaita-icon-theme - libgdata libchamplain libsecret ]; From 209c00ed18e25e15fac886adfe7e20e481600936 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Jul 2022 00:03:41 +0200 Subject: [PATCH 083/505] modemmanager: disable tests They are failing with GLib 2.73.2 --- pkgs/tools/networking/modemmanager/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 76459d6d82d0..bd109834907f 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -40,7 +40,9 @@ stdenv.mkDerivation rec { # load libraries from the install path, which doesn't usually exist # when `make check' is run. So to work around that, we run it as an # install check instead, when those paths will have been created. - doInstallCheck = true; + # Failing with GLib 2.73.2 + # https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/601 + doInstallCheck = false; preInstallCheck = '' export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" patchShebangs tools/tests/test-wrapper.sh From 45b0d213394f24755c8ec9d6d0428f3c2974a308 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Jul 2022 07:32:46 +0200 Subject: [PATCH 084/505] =?UTF-8?q?gnome.gnome-user-share:=203.34.0=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-share/-/compare/GNOME_USER_SHARE_3_34_0...43.alpha - nautilus extension was removed https://gitlab.gnome.org/GNOME/gnome-user-share/-/merge_requests/18 - notify and canberra was only used for ObexPush, which was removed in https://gitlab.gnome.org/GNOME/gnome-user-share/-/commit/2acc42792bf879d2a5507253c8bec7f59031558b Changelog-Reviewed-By: jtojnar --- .../gnome/core/gnome-user-share/default.nix | 41 +++---------------- 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix index 4c33b76b0124..cb1f29c4cbe7 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -1,52 +1,29 @@ -{ lib, stdenv +{ stdenv +, lib , gettext , meson , ninja , fetchurl -, fetchpatch , apacheHttpd -, nautilus , pkg-config -, gtk3 , glib , libxml2 , systemd , wrapGAppsHook , itstool -, libnotify , mod_dnssd , gnome -, libcanberra-gtk3 -, python3 }: stdenv.mkDerivation rec { pname = "gnome-user-share"; - version = "3.34.0"; + version = "43.alpha"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"; + url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major version}/gnome-user-share-${version}.tar.xz"; + sha256 = "7XmBH77PI6o0rIUx9j7y4nSw73/CjyXo7Iz3Oy9DPpo="; }; - patches = [ - # fix gio-unix-2.0 lookup - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch"; - sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; - }) - # fix compilation with meson >=0.61 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-user-share/-/commit/c31b0a8f33b95c0077cd5ee2102a71a49bee8abe.patch"; - hash = "sha256-kH+cPBmSErWxsw+IyyjWgENi4I3ZcKjSA9+em8u4DYs="; - }) - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ @@ -57,9 +34,6 @@ stdenv.mkDerivation rec { "-Dhttpd=${apacheHttpd.out}/bin/httpd" "-Dmodules_path=${apacheHttpd}/modules" "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user" - # In 3.34.0 it defaults to false but it is silently ignored and always installed. - # Let’s add it anyway in case they decide to make build respect the option in the future. - "-Dnautilus_extension=true" ]; nativeBuildInputs = [ @@ -70,15 +44,10 @@ stdenv.mkDerivation rec { itstool libxml2 wrapGAppsHook - python3 ]; buildInputs = [ - gtk3 glib - nautilus - libnotify - libcanberra-gtk3 systemd ]; From b2f369ade265325dfee27de85668c8960068203c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Jul 2022 08:10:45 +0200 Subject: [PATCH 085/505] vte-gtk4: init --- pkgs/development/libraries/vte/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 739328117a70..a2eec8092abe 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -9,6 +9,8 @@ , gnome , glib , gtk3 +, gtk4 +, gtkVersion ? "3" , gobject-introspection , vala , python3 @@ -69,15 +71,18 @@ stdenv.mkDerivation rec { systemd ]; - propagatedBuildInputs = [ + propagatedBuildInputs = assert (gtkVersion == "3" || gtkVersion == "4"); [ # Required by vte-2.91.pc. - gtk3 + (if gtkVersion == "3" then gtk3 else gtk4) glib pango ]; mesonFlags = lib.optionals (!systemdSupport) [ "-D_systemd=false" + ] ++ lib.optionals (gtkVersion == "4") [ + "-Dgtk3=false" + "-Dgtk4=true" ] ++ lib.optionals stdenv.isDarwin [ # -Bsymbolic-functions is not supported on darwin "-D_b_symbolic_functions=false" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 664f95b56f2f..b38c9c6ec07e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22430,6 +22430,10 @@ with pkgs; stdenv = clangStdenv; }; + vte-gtk4 = vte.override { + gtkVersion = "4"; + }; + vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { From 88aa798487390b8a6fbe5056e4887eaeb60f1fe2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Jul 2022 23:42:50 +0200 Subject: [PATCH 086/505] librest_1_0: propagate dependencies from Requires pkg-config will not be able to find rest-1.0 otherwise. --- pkgs/development/libraries/librest/1.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/development/libraries/librest/1.0.nix index 30482a510274..cbd525d40b0e 100644 --- a/pkgs/development/libraries/librest/1.0.nix +++ b/pkgs/development/libraries/librest/1.0.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gobject-introspection ]; - buildInputs = [ + propagatedBuildInputs = [ glib json-glib libsoup_3 From 4bb0379b8125489a86f9e47880e4606d97810026 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 27 Jul 2022 00:03:47 +0200 Subject: [PATCH 087/505] =?UTF-8?q?gnome.dconf-editor:=203.38.3=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/dconf-editor/-/compare/3.38.3...43.alpha Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/dconf-editor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix index 4c8607bb6f9f..a4cb0049a190 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "dconf-editor"; - version = "3.38.3"; + version = "43.alpha"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Vxr0x9rU8Em1PmzXKLea3fCMJ92ra8V7OW0hGGbueeM="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-9SyUJAXwzKAyZeF92NZjm9qzOpvu8XNJ5aC9DGAm40s="; }; patches = [ From 50c6895e772b76a9bb5d7be7158a60ea1fb02bea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 27 Jul 2022 00:23:44 +0200 Subject: [PATCH 088/505] =?UTF-8?q?gnome-browser-connector:=2010.1=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://discourse.gnome.org/t/split-and-rename-of-chrome-gnome-shell/11075 https://gitlab.gnome.org/nE0sIghT/gnome-browser-connector/-/compare/815ec9e1afa52bd3af5047e176a4ea9c1bfa2514...v42.0 - Renamed and split into a separate repo from the extensions. - CMake build replaced with Meson (jq also not needed) - requests Python module not needed since updates are now solely handled by GNOME Shell itself Also - Corrected license - Cleaned up the module - Replaced PYTHONPATH in a wrapper by Python environment Changelog-Reviewed-By: Jan Tojnar --- nixos/modules/module-list.nix | 2 +- .../desktops/gnome/chrome-gnome-shell.nix | 41 ----------- .../gnome/gnome-browser-connector.nix | 47 ++++++++++++ .../services/x11/desktop-managers/gnome.nix | 2 +- .../networking/browsers/firefox/wrapper.nix | 4 +- .../extensions/chrome-gnome-shell/default.nix | 71 ------------------- .../gnome-browser-connector/default.nix | 66 +++++++++++++++++ pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 2 +- 9 files changed, 120 insertions(+), 117 deletions(-) delete mode 100644 nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix create mode 100644 nixos/modules/services/desktops/gnome/gnome-browser-connector.nix delete mode 100644 pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix create mode 100644 pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 494df03e3a36..9fc3af4b1ce6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -391,9 +391,9 @@ ./services/desktops/pipewire/pipewire-media-session.nix ./services/desktops/pipewire/wireplumber.nix ./services/desktops/gnome/at-spi2-core.nix - ./services/desktops/gnome/chrome-gnome-shell.nix ./services/desktops/gnome/evolution-data-server.nix ./services/desktops/gnome/glib-networking.nix + ./services/desktops/gnome/gnome-browser-connector.nix ./services/desktops/gnome/gnome-initial-setup.nix ./services/desktops/gnome/gnome-keyring.nix ./services/desktops/gnome/gnome-online-accounts.nix diff --git a/nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix b/nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix deleted file mode 100644 index 7d0ee9ed0221..000000000000 --- a/nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix +++ /dev/null @@ -1,41 +0,0 @@ -# Chrome GNOME Shell native host connector. -{ config, lib, pkgs, ... }: - -with lib; - -{ - meta = { - maintainers = teams.gnome.members; - }; - - # Added 2021-05-07 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "chrome-gnome-shell" "enable" ] - [ "services" "gnome" "chrome-gnome-shell" "enable" ] - ) - ]; - - ###### interface - options = { - services.gnome.chrome-gnome-shell.enable = mkEnableOption (lib.mdDoc '' - Chrome GNOME Shell native host connector, a DBus service - allowing to install GNOME Shell extensions from a web browser. - ''); - }; - - - ###### implementation - config = mkIf config.services.gnome.chrome-gnome-shell.enable { - environment.etc = { - "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; - "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; - }; - - environment.systemPackages = [ pkgs.chrome-gnome-shell ]; - - services.dbus.packages = [ pkgs.chrome-gnome-shell ]; - - nixpkgs.config.firefox.enableGnomeExtensions = true; - }; -} diff --git a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix new file mode 100644 index 000000000000..5d4ddce94220 --- /dev/null +++ b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mdDoc mkEnableOption mkIf mkRenamedOptionModule teams; +in + +{ + meta = { + maintainers = teams.gnome.members; + }; + + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "chrome-gnome-shell" "enable" ] + [ "services" "gnome" "gnome-browser-connector" "enable" ] + ) + # Added 2022-07-25 + (mkRenamedOptionModule + [ "services" "gnome" "chrome-gnome-shell" "enable" ] + [ "services" "gnome" "gnome-browser-connector" "enable" ] + ) + ]; + + options = { + services.gnome.gnome-browser-connector.enable = mkEnableOption (mdDoc '' + Native host connector for the GNOME Shell browser extension, a DBus service + allowing to install GNOME Shell extensions from a web browser. + ''); + }; + + config = mkIf config.services.gnome.gnome-browser-connector.enable { + environment.etc = { + "chromium/native-messaging-hosts/org.gnome.browser_connector.json".source = "${pkgs.gnome-browser-connector}/etc/chromium/native-messaging-hosts/org.gnome.browser_connector.json"; + "opt/chrome/native-messaging-hosts/org.gnome.browser_connector.json".source = "${pkgs.gnome-browser-connector}/etc/opt/chrome/native-messaging-hosts/org.gnome.browser_connector.json"; + # Legacy paths. + "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.gnome-browser-connector}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; + "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.gnome-browser-connector}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; + }; + + environment.systemPackages = [ pkgs.gnome-browser-connector ]; + + services.dbus.packages = [ pkgs.gnome-browser-connector ]; + + nixpkgs.config.firefox.enableGnomeExtensions = true; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index d3db98cb4e2a..c91181491fa1 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -389,8 +389,8 @@ in ++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages; services.colord.enable = mkDefault true; - services.gnome.chrome-gnome-shell.enable = mkDefault true; services.gnome.glib-networking.enable = true; + services.gnome.gnome-browser-connector.enable = mkDefault true; services.gnome.gnome-initial-setup.enable = mkDefault true; services.gnome.gnome-remote-desktop.enable = mkDefault true; services.gnome.gnome-settings-daemon.enable = true; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e09bbef871b5..eeb72590df23 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ ## various stuff that can be plugged in , ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , gnome/*.gnome-shell*/ -, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire +, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge , udev @@ -65,7 +65,7 @@ let ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native - ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge diff --git a/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix deleted file mode 100644 index 779d7506abf5..000000000000 --- a/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv -, fetchurl -, cmake -, ninja -, jq -, python3 -, gnome -, wrapGAppsHook -, gobject-introspection -}: - -let - inherit (python3.pkgs) python pygobject3 requests; -in -stdenv.mkDerivation rec { - pname = "chrome-gnome-shell"; - version = "10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; - sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; - }; - - nativeBuildInputs = [ - cmake - ninja - jq - wrapGAppsHook - gobject-introspection # for setup-hook - ]; - - buildInputs = [ - gnome.gnome-shell - python - pygobject3 - requests - gobject-introspection # for Gio typelib - ]; - - cmakeFlags = [ - "-DBUILD_EXTENSION=OFF" - ]; - - wrapPrefixVariables = [ - "PYTHONPATH" - ]; - - # cmake setup hook changes /etc/opt into /var/empty - dontFixCmake = true; - - preConfigure = '' - substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "chrome-gnome-shell"; - }; - }; - - meta = with lib; { - description = "GNOME Shell integration for Chrome"; - homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"; - longDescription = '' - To use the integration, install the browser extension, and then set to true. - ''; - license = licenses.gpl3; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix new file mode 100644 index 000000000000..57052ddf3c56 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, fetchFromGitLab +, meson +, ninja +, python3 +, gnome +, wrapGAppsNoGuiHook +, gobject-introspection +}: + +let + inherit (python3.pkgs) buildPythonApplication pygobject3; +in +buildPythonApplication rec { + pname = "gnome-browser-connector"; + version = "42.0"; + + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "nE0sIghT"; + repo = "gnome-browser-connector"; + rev = "v${version}"; + sha256 = "pYbV/qCmSrM2nrrKxbxHnJYMDOiW0aeNbFlsm5kKWdk="; + }; + + nativeBuildInputs = [ + meson + ninja + wrapGAppsNoGuiHook + gobject-introspection # for setup-hook + ]; + + buildInputs = [ + gnome.gnome-shell + gobject-introspection # for Gio typelib + ]; + + pythonPath = [ + pygobject3 + ]; + + postPatch = '' + patchShebangs contrib/merge_json.py + ''; + + dontWrapGApps = true; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Native host connector for the GNOME Shell browser extension"; + homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegration"; + longDescription = '' + To use the integration, install the browser extension, and then set to true. + ''; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2e2e4bf5c79e..5b2dcc492f6d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -153,6 +153,8 @@ mapAliases ({ catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2022-09-24 cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12 checkbashism = throw "'checkbashism' has been renamed to/replaced by 'checkbashisms'"; # Converted to throw 2022-02-22 + chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 + chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b38c9c6ec07e..04be96e82960 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34564,7 +34564,7 @@ with pkgs; gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; - chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell { }; + gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { }; gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; From 1b40a0e01f85e91b29faf44186d40b2ef785afeb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 27 Jul 2022 23:46:38 +0000 Subject: [PATCH 089/505] =?UTF-8?q?gnome.gnome-contacts:=2042.0=20?= =?UTF-8?q?=E2=86=92=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/42.0...43.alpha Changelog-Reviewed-By: jtojnar --- 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 fac22f0b5785..afba2ca10fb0 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -10,7 +10,7 @@ , desktop-file-utils , gtk4 , glib -, libportal +, libportal-gtk4 , gnome-desktop , gnome-online-accounts , wrapGAppsHook @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "42.0"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "iALDj9wj9SjawSj1O9zx9sow4OHGhIxCzWyEpeIsUhY="; + sha256 = "KnVZ8EO94HpdRtPQL+gUNoddrBr375efNJwsJrZkfeQ="; }; propagatedUserEnvPkgs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 glib - libportal + libportal-gtk4 evolution-data-server gsettings-desktop-schemas folks From ba718cff9ab39f789bebd552d1add642f4afba13 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 28 Jul 2022 01:48:50 +0200 Subject: [PATCH 090/505] =?UTF-8?q?gnome.dconf-editor:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/dconf-editor/-/compare/43.alpha...43.beta Changelog-Reviewed-By: jtojnar --- pkgs/desktops/gnome/core/dconf-editor/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix index a4cb0049a190..fa86c1034eaa 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -9,6 +9,7 @@ , pkg-config , glib , gtk3 +, libhandy , gnome , python3 , dconf @@ -21,23 +22,17 @@ stdenv.mkDerivation rec { pname = "dconf-editor"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9SyUJAXwzKAyZeF92NZjm9qzOpvu8XNJ5aC9DGAm40s="; + sha256 = "sha256-SNYG/ZZ20xX3ysml7kh/U8mDveX4jb09Qpd8qL6F+/s="; }; patches = [ # Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR # environment variable, to match what we patched GLib to do. ./schema-override-variable.patch - - # Fix build with Meson 0.61.0 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/56474378568e6ff4af8aa912810323e808c1d977.patch"; - sha256 = "iFyJcskqcmvz7tp1Z9jM9f8WvAhD0L9Vx1hu2c402MA="; - }) ]; nativeBuildInputs = [ @@ -57,6 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 + libhandy dconf ]; From 728b2f9b1acbc765ce5bbd54de2a5705e664f448 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 28 Jul 2022 03:18:23 +0200 Subject: [PATCH 091/505] gnome.file-roller: Fix build with Nautilus 43 --- pkgs/desktops/gnome/apps/file-roller/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index df8e9548c35e..12cb3a223fab 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , desktop-file-utils , gettext , glibcLocales @@ -33,6 +34,18 @@ stdenv.mkDerivation rec { sha256 = "HEOObVPsEP9PLrWyLXu/KKfCqElXq2SnUcHN88UjAsc="; }; + patches = [ + # Fix build with Nautilus 43. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/file-roller/-/commit/361219cd9e20530789417eeefd03c7cc4037b7d7.patch"; + sha256 = "eP3BAa1SUS+EaV9UrlKnpoqJ78MhID863HPqsfFSTgM="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/file-roller/-/commit/d8461bbad8226d101beb02c2695a2f66cea675df.patch"; + sha256 = "OKEZGijiIYDMiyuLqyHHrnTw88p+0hwkt6liufv3T74="; + }) + ]; + LANG = "en_US.UTF-8"; # postinstall.py nativeBuildInputs = [ From 6611f59de667b3c638fb80a37acb5cdffda312b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 28 Jul 2022 03:25:33 +0200 Subject: [PATCH 092/505] gnome.gnome-logs: Fix test with GLib 2.73 --- pkgs/desktops/gnome/apps/gnome-logs/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index 105194123d00..e49cdb38bf65 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -31,15 +31,11 @@ stdenv.mkDerivation rec { }; patches = [ - # meson: Remove redundant check for glib-mkenums + # Fix test with GLib 2.73 + # https://gitlab.gnome.org/GNOME/gnome-logs/-/merge_requests/41 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/01386ce9a69652a00bdb163e569b51150ca8903e.diff"; - sha256 = "sha256-tJJEai4Jw8aVcyhsFTYILiUV1xhsysX/rleeLP13DVM="; - }) - # meson: remove redundant check for pkg-config - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/ad350729a8b81f2c8eb2122de0956bb2199b48da.patch"; - sha256 = "sha256-5qGYyKM+B9XNZKytWH8K4QfSuBf7wpaPCWT6YIO5FGY="; + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/724a1faedade8ec39effc86d0b52b96f351579c2.patch"; + sha256 = "bOY9OQMuIV8QEaFQxfUJ+//m4qYZlxsKEF3bFANlmXo="; }) ]; From f32a97c626bdfa8d4ce6fbf51ecca105d0fe560d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 28 Jul 2022 03:44:31 +0200 Subject: [PATCH 093/505] gnome.gnome-terminal: Fix build with Nautilus 43 --- .../gnome/core/gnome-terminal/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index a8ca028b5558..14ee8e94337b 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -10,6 +11,7 @@ , dconf , nautilus , glib +, gtk4 , gtk3 , gsettings-desktop-schemas , vte @@ -35,6 +37,19 @@ stdenv.mkDerivation rec { sha256 = "+28g7h/yMamq7asT1dxuWmTJVXESJISLeQCG6IlZ03s="; }; + patches = [ + # Fix Nautilus extension in 43. + # https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7911 + (fetchurl { + url = "https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/e0999b42fb4954d3935f1705bea54b99a45734e5.patch"; + sha256 = "2+25xXXiVtIeq/Djo/kvVHaSmYjgGYUqK6OMHU7kPKc="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/17f4ad7909c819f0fe574d723de119dc10ec397f.patch"; + sha256 = "6BIfp9qNecqJHify7qyjzgdfXrs8EvafeXiqHPL54Eg="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -55,6 +70,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib + gtk4 gtk3 gsettings-desktop-schemas vte From e4e848777d27abee4b6ad55004e376e87b407277 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 28 Jul 2022 04:29:21 +0200 Subject: [PATCH 094/505] nautilus-python: Fix build with Nautilus 43 --- pkgs/desktops/gnome/misc/nautilus-python/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/gnome/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix index c1d58e2dbda9..db304bcf5859 100644 --- a/pkgs/desktops/gnome/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix @@ -1,9 +1,11 @@ { stdenv , lib +, fetchpatch , substituteAll , fetchurl , pkg-config , which +, autoreconfHook , gtk-doc , docbook_xsl , docbook_xml_dtd_412 @@ -33,11 +35,19 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 ]; }) + + # Fix build with Nautilus 43. + # https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/9 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/nautilus-python/commit/1691b2eb88c8b9134c6fa06da0858f7b5bb74c72.patch"; + sha256 = "dY9KrLorYlGTbKSLObRmffJwJfHwz48kCsInGGByIOI="; + }) ]; nativeBuildInputs = [ pkg-config which + autoreconfHook gtk-doc docbook_xsl docbook_xml_dtd_412 From 88ee737950cc222c763245fce2535cc85e74a31e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 28 Jul 2022 23:49:48 +0200 Subject: [PATCH 095/505] gnome-console: Fix build with Nautilus 43 --- .../terminal-emulators/gnome-console/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 790aa1725923..92bf1749e80e 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch"; sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs="; }) + + # Fix Nautilus extension in 43. + # https://gitlab.gnome.org/GNOME/console/-/merge_requests/104 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/console/-/commit/e0131faeabdce95bfe1ea260b1ed439120abf1db.patch"; + sha256 = "56lw/lTshVVda31ohcS8j38JL4UwyvtmSLEYkUMYylY="; + }) ]; buildInputs = [ From d4e4e6bfcc9a2318c8786f96f022553937e9300a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jul 2022 17:10:48 +0200 Subject: [PATCH 096/505] gi-docgen: Fix build of libide --- .../tools/documentation/gi-docgen/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 85836f435cba..4b627782d8b5 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitLab +, fetchpatch , meson , ninja , python3 @@ -19,6 +20,15 @@ python3.pkgs.buildPythonApplication rec { sha256 = "35pL/2TQRVgPfAcfOGCLlSP1LIh4r95mFC+UoXQEEHo="; }; + patches = [ + # Fix gnome-builder build + # https://gitlab.gnome.org/GNOME/gi-docgen/-/merge_requests/161 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/0524047ada3e6a5572c43dd36201ebe589d08095.patch"; + sha256 = "1P+i7v1sMULOd0w8K363Mssj+tBJ2wiSmE7DlztvCbw="; + }) + ]; + depsBuildBuild = [ python3 ]; From 6896db6aa4c0d8b7b47ac4efdd3b515dbb5f3e87 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:01:42 +0000 Subject: [PATCH 097/505] =?UTF-8?q?evolution:=203.45.1=20=E2=86=92=203.45.?= =?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.45.1...3.45.2 Changelog-Reviewed-By: Jan Tojnar --- .../mailreaders/evolution/evolution/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index d127a5664251..ea032b112688 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -22,7 +22,7 @@ , shared-mime-info , libical , db -, gcr +, gcr_4 , sqlite , gnome , gnome-desktop @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.45.1"; + version = "3.45.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/iRZq5DdZ86JdtWuu6ekP69gqvBJMeTWnxxG10ensW4="; + sha256 = "QjAM2fyIpmwra+8CHoqXaQvAOuvV+P4s9U4qyBys78g="; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { bogofilter db evolution-data-server - gcr + gcr_4 gdk-pixbuf glib glib-networking @@ -125,6 +125,7 @@ stdenv.mkDerivation rec { }; }; + PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; meta = with lib; { From d66437735f3d6586a794b7ccb8820b3f692968f9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:01:42 +0000 Subject: [PATCH 098/505] =?UTF-8?q?evolution-ews:=203.45.1=20=E2=86=92=203?= =?UTF-8?q?.45.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.45.1...3.45.2 Changelog-Reviewed-By: Jan Tojnar --- .../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 f6dbda56045a..537d90dc83df 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.45.1"; + version = "3.45.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RC1WKetKsz/VCQYau1UDiLhfW9cpAMswNKsDEHY456w="; + sha256 = "trqNVI3KpCqYMOnqGNX6lNs1ZBPxZQv9btNnYKGG4o8="; }; nativeBuildInputs = [ From 73cddfbdc37276a29356009971a737f654aef96f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:01:45 +0000 Subject: [PATCH 099/505] =?UTF-8?q?gcab:=201.4=20=E2=86=92=201.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gcab/-/compare/1.4...1.5 gcab: 1.4 → 1.5 https://gitlab.gnome.org/GNOME/gcab/-/compare/v1.4...v1.5 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gcab/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index d0d314037d28..ad5ef1ced5b8 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -8,7 +8,6 @@ , pkg-config , meson , ninja -, git , vala , glib , zlib @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gcab"; - version = "1.4"; + version = "1.5"; outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7"; + sha256 = "Rr90QkkfqkFIJCuewqB4al9unv+xsFZuUpDozIbwDww="; }; patches = [ @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - git pkg-config vala gettext From f1dc56b455ac4fe307feed12c8438f8664da1e47 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:01:53 +0000 Subject: [PATCH 100/505] =?UTF-8?q?evolution-data-server:=203.45.1=20?= =?UTF-8?q?=E2=86=92=203.45.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replaced libgdata by custom functions w/ json-glib: https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/6b62b6e32f56663136242121b709c3606be49a26 https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.45.1...3.45.2 Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/evolution-data-server/default.nix | 9 +++------ .../core/evolution-data-server/hardcode-gsettings.patch | 8 ++++---- pkgs/desktops/gnome/core/gnome-contacts/default.nix | 1 - pkgs/development/libraries/folks/default.nix | 2 -- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 5885d788e0d1..76dc7b79826b 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -45,20 +45,19 @@ , libphonenumber , gnome-online-accounts , libgweather -, libgdata , boost , protobuf }: stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.45.1"; + version = "3.45.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "M0t2QR8hDzcEYDsSpCwU/DKY+hL/6abk+/uYeeP+SyI="; + sha256 = "bBMkIoUAYzvgBz/67Z4ZNWFr8mghFbJVcc6aBJw6s6k="; }; patches = [ @@ -93,9 +92,7 @@ stdenv.mkDerivation rec { gcr_4 p11-kit libgweather - libgdata libaccounts-glib - json-glib icu sqlite libkrb5 @@ -120,9 +117,9 @@ stdenv.mkDerivation rec { nss nspr libical - libgdata # needed for GObject inspection, https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs libsoup_3 libxml2 + json-glib ]; cmakeFlags = [ diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index c3e0ef8359e5..87d5ca56b7c5 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -298,7 +298,7 @@ index e61160c..d17871a 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index 1eeff8d..6d1d58b 100644 +index 2ed68cf..5dad98f 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -5573,7 +5573,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) @@ -442,7 +442,7 @@ index 8e4ee81..bb8f8f7 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 290534d..36331b6 100644 +index 5a21872..a56d589 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c @@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service, @@ -491,10 +491,10 @@ index 6701a3a..6b8ee33 100644 g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index c0c1aea..14e6806 100644 +index 14b6481..6dc55bb 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -1956,7 +1956,19 @@ static void +@@ -1986,7 +1986,19 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { reminders->priv = e_reminders_widget_get_instance_private (reminders); diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index afba2ca10fb0..efa7745d13e5 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -15,7 +15,6 @@ , gnome-online-accounts , wrapGAppsHook , folks -, libgdata , libxml2 , gnome , vala diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index f6161535df5d..5a0596975bcb 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -18,7 +18,6 @@ , dbus , libgee , evolution-data-server -, libgdata , libsecret , db , python3 @@ -62,7 +61,6 @@ stdenv.mkDerivation rec { db dbus-glib evolution-data-server - libgdata # required for some backends transitively libsecret libsoup libxml2 From b39f1cc3a1c9dbe262f5eb20b7b0da4a0167dbfb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:02:03 +0000 Subject: [PATCH 101/505] =?UTF-8?q?gnome.adwaita-icon-theme:=2042.0=20?= =?UTF-8?q?=E2=86=92=2043.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/42.0...43.beta - Includes reduce-build-parallelism.patch. Also: - Format the expression. - Remove icon-naming-utils dependency, unused since 2.34: https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/52330b92bb069c073e4f31577499745480ee973f - Remove icon-naming-utils dependency, unused since 2.34: https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/f7701a76ce7cdd57c49ed52594cd75ebed882660 - Remove useless postInstall. - Add meta.license. Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/adwaita-icon-theme/default.nix | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 5e36cd109e43..fed3adfc90e6 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -1,35 +1,42 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, intltool, gnome -, iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: +{ lib +, stdenv +, fetchurl +, pkg-config +, autoreconfHook +, gnome +, gtk3 +, gdk-pixbuf +, librsvg +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "42.0"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA="; + sha256 = "Ky3t0XQHefoG1ysA0QcbidFyundiqKF1YxUtHf1JXZY="; }; - patches = [ - (fetchpatch { - name = "reduce-build-parallelism.patch"; - url = "https://gitlab.gnome.org/vcunat/adwaita-icon-theme/-/commit/27edeca7927eb2247d7385fccb3f0fd7787471e6.patch"; - sha256 = "vDWuvz5yRhtn9obTtHRp6J7gJpXDZz1cajyquPGw53I="; - }) + nativeBuildInputs = [ + pkg-config + autoreconfHook + gtk3 ]; - # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor-icon-theme ]; + buildInputs = [ + gdk-pixbuf + librsvg + ]; - buildInputs = [ gdk-pixbuf librsvg ]; - - nativeBuildInputs = [ pkg-config autoreconfHook intltool iconnamingutils gtk3 ]; + propagatedBuildInputs = [ + # For convenience, we can specify adwaita-icon-theme only in packages + hicolor-icon-theme + ]; dontDropIconThemeCache = true; - # remove a tree of dirs with no files within - postInstall = '' rm -rf "$out/locale" ''; - passthru = { updateScript = gnome.updateScript { packageName = "adwaita-icon-theme"; @@ -40,5 +47,6 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = with platforms; linux ++ darwin; maintainers = teams.gnome.members; + license = licenses.cc-by-sa-30; }; } From 3924b5e1556b3d848ad3494695e176cf9457ac2f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:02:20 +0000 Subject: [PATCH 102/505] =?UTF-8?q?gnome.gnome-backgrounds:=2042.0=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/42.0...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 ba70570b1f85..50f01d1f05ac 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "42.0"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TH/hoJ9FnF93GJpZglJPzgXYiJRJVdZ5kQ8jRgbBKV0="; + sha256 = "rrXUNqeLpet3VB5NmWQmu2DT2OwQ5FGDb4cSE/XzT4M="; }; patches = [ From d279e74926f413edb817a18970f3ebe061b10f4c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:02:47 +0000 Subject: [PATCH 103/505] =?UTF-8?q?gnome.gnome-software:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 10442fea34c2..ed2f5bb6133e 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Xx913hkGKXJyBeubS886hP1tpwxAdZAXB6V3sOh5P6g="; + sha256 = "ITO0nLxjT+s5cC/WGz+5fziQwYHvyEYmLe2FOh2O654="; }; patches = [ From ac4045895199b249818c94813c299773f4290bc8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:03:15 +0000 Subject: [PATCH 104/505] =?UTF-8?q?gnome-connections:=2042.1.2=20=E2=86=92?= =?UTF-8?q?=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-connections/-/compare/42.1.2...43.beta gnome-connections: 42.1.2 → 43.beta https://gitlab.gnome.org/GNOME/connections/-/compare/42.1.2...43.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-connections/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 165004860c42..649ea8ba979c 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_0_56 +, vala , gettext , itstool , python3 @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "42.1.2"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-2ObnJ0EJHYkt/IQoH2JVUdBWjNSC1I21ik7bivoTd7Y="; + hash = "sha256-kzdY9NJMQzgVPZEcquvWS1nfbtirewm5WVcreKsM2kU="; }; nativeBuildInputs = [ meson ninja pkg-config - vala_0_56 + vala gettext itstool python3 From 309a23daa47ca98beff76a1501f3b99c4349510f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:04:06 +0000 Subject: [PATCH 105/505] =?UTF-8?q?libhandy:=201.7.0=20=E2=86=92=201.7.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libhandy/-/compare/1.7.0...1.7.90 Changelog-Reviewed-By: Jan Tojnar --- 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 51de3f7d536b..a56e7e8a5d1e 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.7.0"; + version = "1.7.90"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-jJLAaleyavFqJa0LXDdafbfwm1cBKr3m4Wi2KXh3DPc="; + sha256 = "sha256-M4H+glCF/hqdB1oNzM9sSbAqvXGPPY2yH3BffRiWthM="; }; depsBuildBuild = [ From b997f0625163b874eaf1c88349106b82a53c76d7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:04:16 +0000 Subject: [PATCH 106/505] =?UTF-8?q?librsvg:=202.54.4=20=E2=86=92=202.55.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/librsvg/-/compare/2.54.4...2.55.0 - No longer vendoring Cargo dependencies https://gitlab.gnome.org/GNOME/librsvg/-/commit/7e5e7e5b76d06e38017c154f73d2e6afb93b5808 Changelog-Reviewed-By: Jan Tojnar --- .../development/libraries/librsvg/default.nix | 55 ++++++++++++++++--- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 91e0033cd274..19f75110c13b 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -23,11 +23,15 @@ , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform , gobject-introspection , nixosTests +, _experimental-update-script-combinators +, common-updater-scripts +, jq +, nix }: stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.54.4"; + version = "2.55.0"; outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -35,10 +39,16 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6hUqJD9qQ8DgNqKMcN4/y83qVmTGgRx4WSvCKezCSDM="; + sha256 = "bmJsVk41S82MOEuQ+OTzCzA6+mweDLXMVroUkAxdtzA="; }; - cargoVendorDir = "vendor"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-tvfdRGyrEkEh6sb69f0ugfzR2bgGdWa05pSyovpXAF8="; + # TODO: move this to fetchCargoTarball + dontConfigure = true; + }; strictDeps = true; @@ -131,10 +141,41 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; + updateScript = + let + updateSource = gnome.updateScript { + packageName = "librsvg"; + versionPolicy = "odd-unstable"; + }; + + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${lib.makeBinPath [ + common-updater-scripts + jq + nix + ]} + # update-source-version does not allow updating to the same version so we need to clear it temporarily. + # Get the current version so that we can restore it later. + latestVersion=$(nix-instantiate --eval -A librsvg.version | jq --raw-output) + # Clear the version. Provide hash so that we do not need to do pointless TOFU. + # Needs to be a fake SRI hash that is non-zero, since u-s-v uses zero as a placeholder. + # Also cannot be here verbatim or u-s-v would be confused what to replace. + update-source-version librsvg 0 "sha256-${lib.fixedWidthString 44 "B" "="}" --source-key=cargoDeps > /dev/null + update-source-version librsvg "$latestVersion" --source-key=cargoDeps > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; tests = { installedTests = nixosTests.installed-tests.librsvg; From b8e21f065b9eb4dbd3c9932dcfc4d6e76c467245 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 23:50:58 +0200 Subject: [PATCH 107/505] librsvg: remove installed tests Build will start failing with the following error in 2.55.1 due to `/build/librsvg-2.55.1/.libs` ending up in rpath: RPATH of binary /nix/store/78k70limslvxs6y98hdirbcixl3car1q-librsvg-2.55.1-installedTests/libexec/installed-tests/RSVG/api contains a forbidden reference to /build/ --- nixos/tests/installed-tests/default.nix | 1 - nixos/tests/installed-tests/librsvg.nix | 9 --------- pkgs/development/libraries/librsvg/default.nix | 13 +------------ 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 nixos/tests/installed-tests/librsvg.nix diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index b2c1b43f90ee..2e38cd389c74 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -101,7 +101,6 @@ in json-glib = callInstalledTest ./json-glib.nix {}; ibus = callInstalledTest ./ibus.nix {}; libgdata = callInstalledTest ./libgdata.nix {}; - librsvg = callInstalledTest ./librsvg.nix {}; glib-testing = callInstalledTest ./glib-testing.nix {}; libjcat = callInstalledTest ./libjcat.nix {}; libxmlb = callInstalledTest ./libxmlb.nix {}; diff --git a/nixos/tests/installed-tests/librsvg.nix b/nixos/tests/installed-tests/librsvg.nix deleted file mode 100644 index 378e7cce3ff4..000000000000 --- a/nixos/tests/installed-tests/librsvg.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, makeInstalledTest, ... }: - -makeInstalledTest { - tested = pkgs.librsvg; - - testConfig = { - virtualisation.memorySize = 2047; - }; -} diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 19f75110c13b..0d3d5a2a1eb5 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -22,7 +22,6 @@ , vala , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform , gobject-introspection -, nixosTests , _experimental-update-script-combinators , common-updater-scripts , jq @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { pname = "librsvg"; version = "2.55.0"; - outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ + outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" ]; @@ -93,16 +92,10 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004 (lib.enableFeature (withIntrospection && !stdenv.isDarwin) "vala") - "--enable-installed-tests" "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}"; - makeFlags = [ - "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG" - "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/RSVG" - ]; - doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils # It wants to add loaders and update the loaders.cache in gdk-pixbuf @@ -176,10 +169,6 @@ stdenv.mkDerivation rec { updateSource updateLockfile ]; - - tests = { - installedTests = nixosTests.installed-tests.librsvg; - }; }; meta = with lib; { From 932e2da1b59a7a59c5feac9d5ed5238d840564bf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Aug 2022 12:48:43 +0000 Subject: [PATCH 108/505] =?UTF-8?q?epiphany:=2043.alpha=20=E2=86=92=2043.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/epiphany/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 15201379cfe7..c7dec1398944 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -27,7 +27,6 @@ , gcr , isocodes , desktop-file-utils -, python3 , nettle , gdk-pixbuf , gst_all_1 @@ -40,11 +39,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TVm7+mQ59arqnWD94npf6GdciFP8uugPSmjZ8CjDF0E="; + sha256 = "TaAx7RnMtlmcrLe2mgPb+0pm7uyN2a0iR/p15qBrO34="; }; patches = lib.optionals withPantheon [ @@ -67,7 +66,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 wrapGAppsHook buildPackages.glib buildPackages.gtk3 @@ -108,11 +106,6 @@ stdenv.mkDerivation rec { "-Dunit_tests=disabled" ]; - postPatch = '' - chmod +x post_install.py # patchShebangs requires executable file - patchShebangs post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; From 71721a1c6b4165ed1117ff31689637254f7622ae Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Aug 2022 12:48:55 +0000 Subject: [PATCH 109/505] =?UTF-8?q?glib:=202.73.2=20=E2=86=92=202.73.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.73.2...2.73.3 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glib/default.nix | 4 +-- .../libraries/glib/split-dev-programs.patch | 30 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ca47b8f6bf91..7e0090dc4679 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.73.2"; + version = "2.73.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "Xz7jbjT0qqs5PD49xG+wGzL36tbIjUHX8g2IpJze8dk="; + sha256 = "3xorhBZn1rSLLvaWnr2kMoJDgp9uRYZnJvgG+Q9k7q0="; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch index 58e1b6d7dfcf..39c857343366 100644 --- a/pkgs/development/libraries/glib/split-dev-programs.patch +++ b/pkgs/development/libraries/glib/split-dev-programs.patch @@ -12,21 +12,21 @@ index bf25cdaeb..bff7016cc 100644 ) # Provide tools for others when we're a subproject and they use the Meson GNOME module diff --git a/gio/meson.build b/gio/meson.build -index ca969309a..68a072714 100644 +index 69bb0603e..839b1cfb4 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -844,14 +844,15 @@ pkg.generate(libgio, +@@ -858,14 +858,15 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), + 'devbindir=' + get_option('devbindir'), 'giomoduledir=' + pkgconfig_giomodulesdir, 'gio=' + join_paths('${bindir}', 'gio'), -- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), -- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), +- 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), +- 'glib_compile_schemas=@0@'.format(pkgconfig_multiarch_bindir / 'glib-compile-schemas'), - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), -+ 'gio_querymodules=' + join_paths('${devbindir}', 'gio-querymodules'), -+ 'glib_compile_schemas=' + join_paths('${devbindir}', 'glib-compile-schemas'), ++ 'gio_querymodules=@0@'.format('${devbindir}' / 'gio-querymodules'), ++ 'glib_compile_schemas=@0@'.format('${devbindir}' / 'glib-compile-schemas'), + 'glib_compile_resources=' + join_paths('${devbindir}', 'glib-compile-resources'), 'gdbus=' + join_paths('${bindir}', 'gdbus'), - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), @@ -36,7 +36,7 @@ index ca969309a..68a072714 100644 'gsettings=' + join_paths('${bindir}', 'gsettings')], version : glib_version, install_dir : glib_pkgconfigreldir, -@@ -952,12 +953,14 @@ executable('gio', gio_tool_sources, +@@ -966,13 +967,14 @@ executable('gio', gio_tool_sources, executable('gresource', 'gresource-tool.c', install : true, @@ -47,19 +47,21 @@ index ca969309a..68a072714 100644 gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', install : true, +- install_dir : multiarch_bindir, + install_dir : get_option('devbindir'), c_args : gio_c_args, # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, -@@ -966,6 +969,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -981,7 +983,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu glib_compile_schemas = executable('glib-compile-schemas', ['glib-compile-schemas.c'], install : true, +- install_dir : multiarch_bindir, + install_dir : get_option('devbindir'), # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep]) -@@ -973,6 +977,7 @@ glib_compile_schemas = executable('glib-compile-schemas', +@@ -989,6 +991,7 @@ glib_compile_schemas = executable('glib-compile-schemas', glib_compile_resources = executable('glib-compile-resources', [gconstructor_as_data_h, 'glib-compile-resources.c'], install : true, @@ -68,10 +70,10 @@ index ca969309a..68a072714 100644 # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, diff --git a/glib/meson.build b/glib/meson.build -index 6062c11a1..ce242629a 100644 +index bcfcba94f..162fc86f2 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -392,9 +392,10 @@ pkg.generate(libglib, +@@ -396,9 +396,10 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -85,7 +87,7 @@ index 6062c11a1..ce242629a 100644 version : glib_version, install_dir : glib_pkgconfigreldir, filebase : 'glib-2.0', -@@ -431,6 +432,7 @@ if host_system == 'windows' +@@ -435,6 +436,7 @@ if host_system == 'windows' else gtester = executable('gtester', 'gtester.c', install : true, @@ -93,7 +95,7 @@ index 6062c11a1..ce242629a 100644 c_args : ['-UG_DISABLE_ASSERT'], include_directories : configinc, dependencies : [libglib_dep]) -@@ -442,7 +444,7 @@ report_conf.set('PYTHON', python_name) +@@ -446,7 +448,7 @@ report_conf.set('PYTHON', python_name) configure_file( input: 'gtester-report.in', output: 'gtester-report', @@ -124,7 +126,7 @@ index 07d096f36..865891e8c 100644 install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) diff --git a/meson_options.txt b/meson_options.txt -index a52eed9d2..b70b69e35 100644 +index f13cbfdd5..f218db581 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,6 +3,11 @@ option('runtime_libdir', From 08204ad67a5cd9e21906f9f14556a13f7930ad9a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Aug 2022 12:48:56 +0000 Subject: [PATCH 110/505] =?UTF-8?q?glib-networking:=202.74.alpha=20?= =?UTF-8?q?=E2=86=92=202.74.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.74.alpha...2.74.beta Changelog-Reviewed-By: Jan Tojnar --- 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 5ecba800de74..749bd14810e1 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.74.alpha"; + version = "2.74.beta"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "YJhlZTXq9NKfpSTmmWlIbMwnbLCM9PmrCFHYo4nY4U8="; + sha256 = "dI18G79OzOsP5yS5QUvSYdJ1KuU0PV+0e0MpYZQafAg="; }; patches = [ From f408d585d28b593de151e1668d7e3de97b5a77e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Aug 2022 12:49:28 +0000 Subject: [PATCH 111/505] =?UTF-8?q?gnome.gnome-logs:=2042.0=20=E2=86=92=20?= =?UTF-8?q?43.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-logs/-/compare/gnome-logs-42.0...gnome-logs-43.beta Changelog-Reviewed-By: Jan Tojnar --- .../gnome/apps/gnome-logs/default.nix | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index e49cdb38bf65..2d2ec94dcc08 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -7,57 +7,58 @@ , pkg-config , gnome , glib -, gtk3 -, wrapGAppsHook +, gtk4 +, desktop-file-utils +, wrapGAppsHook4 , gettext , itstool -, libhandy +, libadwaita , libxml2 , libxslt -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , systemd -, python3 , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "42.0"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TV5FFp1r9DkC16npoHk8kW65LaumuoWzXI629nLNq9c="; + sha256 = "naBuiFhl7dG/vPILLU6HwVAGUXKdZW//E77pNlCTldQ="; }; patches = [ - # Fix test with GLib 2.73 - # https://gitlab.gnome.org/GNOME/gnome-logs/-/merge_requests/41 + # Remove GTK 3 depndency + # https://gitlab.gnome.org/GNOME/gnome-logs/-/merge_requests/46 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/724a1faedade8ec39effc86d0b52b96f351579c2.patch"; - sha256 = "bOY9OQMuIV8QEaFQxfUJ+//m4qYZlxsKEF3bFANlmXo="; + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/f7fe4b6ff9f5ab70919b6747f95e38d0d48685b8.patch"; + sha256 = "yZY7qYWkJrArqeu1E2xxbJnPggaxOG3sk7212PqMcpo="; }) ]; nativeBuildInputs = [ - python3 meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 gettext itstool libxml2 libxslt - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 glib + gtk4 + desktop-file-utils ]; buildInputs = [ glib - gtk3 - libhandy + gtk4 + libadwaita systemd gsettings-desktop-schemas ]; @@ -66,11 +67,6 @@ stdenv.mkDerivation rec { "-Dman=true" ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - doCheck = true; passthru = { From 55e746234b5dd48f7ffdbd0288209c66684118e7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Aug 2022 12:49:42 +0000 Subject: [PATCH 112/505] =?UTF-8?q?gnome.gnome-sudoku:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 6ff6162a5d80..4cd5b73c7994 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "obATI8CvAcf48ujT4+wEDPkl35ypH671Rr7dSEmXivQ="; + sha256 = "hybZ0Dmtee250tDztEu+Dm+K08ycSylBzHh3t1wCgpU="; }; nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; From 6f4374f8189536430e54531eace627cde248f127 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Aug 2022 12:50:13 +0000 Subject: [PATCH 113/505] =?UTF-8?q?gnome-builder:=2043.alpha0=20=E2=86=92?= =?UTF-8?q?=2043.alpha1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/43.alpha0...43.alpha1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/editors/gnome-builder/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index aa7096a49bc2..65f9c3932d7d 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -3,6 +3,7 @@ , ctags , cmark , desktop-file-utils +, editorconfig-core-c , fetchurl , flatpak , gnome @@ -24,7 +25,6 @@ , ninja , ostree , d-spy -, pcre , pcre2 , pkg-config , python3 @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.alpha0"; + version = "43.alpha1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "SSjohWD2mn6riFR8CBeHzadbzi85XMWivgj4K8b5ujY="; + sha256 = "gzf93kAfLM5ehYYbby79XWdTyuReAiqH80V5kPp8JDY="; }; patches = [ @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags cmark + editorconfig-core-c flatpak libgit2-glib libpeas @@ -94,7 +95,6 @@ stdenv.mkDerivation rec { libxml2 ostree d-spy - pcre pcre2 python3 sysprof @@ -122,7 +122,6 @@ stdenv.mkDerivation rec { doCheck = true; postPatch = '' - # Drop after https://gitlab.gnome.org/GNOME/gnome-builder/-/merge_requests/609 patchShebangs build-aux/meson/post_install.py substituteInPlace build-aux/meson/post_install.py \ --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" From 428915f452a6130db413d5c2731685774fbb72bd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Aug 2022 12:50:19 +0000 Subject: [PATCH 114/505] =?UTF-8?q?gnome-text-editor:=2043.alpha0=20?= =?UTF-8?q?=E2=86=92=2043.alpha1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/43.alpha0...43.alpha1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 6 ++++-- 1 file changed, 4 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 f7a30d5bc4ff..ff931f28ef87 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -15,6 +15,7 @@ , icu , itstool , libadwaita +, editorconfig-core-c , libxml2 , pcre , appstream-glib @@ -23,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "43.alpha0"; + version = "43.alpha1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-4I7wRiGD7RAkJfdLXgsEMsoM5NlGyBKyOQuFB/5rb6A="; + sha256 = "sha256-rWBUhLeuI6bGiisRjc4bSDSEhoE7ND/xaVjAtw+1sGU="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { gtk4 gtksourceview5 libadwaita + editorconfig-core-c pcre ]; From a17fcb2f8c159baf11b81f33976e0e11d7582dd2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Aug 2022 12:50:40 +0000 Subject: [PATCH 115/505] =?UTF-8?q?gtksourceview5:=205.5.0=20=E2=86=92=205?= =?UTF-8?q?.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.5.0...5.5.1 Changelog-Reviewed-By: Jan Tojnar --- 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 e01ee637afe5..dc5facea3301 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.5.0"; + version = "5.5.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "V8kgm1ypfVKq7JbwZfenXQj/k6/i5+b0ezVbhVnH94Q="; + sha256 = "SuWMzRXwceRfiBhfWpsCBWCgsalQ+ZyrfcXozRTEDRk="; }; patches = [ From 20dffc8ab0cc1292924ce53c35179708fbc6204e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Aug 2022 12:51:38 +0000 Subject: [PATCH 116/505] =?UTF-8?q?sysprof:=203.45.0=20=E2=86=92=203.45.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sysprof/-/compare/3.45.0...3.45.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/tools/profiling/sysprof/capture.nix | 1 + pkgs/development/tools/profiling/sysprof/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index 913351ce540a..4057db6b74f3 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ + "-Dagent=false" "-Dsysprofd=none" "-Dgtk=false" "-Dlibsysprof=false" diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 7f03c2d6db80..81b183e7fb58 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.45.0"; + version = "3.45.1"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dpAWjFpDJ9++7b1fD+td79Z2zR1hN8Pn14/Inz1lXy8="; + sha256 = "ZAKg8WrnCWfI+Yo+cf7hVhwbzzLyoyI5pF7oo3HI1Zo="; }; nativeBuildInputs = [ @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" + # In a separate libsysprof-capture package + "-Dinstall-static=false" ]; passthru = { From edbfc9b3923c52eb0e3b0b6fccb9710c5fa9c6f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:10:15 +0000 Subject: [PATCH 117/505] =?UTF-8?q?at-spi2-core:=202.45.1=20=E2=86=92=202.?= =?UTF-8?q?45.90?= 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_45_1...AT_SPI2_CORE_2_45_90 Changelog-Reviewed-By: Jan Tojnar --- 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 1710dfdf5c6e..30b838a67601 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.45.1"; + version = "2.45.90"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "upXzRukxCPuzRixiQ3CB1YIVTbJ5tAUt7cUqcGgosZI="; + sha256 = "6QUK08JJN1SDlrI3fy/NuTIc4tr/rTXnVU6PathQqw0="; }; nativeBuildInputs = [ From 6630d1179ff0014f932d1923b7ccd442de675d15 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:10:53 +0000 Subject: [PATCH 118/505] =?UTF-8?q?gnome.eog:=2043.alpha=20=E2=86=92=2043.?= =?UTF-8?q?beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 d680f034a0d8..842fb6649d31 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 = "43.alpha"; + version = "43.beta"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8/ERugeyuy56hN0RDZ7EWhvFNvJPyIW5TEbUXJ2khsI="; + sha256 = "sha256-Vef6Mz+Mk1yuc/7NWK6Kg2bO+eSTO2WheoiS4pdvgto="; }; patches = [ From 181900e47aed587fc0a68d5ad50a598fe7bddb4e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:11:02 +0000 Subject: [PATCH 119/505] =?UTF-8?q?gnome.gnome-characters:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 52a96322965a..ef23f3ade84a 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+nsOO5XmJXOvLSPmp/OlbbiXGQZJsB6cp+sAfYkS5cA="; + sha256 = "8ftBsNzo9vqN2LCgIygvF7QB4CmlAAbxVBhYzttjeDQ="; }; patches = [ From 658a9c094c882c52d6f902b693a83d38a83b9f58 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:11:04 +0000 Subject: [PATCH 120/505] =?UTF-8?q?gnome.gnome-clocks:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 a3a02a06e384..17db7815bf06 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VLi556iRF3b1hF8INdrZtCFtHpRZtsdb/zKXzyT0d8U="; + sha256 = "+jVBJK4EaRNcegl8t3OGhU6Uz5UMieLPIM7k0V/jxXA="; }; nativeBuildInputs = [ From 1746395fd8def521e3dfafcf77870c00b8101809 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:11:13 +0000 Subject: [PATCH 121/505] =?UTF-8?q?gnome.gnome-font-viewer:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.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/43.alpha...43.beta Changelog-Reviewed-By: Bobby Rong --- 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 17f1801df598..0e08abad528c 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "SpLtD3REhZWeCWIzBWEonxuxca49QT6qjR9xGE8RKyU="; + sha256 = "YT3kTZdcJ7yrecZEMMvBBumHMhd03ZaZppllGFckjck="; }; doCheck = true; From 1517b95c4949d85c95e4295f25723bc36557d5a1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:11:15 +0000 Subject: [PATCH 122/505] =?UTF-8?q?gnome.gnome-initial-setup:=2043.alpha.1?= =?UTF-8?q?=20=E2=86=92=2043.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/43.alpha.1...43.beta Changelog-Reviewed-By: Jan Tojnar --- .../core/gnome-initial-setup/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index bca63606e44e..0833964b880b 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , gettext , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , gnome , accountsservice , fontconfig @@ -16,6 +17,7 @@ , gnome-desktop , gnome-online-accounts , gtk3 +, gtk4 , libgweather , json-glib , krb5 @@ -25,10 +27,10 @@ , networkmanager , pango , polkit -, webkitgtk_4_1 +, webkitgtk_5_0 , systemd -, libhandy -, libnma +, libadwaita +, libnma-gtk4 , tzdata , libgnomekbd , gsettings-desktop-schemas @@ -36,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "43.alpha.1"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "40CMKAVdMET/bnDcecI35i6b9lTYh9h7v6Ewo9NHPS8="; + sha256 = "1TiUryxad8/IMfeKK7jaTr34VL+0NYviWXDmZ7eIXro="; }; patches = [ @@ -56,7 +58,7 @@ stdenv.mkDerivation rec { ninja pkg-config systemd - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -70,27 +72,29 @@ stdenv.mkDerivation rec { gnome-online-accounts gsettings-desktop-schemas gtk3 + gtk4 json-glib krb5 libgweather - libhandy - libnma + libadwaita + libnma-gtk4 libpwquality librest_1_0 libsecret networkmanager pango polkit - webkitgtk_4_1 + webkitgtk_5_0 ]; mesonFlags = [ - "-Dcheese=disabled" "-Dibus=disabled" "-Dparental_controls=disabled" "-Dvendor-conf-file=${./vendor.conf}" ]; + PKG_CONFIG_SYSTEMD_SYSUSERSDIR = "${placeholder "out"}/lib/sysusers.d"; + passthru = { updateScript = gnome.updateScript { packageName = pname; From e9282f5ab9f829576faa9cfa7f90f1c2d83b9f59 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:11:27 +0000 Subject: [PATCH 123/505] =?UTF-8?q?gnome.gnome-remote-desktop:=2043.alpha?= =?UTF-8?q?=20=E2=86=92=2043.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/43.alpha...43.beta VNC now disabled by default https://github.com/GNOME/gnome-remote-desktop/commit/55ce55afa1ddb502d4c8e13ae813f348d5f76402 Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/gnome-remote-desktop/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 91391d065be5..ad0f4f47171f 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -13,12 +13,13 @@ , nv-codec-headers-11 , pipewire , systemd -, libvncserver , libsecret , libnotify , libxkbcommon , gdk-pixbuf , freerdp +, fdk_aac +, tpm2-tss , fuse3 , mesa , libgudev @@ -29,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-MGLnrsKcyQYoPZ0hY0q3cv8NGVxS8n4aLFzMdtehKXE="; + hash = "sha256-th1u0ih9pV/Om1meTCsNBvuVEsvmkSYxu6cbfViVq+c="; }; nativeBuildInputs = [ @@ -48,6 +49,8 @@ stdenv.mkDerivation rec { buildInputs = [ cairo freerdp + fdk_aac + tpm2-tss fuse3 gdk-pixbuf # For libnotify glib @@ -56,7 +59,6 @@ stdenv.mkDerivation rec { nv-codec-headers-11 libnotify libsecret - libvncserver libxkbcommon pipewire systemd From accf115eb5ce425f08b1dbc4ff5cf58e1df147c1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:11:34 +0000 Subject: [PATCH 124/505] =?UTF-8?q?gnome.gnome-sound-recorder:=2042.0=20?= =?UTF-8?q?=E2=86=92=2043.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/42.0...43.beta Changelog-Reviewed-By: Bobby Rong --- 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 cd7259c3ae95..c8d455ae216a 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.0"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TAjDFSgvPr96LabyDg/58McdqlIp/NL+C1wKqqoG8K0="; + sha256 = "bbbbmjsbUv0KtU+aW/Tymctx5SoTrF/fw+dOtGmFpOY="; }; nativeBuildInputs = [ From 0e989a5bd96ee67ad435b3b548c5ab85ec514b23 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:11:53 +0000 Subject: [PATCH 125/505] =?UTF-8?q?gnome.nautilus:=2043.alpha=20=E2=86=92?= =?UTF-8?q?=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/43.alpha...43.beta Also change the environment variable name to prevent crashes when running in an old environment. Changelog-Reviewed-By: Jan Tojnar --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- pkgs/desktops/gnome/apps/file-roller/default.nix | 2 +- pkgs/desktops/gnome/core/nautilus/default.nix | 9 +++++++-- pkgs/desktops/gnome/core/nautilus/extension_dir.patch | 2 +- pkgs/desktops/gnome/misc/nautilus-python/default.nix | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index c91181491fa1..9c1978e362bc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -520,7 +520,7 @@ in # Let nautilus find extensions # TODO: Create nautilus-with-extensions package - environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; + environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-4"; # Override default mimeapps for nautilus environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index 12cb3a223fab..a39df566c9c2 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { nautilus ]; - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4"; postPatch = '' chmod +x postinstall.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 37c5ac2aa724..95f4f0b671cf 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -23,23 +23,25 @@ , tracker-miners , gexiv2 , libselinux +, libcloudproviders , gdk-pixbuf , substituteAll , gnome-desktop , gst_all_1 , gsettings-desktop-schemas +, gnome-user-share , gobject-introspection }: stdenv.mkDerivation rec { pname = "nautilus"; - version = "43.alpha"; + version = "43.beta"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hjVoot3dHPgTNmbDe4Cwf4AN6Wbomh0l4QM0mP+iw5k="; + sha256 = "5SEptSc/ZBb///prJr00pWrLfUXltuCVU1UpOhZXkfU="; }; patches = [ @@ -70,6 +72,7 @@ stdenv.mkDerivation rec { gnome-desktop gnome.adwaita-icon-theme gsettings-desktop-schemas + gnome-user-share gst_all_1.gst-plugins-base gtk4 libadwaita @@ -78,6 +81,8 @@ stdenv.mkDerivation rec { libnotify libseccomp libselinux + gdk-pixbuf + libcloudproviders shared-mime-info tracker tracker-miners diff --git a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch index e1313999675d..344a50fa45b9 100644 --- a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch +++ b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch @@ -13,7 +13,7 @@ index 6273a76..4adcc8a 100644 initialized = TRUE; - load_module_dir (NAUTILUS_EXTENSIONDIR); -+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); ++ extensiondir = g_getenv ("NAUTILUS_4_EXTENSION_DIR"); + if (extensiondir == NULL) { + extensiondir = NAUTILUS_EXTENSIONDIR; + } diff --git a/pkgs/desktops/gnome/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix index db304bcf5859..7bc446a29de0 100644 --- a/pkgs/desktops/gnome/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "PYTHON_LIB_LOC=${python3}/lib" ]; - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4"; passthru = { updateScript = gnome.updateScript { From 05bfbc995173790892988b5aa00c5b07117e66c5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:12:11 +0000 Subject: [PATCH 126/505] =?UTF-8?q?gnome-console:=2042.2=20=E2=86=92=2043.?= =?UTF-8?q?beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/console/-/compare/42.2...43.beta Changelog-Reviewed-By: Jan Tojnar --- .../gnome-console/default.nix | 46 ++++--------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 92bf1749e80e..adb4bc577100 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -1,75 +1,49 @@ { lib , stdenv , fetchurl -, fetchpatch , gettext , gnome , libgtop -, gtk3 -, libhandy +, gtk4 +, libadwaita , pcre2 -, vte +, vte-gtk4 , appstream-glib , desktop-file-utils -, git , meson , ninja , pkg-config , python3 -, sassc -, wrapGAppsHook +, wrapGAppsHook4 , nixosTests }: stdenv.mkDerivation rec { pname = "gnome-console"; - version = "42.2"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk="; + sha256 = "t4TcSBVe86AkzYij9/650JO9mcZfKpcVo3+fu7Wq8VY="; }; - patches = [ - (fetchpatch { - name = "fix-clang-build-issues.patch"; - url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch"; - sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs="; - }) - - # Fix Nautilus extension in 43. - # https://gitlab.gnome.org/GNOME/console/-/merge_requests/104 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/console/-/commit/e0131faeabdce95bfe1ea260b1ed439120abf1db.patch"; - sha256 = "56lw/lTshVVda31ohcS8j38JL4UwyvtmSLEYkUMYylY="; - }) - ]; - buildInputs = [ gettext libgtop - gtk3 - libhandy + gtk4 + libadwaita pcre2 - vte - ] ++ lib.optionals stdenv.isLinux [ - gnome.nautilus + vte-gtk4 ]; nativeBuildInputs = [ appstream-glib desktop-file-utils - git meson ninja pkg-config python3 - sassc - wrapGAppsHook - ]; - - mesonFlags = lib.optionals (!stdenv.isLinux) [ - "-Dnautilus=disabled" + wrapGAppsHook4 ]; passthru = { From 0e402072f2e17eca64e17cc3b573eb81dd168086 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:12:20 +0000 Subject: [PATCH 127/505] =?UTF-8?q?gnome-photos:=2042.0=20=E2=86=92=2043.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/gnome-photos/-/compare/42.0...43.beta Changelog-Reviewed-By: Jan Tojnar --- .../graphics/gnome-photos/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 774e377ca031..b1502320888b 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , at-spi2-core , babl @@ -7,10 +8,9 @@ , dleyna-renderer , gdk-pixbuf , gegl -, geocode-glib +, geocode-glib_2 , gettext , gexiv2 -, gfbgraph , glib , gnome-online-accounts , gnome @@ -21,8 +21,8 @@ , gtk3 , itstool , libdazzle +, libportal-gtk3 , libhandy -, libgdata , libxml2 , meson , ninja @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "42.0"; + version = "43.beta"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JcsoFCUZnex7BF8T8y+PlgNMsMuLlNlvnf+vT1vmhVE="; + sha256 = "6Qmo0sloFI/XFq9C0ub9neWVElmC9z2MR1xq4lshPt8="; }; patches = [ @@ -73,9 +73,8 @@ stdenv.mkDerivation rec { dleyna-renderer gdk-pixbuf gegl - geocode-glib + geocode-glib_2 gexiv2 - gfbgraph glib gnome-online-accounts grilo @@ -83,8 +82,8 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 libdazzle + libportal-gtk3 libhandy - libgdata tracker tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema From 73bb24c32c73e9d8a14bebc01bee2913b067cb4d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:12:34 +0000 Subject: [PATCH 128/505] =?UTF-8?q?gnome-tour:=2042.0=20=E2=86=92=2043.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/42.0...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 a26dcfa0a7b0..3b3586b981d3 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "42.0"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-/PGsaJBX2oZZaXDsPag1VSHApy6VBj6wWdX+5N6oL08="; + hash = "sha256-JCrfKeM2U+DycZdzhaBVubrvAxQNHu2rqA2CLbZGY3k="; }; cargoVendorDir = "vendor"; From 657d00d8cfc015c9e5b1546b1f0d7d779323437a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Aug 2022 17:13:42 +0000 Subject: [PATCH 129/505] =?UTF-8?q?python3.pkgs.pyatspi:=202.45.1=20?= =?UTF-8?q?=E2=86=92=202.45.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pyatspi2/-/compare/PYATSPI_2_45_1...PYATSPI_2_45_90 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/python-modules/pyatspi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 208faffc4462..b75da6de5263 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.45.1"; + version = "2.45.90"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "u6fCZjQw5VEjpEPzelop5764sBZJvbKWmtPrlB2qwa4="; + sha256 = "MOv4/BzWEyhzSlyzG2T2W5ozcVSZTfk6UJHXTh6M77k="; }; nativeBuildInputs = [ pkg-config ]; From 754c8be7b3de8c0a047c29bcb63fcf188b032a6a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:09:57 +0000 Subject: [PATCH 130/505] =?UTF-8?q?baobab:=2043.alpha=20=E2=86=92=2043.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/baobab/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 de4a236d0f56..9ef224016b37 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6co//tYhatoWP8x5Y43+qvw75RPWWCH8+eKeLzn0Aqs="; + sha256 = "l4+ppXf1jSrzncgQShxoyfRvoUVTzy8ex4c20H1ZOVw="; }; nativeBuildInputs = [ From caa25fae7b0c36b3bccd04e211389d153675199f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:10:16 +0000 Subject: [PATCH 131/505] =?UTF-8?q?geocode-glib:=203.26.3=20=E2=86=92=203.?= =?UTF-8?q?26.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/geocode-glib/-/compare/3.26.3...3.26.4 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/geocode-glib/default.nix | 19 ++----------------- .../geocode-glib/installed-tests-path.patch | 8 +++++++- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index e69ea93bb121..ee619aad89ea 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , mesonEmulatorHook , ninja @@ -19,31 +18,17 @@ stdenv.mkDerivation rec { pname = "geocode-glib"; - version = "3.26.3"; + version = "3.26.4"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz"; - sha256 = "Hf6ug7kOzMobbPfc98XjsxeCjPC1YgXERx7w+RGZl2Y="; + sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o="; }; patches = [ ./installed-tests-path.patch - - # Install data for pi test. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geocode-glib/-/commit/0eb5c21cf4deb2c45aedf5a4393d4208b8dc6d58.patch"; - sha256 = "DmaPzGEu7f+gjjb2HSZ3+ZMc4EJSsba9ufsVysB0UPA="; - }) - # Fix pi test. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geocode-glib/-/commit/464bb3bae5525566a7f41d157f73575cc4f3b5f8.patch"; - sha256 = "qSjXR8eKl+E38Zp7/Kgge/FxOLHYUJgRSR68okc3No0="; - postFetch = '' - substituteInPlace $out --replace "LC_MESSAGES" "LC_ALL" - ''; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch index c68b7a3a75c3..e5f24abdddd1 100644 --- a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch +++ b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch @@ -1,11 +1,17 @@ +diff --git a/geocode-glib/tests/meson.build b/geocode-glib/tests/meson.build +index 5cd1fca..c2f9a9d 100644 --- a/geocode-glib/tests/meson.build +++ b/geocode-glib/tests/meson.build -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ -install_dir = get_option('prefix') / get_option('datadir') / 'installed-tests' / library_name +-install_bindir = get_option('prefix') / get_option('libexecdir') / library_name +install_dir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / library_name ++install_bindir = get_option('installed_test_prefix') / 'libexec' / library_name e = executable('geo-uri', 'geo-uri.c', +diff --git a/meson_options.txt b/meson_options.txt +index 62b713d..1454416 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,9 @@ From 1b8da108747dc905ec73bcd949c3f3514c54c6d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:10:26 +0000 Subject: [PATCH 132/505] =?UTF-8?q?gjs:=201.73.1=20=E2=86=92=201.73.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.73.1...1.73.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gjs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 5195bb7f153c..dacf50127fb9 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -9,7 +9,7 @@ , gtk3 , atk , gobject-introspection -, spidermonkey_91 +, spidermonkey_102 , pango , cairo , readline @@ -32,13 +32,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.73.1"; + version = "1.73.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-k/XuvxCLrR8uHb6sPBf9NHGs2o7acfQecMhdkDNR8As="; + sha256 = "sha256-zyuEsXSgSckRpp7GGfTFymuW1gm+UgDKPbUTHJi+2nU="; }; patches = [ @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { cairo readline libsysprof-capture - spidermonkey_91 + spidermonkey_102 ]; checkInputs = [ From 800907024f67ebe1f35478cbfe8770aa146793a4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:10:45 +0000 Subject: [PATCH 133/505] =?UTF-8?q?gnome.adwaita-icon-theme:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.beta.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/compare/43.beta...43.beta.1 Changelog-Reviewed-By: Jan Tojnar --- 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 fed3adfc90e6..709be066231d 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "43.beta"; + version = "43.beta.1"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Ky3t0XQHefoG1ysA0QcbidFyundiqKF1YxUtHf1JXZY="; + sha256 = "b5x/Qd6ayqQqYtkFgvaCquJNuTR/jEnywM7F+ytRA8I="; }; nativeBuildInputs = [ From 68ff0be87314fefcb476e01c56f941d0d15ea51b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:11:02 +0000 Subject: [PATCH 134/505] =?UTF-8?q?gnome.gnome-contacts:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 efa7745d13e5..35064cdada94 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "KnVZ8EO94HpdRtPQL+gUNoddrBr375efNJwsJrZkfeQ="; + sha256 = "MuyrNZ1h0r45fYhSHzuW8IrLm9PkZYt5SIUfVpWSzdU="; }; propagatedUserEnvPkgs = [ From eec9fe6aec526904ef814b845ab6740062479dd5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:11:08 +0000 Subject: [PATCH 135/505] =?UTF-8?q?gnome.gnome-disk-utility:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.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/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 3b3821c569f1..f9d2c810c8e8 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pfd8XGC9gmdCwjXnRZWok7+aRGC4AUWjLUaxR35ME/s="; + sha256 = "sha256-PcOLsNyRMpHPKebKkEmtQ2Q8dxJhvvpXm7AHPOZfYtA="; }; nativeBuildInputs = [ From 99c08cb41a0753752c0552dd09092abc3cb447ff Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:11:26 +0000 Subject: [PATCH 136/505] =?UTF-8?q?gnome.gnome-settings-daemon:=2043.alpha?= =?UTF-8?q?=20=E2=86=92=2043.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/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- .../desktops/gnome/core/gnome-settings-daemon/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index e54e18f606ef..2f1cb91e80bf 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -36,17 +36,17 @@ , python3 , tzdata , nss -, gcr +, gcr_4 , gnome-session-ctl }: stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "SlKagmJ6aJfhgxW1htr7kKLBQvpiELRAkcp8eVV9ONM="; + sha256 = "PDPeNaxpZgo/JQKkv7YS1bR05MIuWw8zoNCB+UbdMcs="; }; patches = [ @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { systemd libgudev libwacom - gcr + gcr_4 ]; mesonFlags = [ From b964741f015df696b870caaf01368ddb7c0df63f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:11:37 +0000 Subject: [PATCH 137/505] =?UTF-8?q?gnome.gnome-weather:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 f2ad091e3745..ef0e500b5a10 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "2e+J2ovMWO9gFpcJkHO8/Da39MMuDatWJ7c+cxcLCFs="; + sha256 = "+dPEATKODdZBVvd3zYdqc+eu5RCd22NnPQMIGqr4B+E="; }; nativeBuildInputs = [ From 27188844ea4a6bdd976f8f6362e74b3ae141e736 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:11:50 +0000 Subject: [PATCH 138/505] =?UTF-8?q?gnome.nautilus:=2043.beta=20=E2=86=92?= =?UTF-8?q?=2043.beta.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/43.beta...43.beta.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/nautilus/default.nix | 4 ++-- pkgs/desktops/gnome/core/nautilus/extension_dir.patch | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 95f4f0b671cf..7a82855981a8 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 = "43.beta"; + version = "43.beta.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "5SEptSc/ZBb///prJr00pWrLfUXltuCVU1UpOhZXkfU="; + sha256 = "vcNohRVfwJVzkkCy6VEAMvXZWCP5NL0bkpcIIQdWg1E="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch index 344a50fa45b9..a1bdd64f989b 100644 --- a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch +++ b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch @@ -1,14 +1,16 @@ diff --git a/src/nautilus-module.c b/src/nautilus-module.c -index 6273a76..4adcc8a 100644 +index cd889ff18..e2cd6468e 100644 --- a/src/nautilus-module.c +++ b/src/nautilus-module.c -@@ -242,11 +242,17 @@ void +@@ -267,6 +267,7 @@ void nautilus_module_setup (void) { static gboolean initialized = FALSE; + const gchar* extensiondir = NULL; + const gchar *disable_plugins; - if (!initialized) + disable_plugins = g_getenv ("NAUTILUS_DISABLE_PLUGINS"); +@@ -280,7 +281,12 @@ nautilus_module_setup (void) { initialized = TRUE; From d9545622e074574047ec52fa3bfdff55d3ab6f86 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:11:55 +0000 Subject: [PATCH 139/505] =?UTF-8?q?gnome.rygel:=200.41.1=20=E2=86=92=200.4?= =?UTF-8?q?1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/rygel/-/compare/rygel-0.41.1...rygel-0.41.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/rygel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index 800456551d56..9c349f3b845c 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.41.1"; + version = "0.41.2"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "t+ZUlxUjkVSyeHqRizH17WhAQGTQpn72aW9MdwrHNvM="; + sha256 = "sRhMYUsSYYrFgHqCgflD9/c7SypKZw1HViUEC4FpO3I="; }; patches = [ From 057bca57086d7ee4028b696522eba7448f3bd847 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:12:14 +0000 Subject: [PATCH 140/505] =?UTF-8?q?gnome-online-accounts:=203.45.1=20?= =?UTF-8?q?=E2=86=92=203.45.2?= 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.45.1...3.45.2 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/gnome-online-accounts/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index e8410ed61054..b0651a25dafe 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , pkg-config , vala , glib @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.45.1"; + version = "3.45.2"; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -43,17 +42,9 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-1FqOJ+nKQdK5r2fP7oAvh1LfG+T1S1NSJ+9kNZ5I76Q="; + sha256 = "sha256-ST8hHMBCURI78HcT3iGL5D+O/v4gdqxToTanXWI4/Vw="; }; - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/95 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/commit/2da899c48795e9941661f3eb06fc4fc04ec7b0fa.patch"; - sha256 = "5qDiKnX9gx7eo//Qxa0+M9rsFKpg8dplA3IUZHuacmA="; - }) - ]; - mesonFlags = [ "-Dfedora=false" # not useful in NixOS or for NixOS users. "-Dgtk_doc=true" From 1a6642a4b962851bbeb68040184e2ad7d67d5b11 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:13:51 +0000 Subject: [PATCH 141/505] =?UTF-8?q?tracker:=203.4.0.alpha=20=E2=86=92=203.?= =?UTF-8?q?4.0.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.4.0.alpha...3.4.0.beta - Drops Vala dependency – component written in it was ported to C and Vapi is still handwritten: https://gitlab.gnome.org/GNOME/tracker/-/commit/aea373bc44c40ef90b232e3cdff2905bcecfe460 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index cf869c94eead..3b163b310dc4 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -13,7 +13,6 @@ , libxml2 , glib , wrapGAppsNoGuiHook -, vala , sqlite , libxslt , libstemmer @@ -30,13 +29,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.4.0.alpha"; + version = "3.4.0.beta"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "PIbsVkHpSrf7gCut2BREyFSuT2MmIfvELUUgGRwyQGE="; + sha256 = "r7evHXAHaELU6Fg691l6qJG9phTqiyjmAwiT/gxSpiE="; }; postPatch = '' @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - vala pkg-config asciidoc gettext From 17b00779f4362e1654566f31f0cdbd291767ef8d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:13:57 +0000 Subject: [PATCH 142/505] =?UTF-8?q?vte:=200.69.90=20=E2=86=92=200.69.92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.69.90...0.69.92 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index a2eec8092abe..81b148a9756c 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.69.90"; + version = "0.69.92"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-FB6AvuUExv5yWVrqkP2FSvxPNEkXsbW/34OqPIOWBM0="; + sha256 = "sha256-LXk9HP/lT1zMFqJCMp1H1P1hcssY7LSdFIeVOEDJ1cQ="; }; patches = [ From 301c97b7e6e54cd971cf34cfa5c73401ff119177 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Aug 2022 12:14:00 +0000 Subject: [PATCH 143/505] =?UTF-8?q?tracker-miners:=203.4.0.alpha=20?= =?UTF-8?q?=E2=86=92=203.4.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.4.0.alpha...3.4.0.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker-miners/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 87df670ebe42..8daad8df0dce 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -49,19 +49,14 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.0.alpha"; + version = "3.4.0.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "P84wGmT1IPGMZLPGPgoRRbtpN5bJNmxBxwfZNJ8XPyY="; + sha256 = "49XkMVzkLwKf6VKIPnCqb4uXLY+qwmGAjDdKSzglLwo="; }; - # TODO: remove me on 3.4.0 patches = [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/cc655ba0f95022cf35bc6d44cb5155788fee2e24.patch"; - sha256 = "sha256-a85ygtabpkruiDgKbseQxYbFIAQlVDhs3eWkbStJjKs="; - }) (fetchpatch { url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/9e613ceb37ec41fd1cd88c3d539e3ee03e8f6ba6.patch"; sha256 = "sha256-ht7EfZztyl0st0Sv7H92Q37vwXY4T61GQm9WJ8IxTTg="; From 8ecf9026cc87683cf565f62cf64aff4232e1ab09 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 10 Aug 2022 20:37:33 +0200 Subject: [PATCH 144/505] gnome.nautilus: install docs --- pkgs/desktops/gnome/core/nautilus/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 7a82855981a8..3e9b88883b42 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -4,6 +4,8 @@ , meson , ninja , pkg-config +, gtk-doc +, docbook-xsl-nons , gettext , libxml2 , desktop-file-utils @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { pname = "nautilus"; version = "43.beta.1"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; @@ -63,6 +65,8 @@ stdenv.mkDerivation rec { meson ninja pkg-config + gtk-doc + docbook-xsl-nons wrapGAppsHook4 ]; @@ -93,6 +97,10 @@ stdenv.mkDerivation rec { gtk4 ]; + mesonFlags = [ + "-Ddocs=true" + ]; + preFixup = '' gappsWrapperArgs+=( # Thumbnailers From 526f7860ca4594ddb6a05f592515851ea532663d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 19:15:25 +0200 Subject: [PATCH 145/505] gnome.file-roller: Fix build with Nautilus 43.beta --- pkgs/desktops/gnome/apps/file-roller/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index a39df566c9c2..abd417d2c230 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -44,6 +44,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/file-roller/-/commit/d8461bbad8226d101beb02c2695a2f66cea675df.patch"; sha256 = "OKEZGijiIYDMiyuLqyHHrnTw88p+0hwkt6liufv3T74="; }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/file-roller/-/commit/5cfaa00f04130084e42548abb2226c1c2e378e48.patch"; + sha256 = "/3ceT7fv/L9tV5kQwmiBBDL2AOjhjoPUT3AgVLk/q98="; + excludes = [ + "default.nix" + ]; + }) ]; LANG = "en_US.UTF-8"; # postinstall.py @@ -74,7 +81,7 @@ stdenv.mkDerivation rec { nautilus ]; - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4"; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_4_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4"; postPatch = '' chmod +x postinstall.py # patchShebangs requires executable file From 28f93b78b36c6d5b7e69303c4afa0b77d0bbe5d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:52:18 +0000 Subject: [PATCH 146/505] =?UTF-8?q?gdk-pixbuf:=202.42.8=20=E2=86=92=202.42?= =?UTF-8?q?.9?= 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.8...2.42.9 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gdk-pixbuf/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index ff8ace9613fc..ae7d7460487a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -7,9 +7,7 @@ , pkg-config , gettext , python3 -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_43 +, docutils , gi-docgen , glib , libtiff @@ -25,14 +23,14 @@ stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.42.8"; + version = "2.42.9"; outputs = [ "out" "dev" "man" "devdoc" ] ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hKzqOsskEbKRNLMgFaWxqqYoRLGcSx74uJccawdZ9MY="; + sha256 = "KPeVjnvymjLU6WNVbSQdCkGmeGWC/2pa0RZl4DR/yWI="; }; patches = [ @@ -59,9 +57,7 @@ stdenv.mkDerivation rec { gobject-introspection # for man pages - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 + docutils ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; From 8f66a751f2d121963656415e20c9367554e60e70 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:52:28 +0000 Subject: [PATCH 147/505] =?UTF-8?q?glade:=203.38.2=20=E2=86=92=203.40.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glade/-/compare/GLADE_3_38_2...GLADE_3_40_0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/tools/glade/default.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index adec880eabe0..48a66cbad4d2 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -2,7 +2,6 @@ , lib , gettext , fetchurl -, fetchpatch , python3 , meson , ninja @@ -25,29 +24,13 @@ stdenv.mkDerivation rec { pname = "glade"; - version = "3.38.2"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; + sha256 = "McmtrqhJlyq5UXtWThmsGZd8qXdYsQntwxZwCPU+PZw="; }; - patches = [ - # Fix build with meson 0.61 - # data/meson.build:4:5: ERROR: Function does not take positional arguments. - # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glade/-/commit/61304b2e8bac8ded76643cb7c3e781f73881dd2b.patch"; - sha256 = "9x6RK8Wgnm8bDxeBLV3PlUkUuH2706Ba9kwE5S87DgE="; - }) - # help/meson.build:6:6: ERROR: Tried to create target "help-glade-da-update-po", but a target of that name already exists. - # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glade/-/commit/04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb.patch"; - sha256 = "j3XfF7P6rndL+0PWqnp+QYph7Ba6bgcp4Pkikr2wuJA="; - }) - ]; - nativeBuildInputs = [ meson ninja From a35d4317ff5ba18b14b2716255a106b6d2488b53 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:52:42 +0000 Subject: [PATCH 148/505] =?UTF-8?q?gnome.devhelp:=2043.alpha=20=E2=86=92?= =?UTF-8?q?=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/devhelp/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/devtools/devhelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index e9f6249ad010..2542ec1c1e6b 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "43.alpha"; + version = "43.beta"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8HQxbo51vNjOWx+i1rn0GKrTTmtwt+u4JZkF5eVQjwI="; + sha256 = "cVgG50RPktYW2xuI8Qq3zy9sFNrQDXhBqtz9x3ZJmTE="; }; nativeBuildInputs = [ From a8e221488f85fa7dd062f92ec808033c5995e0e6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:52:58 +0000 Subject: [PATCH 149/505] =?UTF-8?q?gnome.gnome-boxes:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar gnome.gnome-boxes: 43.alpha → 43.beta - Drop GtkSourceView, it has not been used since 42: https://gitlab.gnome.org/GNOME/gnome-boxes/-/commit/858c29417c71f6f1f6f77f47519d9bdccac9bfd0 https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 6cb4cd672247..18340c3e782a 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -12,7 +12,6 @@ , gobject-introspection , libxml2 , gtk3 -, gtksourceview4 , libvirt , spice-gtk , python3 @@ -53,11 +52,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "BEUHGaCDN8/fF1D18N82gwc7Xg6kisynSb4j0Ev7+yY="; + sha256 = "WqNgpIepZCy/qJLNVFlgCXCRLT6FjyCKJDlz0Jev7Ts="; }; patches = [ @@ -96,7 +95,6 @@ stdenv.mkDerivation rec { gmp gnome.adwaita-icon-theme gtk3 - gtksourceview4 json-glib libapparmor libarchive From ae10ce90293c04f4acf0d8dcb805bd5c985e03da Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:53:00 +0000 Subject: [PATCH 150/505] =?UTF-8?q?gnome.gnome-calendar:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 0e63e106ac35..fb577344b1d4 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VJOLEzJq0L4xYp/RL9/tJgp0A8AIehU0TaNYxgxGyuc="; + sha256 = "s5WvmLCWCFt3qTo/fcoXIROW/04gkWdhX84bIWbUb+Q="; }; nativeBuildInputs = [ From 032574c064622e6e1574e7b90b16eda3d15d23f4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:53:11 +0000 Subject: [PATCH 151/505] =?UTF-8?q?gnome.gnome-control-center:=2043.alpha?= =?UTF-8?q?=20=E2=86=92=2043.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/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 f41e2481fe76..363600a37525 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Tcdvb4qrgY3ybL5bAlZ134HkkjEAORco9my2y0xFjz4="; + sha256 = "sha256-cfmrzgWDyCKTLWvyxP9KPDxA3RjUMgUAPoMf7s62dQs="; }; patches = [ From 60c1d087549318192fe1a0da3e7ad0f82d180996 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:53:47 +0000 Subject: [PATCH 152/505] =?UTF-8?q?gnome.mutter:=2043.alpha=20=E2=86=92=20?= =?UTF-8?q?43.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/mutter/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 3c74d4759c12..79ce77da541d 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -1,6 +1,7 @@ { fetchurl , runCommand , lib +, fetchpatch , stdenv , pkg-config , gnome @@ -35,6 +36,7 @@ , python3 , wrapGAppsHook , sysprof +, libsysprof-capture , desktop-file-utils , libcap_ng , egl-wayland @@ -44,15 +46,24 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "43.alpha"; + version = "43.beta"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "IM4d5uTepo8AEFFihn6s6nJ26WdeconFgXIu/Pou7IA="; + sha256 = "/nE+P+k+gHkzw8Xy3stscYtq3C1wjV8951+o7mnbjGg="; }; + patches = [ + # Fix build with separate sysprof. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; + sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; + }) + ]; + mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these @@ -105,7 +116,8 @@ let self = stdenv.mkDerivation rec { libXdamage pango pipewire - sysprof + sysprof # for D-Bus interfaces + libsysprof-capture xkeyboard_config xwayland wayland-protocols From 4c41303bf80b60a88a09b0aae64f0e637e6e244e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:53:30 +0000 Subject: [PATCH 153/505] =?UTF-8?q?gnome.gnome-shell:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 294c7e801fe0..34ca6b90190f 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -29,7 +29,7 @@ , gobject-introspection , wrapGAppsHook , libxslt -, gcr +, gcr_4 , accountsservice , gdk-pixbuf , gdm @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "43.alpha"; + version = "43.beta"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "79OvceBnO5hxTxxhDGv/ffcBvB0tRoeVG7aJt47jkPw="; + sha256 = "4Ri5bdn1sL0UVOSneXgPPVfONUD6vqmhaBonrpzelME="; }; patches = [ @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gnome-keyring glib - gcr + gcr_4 accountsservice libsecret polkit From d6dbca8816a87e69c48d7db097f85f397e2cb1e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:53:31 +0000 Subject: [PATCH 154/505] =?UTF-8?q?gnome.gnome-shell-extensions:=2043.alph?= =?UTF-8?q?a=20=E2=86=92=2043.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/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- 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 91246c70f03a..73d60ad30815 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "zoqztQf0NCz6Z3F/zL/VD8LW0sHOVu3SvnTtDyawlu8="; + sha256 = "3Z6QQONEtrkkgAvmxBG0OzbMy1HDHxLxTyPhoHPfWrU="; }; patches = [ From a11c29f12651186988a78f3fbf088142794e45d1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 18:55:34 +0000 Subject: [PATCH 155/505] =?UTF-8?q?xdg-desktop-portal-gnome:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= 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/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- .../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 e76a7dd4ac03..8001f8990077 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 = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8HeFvtoVI5E8tP9vjDOk49u4uW0uWYOVRexAGwguVHw="; + sha256 = "r5jrRMk0Oldm2EcK9luudNf5v0fL6SqoR7s1ZrmEPE8="; }; nativeBuildInputs = [ From 4a06436ff205933337094011fd14a810f7620baf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Aug 2022 21:08:35 +0000 Subject: [PATCH 156/505] =?UTF-8?q?gnome.nautilus-python:=201.2.3=20?= =?UTF-8?q?=E2=86=92=204.0.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Support for Nautilus 43, most scripts will need to be modified to work. https://gitlab.gnome.org/GNOME/nautilus-python/-/compare/NAUTILUS_PYTHON_1_2_3...4.0.alpha Changelog-Reviewed-By: Jan Tojnar --- .../gnome/misc/nautilus-python/default.nix | 46 ++++--------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/pkgs/desktops/gnome/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix index 7bc446a29de0..b75e7839d06c 100644 --- a/pkgs/desktops/gnome/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix @@ -1,30 +1,27 @@ { stdenv , lib -, fetchpatch , substituteAll , fetchurl +, meson +, ninja , pkg-config -, which -, autoreconfHook , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_412 , python3 -, ncurses , nautilus -, gtk3 , gnome }: stdenv.mkDerivation rec { pname = "nautilus-python"; - version = "1.2.3"; + version = "4.0.alpha"; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "doc" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "161050sx3sdxqcpjkjcpf6wl4kx0jydihga7mcvrj9c2f8ly0g07"; + url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor version}/nautilus-python-${version}.tar.xz"; + sha256 = "cuWLpOIZZ0FqIwNV304EaWsKJZ5JHcsFyyp/BFiUmg4="; }; patches = [ @@ -35,50 +32,27 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 ]; }) - - # Fix build with Nautilus 43. - # https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/9 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nautilus-python/commit/1691b2eb88c8b9134c6fa06da0858f7b5bb74c72.patch"; - sha256 = "dY9KrLorYlGTbKSLObRmffJwJfHwz48kCsInGGByIOI="; - }) ]; nativeBuildInputs = [ pkg-config - which - autoreconfHook + meson + ninja gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_412 ]; buildInputs = [ python3 - ncurses # required by python3 python3.pkgs.pygobject3 nautilus - gtk3 # required by libnautilus-extension ]; - # Workaround build failure on -fno-common toolchains: - # ld: nautilus-python-object.o:src/nautilus-python.h:61: multiple definition of - # `_PyNautilusMenu_Type'; nautilus-python.o:src/nautilus-python.h:61: first defined here - # TODO: remove it once upstream fixes and releases: - # https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/7 - NIX_CFLAGS_COMPILE = "-fcommon"; - - makeFlags = [ - "PYTHON_LIB_LOC=${python3}/lib" - ]; - - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4"; - passthru = { updateScript = gnome.updateScript { packageName = pname; attrPath = "gnome.${pname}"; - versionPolicy = "odd-unstable"; }; }; From 93807a6352192feef5546c6707d908c3a28cb8ab Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 13 Aug 2022 00:38:08 +0200 Subject: [PATCH 157/505] gnome.mutter: build docs --- pkgs/desktops/gnome/core/mutter/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 79ce77da541d..696d26558dbf 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -35,6 +35,7 @@ , xorgserver , python3 , wrapGAppsHook +, gi-docgen , sysprof , libsysprof-capture , desktop-file-utils @@ -48,7 +49,7 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; version = "43.beta"; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; @@ -73,6 +74,7 @@ let self = stdenv.mkDerivation rec { # This should be auto detected, but it looks like it manages a false # positive. "-Dxwayland_initfd=disabled" + "-Ddocs=true" ]; propagatedBuildInputs = [ @@ -93,6 +95,7 @@ let self = stdenv.mkDerivation rec { pkg-config python3 wrapGAppsHook + gi-docgen xorgserver # for cvt command ]; @@ -131,6 +134,12 @@ let self = stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + # TODO: Move this into a directory devhelp can find. + moveToOutput "share/mutter-11/doc" "$devdoc" + ''; + # Install udev files into our own tree. PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; From 4255bb62ddbd1c8950874f2c92138349047cdb9e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 13 Aug 2022 09:34:42 +0200 Subject: [PATCH 158/505] bolt: disable tests They are failing with GLib 2.73: https://gitlab.freedesktop.org/bolt/bolt/-/issues/181 --- pkgs/os-specific/linux/bolt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 2545c73ac588..07214f482763 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -65,7 +65,8 @@ stdenv.mkDerivation rec { systemd ]; - doCheck = true; + # https://gitlab.freedesktop.org/bolt/bolt/-/issues/181 + doCheck = false; preCheck = '' export LD_LIBRARY_PATH=${umockdev.out}/lib/ From cb77c5d569caa2c5a6cba7a396cfa20b69ab34a8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 13 Aug 2022 09:53:51 +0200 Subject: [PATCH 159/505] gtksourceview4: disable tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They are broken by GLib’s PCRE 2 switch. --- pkgs/development/libraries/gtksourceview/4.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 74acd6f743d6..b7828de45585 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -70,7 +70,9 @@ stdenv.mkDerivation rec { dbus ]; - doCheck = stdenv.isLinux; + # Broken by PCRE 2 bump in GLib. + # https://gitlab.gnome.org/GNOME/gtksourceview/-/issues/283 + doCheck = false; checkPhase = '' runHook preCheck From a33463bc5c1287f175c99e5533bdc8271a181187 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 13 Aug 2022 10:37:02 +0200 Subject: [PATCH 160/505] vte: Build developer docs --- pkgs/development/libraries/vte/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 81b148a9756c..d3b16a08a698 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -14,6 +14,7 @@ , gobject-introspection , vala , python3 +, gi-docgen , libxml2 , gnutls , gperf @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { pname = "vte"; version = "0.69.92"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -59,6 +60,7 @@ stdenv.mkDerivation rec { pkg-config vala python3 + gi-docgen ]; buildInputs = [ @@ -78,7 +80,9 @@ stdenv.mkDerivation rec { pango ]; - mesonFlags = lib.optionals (!systemdSupport) [ + mesonFlags = [ + "-Ddocs=true" + ] ++ lib.optionals (!systemdSupport) [ "-D_systemd=false" ] ++ lib.optionals (gtkVersion == "4") [ "-Dgtk3=false" @@ -98,6 +102,11 @@ stdenv.mkDerivation rec { patchShebangs src/modes.py ''; + 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 c02afe7d1a9728880f9ae95a79d3b8dffa4a5686 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 14 Aug 2022 14:14:35 +0000 Subject: [PATCH 161/505] =?UTF-8?q?gnome.gnome-flashback:=203.44.0=20?= =?UTF-8?q?=E2=86=92=203.45.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.44.0...3.45.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/misc/gnome-flashback/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 4401915d40ba..292418b5e7fd 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -31,7 +31,7 @@ }: let pname = "gnome-flashback"; - version = "3.44.0"; + version = "3.45.1"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: @@ -62,7 +62,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "sha256-HfCDgSfGJG7s2J0cUP+I/IKr9t47MGjlLd5JWkK9VQo="; + sha256 = "sha256-flUlRhAtuqH9f2t/JEYx53N+MSX1OkcBnRog+Jh0++U="; }; # make .desktop Execs absolute @@ -73,6 +73,11 @@ let -Exec=gnome-flashback +Exec=$out/bin/gnome-flashback END_PATCH + + # The stable release has version 43, which compares lower than 43.alpha. + # https://gitlab.gnome.org/GNOME/gnome-flashback/-/issues/83 + substituteInPlace configure configure.ac \ + --replace "gnome-desktop-3.0 >= 43.alpha" "gnome-desktop-3.0 >= 43" ''; postInstall = '' From 3561cddb357e780b79ab97d69e55b4712b70c705 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 15 Aug 2022 13:02:15 +0200 Subject: [PATCH 162/505] evolution: drop libcryptui flag I has not been there since 3.29.3: https://gitlab.gnome.org/GNOME/evolution/-/commit/f5a5b52ed2c61c10b08c723d65ebbb0a6abd966e --- .../networking/mailreaders/evolution/evolution/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index ea032b112688..5a7295c7bb0d 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_AUTOAR=OFF" - "-DENABLE_LIBCRYPTUI=OFF" "-DENABLE_YTNEF=OFF" "-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin" "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn" From e3e9af28895992220ee700790f86197f3b56765e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 15 Aug 2022 14:03:52 +0200 Subject: [PATCH 163/505] almanah: switch to gcr & gtksourceview 4 --- pkgs/applications/misc/almanah/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 5e4f44823548..d2822bd122a9 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -7,13 +7,13 @@ , desktop-file-utils , evolution-data-server , evolution -, gcr +, gcr_4 , gettext , glib , gnome , gpgme , gtk3 -, gtksourceview3 +, gtksourceview4 , gtkspell3 , libcryptui , libxml2 @@ -42,6 +42,20 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; }) + + # Port to Gcr 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/14 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/cd44b476f4ffbf37c5d5f5b996ecd711db925576.patch"; + sha256 = "wJ1035NxgeTwUa0LoNcB6TSLxffoXBR3WbGAGkfggYY="; + }) + + # Port to GtkSourceView 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch"; + sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE="; + }) ]; nativeBuildInputs = [ @@ -59,12 +73,12 @@ stdenv.mkDerivation rec { atk cairo evolution-data-server - gcr + gcr_4 glib evolution gpgme gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libcryptui sqlite From 402430921161812e9694b5f91e0b60cf20b39c72 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 15 Aug 2022 20:06:01 +0200 Subject: [PATCH 164/505] =?UTF-8?q?phodav:=202.5=20=E2=86=92=203.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/phodav/-/compare/v2.5...v3.0 Ported to libsoup 3 – not compatible with programs depending on libsoup 2. Also: - Corrected license - Formated the expression - Re-ordered the attributes - Moved libsoup to buildInputs - Added update script - Switched to mirror link in src --- pkgs/tools/networking/phodav/default.nix | 52 ++++++++++++------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index fb2fce8bdeb1..7a3ce12b55fb 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -1,48 +1,50 @@ -{ lib -, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , pkg-config -, libsoup +, libsoup_3 +, libxml2 , meson , ninja +, gnome }: -let - version = "2.5"; -in stdenv.mkDerivation rec { pname = "phodav"; - inherit version; + version = "3.0"; + + outputs = [ "out" "dev" "lib" ]; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; - sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; + url = "mirror://gnome/sources/phodav/${version}/phodav-${version}.tar.xz"; + sha256 = "OS7C0G1QMA3P8e8mmiqYUwTim841IAAvyiny7cHRONE="; }; - patches = [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/ae9ac98c1b3db26070111661aba02594c62d2cef.patch"; - sha256 = "sha256-jIHG6aRqG00Q6aIQsn4tyQdy/b6juW6QiUPXLmIc3TE="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/560ab5ca4f836d82bddbbe66ea0f7c6b4cab6b3b.patch"; - sha256 = "sha256-2gP579qhEkp7fQ8DBGYbZcjb2Tr+WpJs30Z7lsQaz2g="; - }) + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + libsoup_3 + libxml2 ]; mesonFlags = [ "-Davahi=disabled" - "-Dsystemd=disabled" + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dgtk_doc=disabled" - "-Dudev=disabled" + "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" ]; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; - nativeBuildInputs = [ libsoup pkg-config meson ninja ]; - - outputs = [ "out" "dev" "lib" ]; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; # We need to do this in pre-configure before the data/ folder disappears. preConfigure = '' @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "WebDav server implementation and library using libsoup"; homepage = "https://wiki.gnome.org/phodav"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; }; From 32ddabf3df52a75f574c053592847da40da2a86b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 15 Aug 2022 20:14:13 +0200 Subject: [PATCH 165/505] libosinfo: switch to libsoup 3 Not compatible with programs depending on libsoup 2. --- pkgs/development/libraries/libosinfo/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 7564e87cdc25..032589336237 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -9,7 +9,7 @@ , gtk-doc , docbook_xsl , glib -, libsoup +, libsoup_3 , libxml2 , libxslt , check @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib - libsoup + libsoup_3 libxml2 libxslt ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04be96e82960..9084df9b887d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20346,9 +20346,7 @@ with pkgs; libopusenc = callPackage ../development/libraries/libopusenc { }; - libosinfo = callPackage ../development/libraries/libosinfo { - inherit (gnome) libsoup; - }; + libosinfo = callPackage ../development/libraries/libosinfo { }; libosip = callPackage ../development/libraries/osip {}; From bb3d5b67184e468ad705c3fa4346b5497633289c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Aug 2022 02:49:48 +0200 Subject: [PATCH 166/505] phodav_2_0: re-init 2.5 It is needed for virt-viewer. --- pkgs/tools/networking/phodav/2.0.nix | 59 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/tools/networking/phodav/2.0.nix diff --git a/pkgs/tools/networking/phodav/2.0.nix b/pkgs/tools/networking/phodav/2.0.nix new file mode 100644 index 000000000000..fa809d059591 --- /dev/null +++ b/pkgs/tools/networking/phodav/2.0.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, libsoup +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "phodav"; + version = "2.5"; + + outputs = [ "out" "dev" "lib" ]; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; + sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; + }; + + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/ae9ac98c1b3db26070111661aba02594c62d2cef.patch"; + sha256 = "sha256-jIHG6aRqG00Q6aIQsn4tyQdy/b6juW6QiUPXLmIc3TE="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/560ab5ca4f836d82bddbbe66ea0f7c6b4cab6b3b.patch"; + sha256 = "sha256-2gP579qhEkp7fQ8DBGYbZcjb2Tr+WpJs30Z7lsQaz2g="; + }) + ]; + + mesonFlags = [ + "-Davahi=disabled" + "-Dsystemd=disabled" + "-Dgtk_doc=disabled" + "-Dudev=disabled" + ]; + + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + libsoup + ]; + + meta = with lib; { + description = "WebDav server implementation and library using libsoup 2"; + homepage = "https://wiki.gnome.org/phodav"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9084df9b887d..143eef9cf2f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10161,6 +10161,8 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; + phodav_2_0 = callPackage ../tools/networking/phodav/2.0.nix { }; + photon-rss = callPackage ../applications/networking/feedreaders/photon { }; pim6sd = callPackage ../servers/pim6sd { }; From beb1906cfcc1c5863aa144b779b1fd801c02c86b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 15 Aug 2022 20:21:50 +0200 Subject: [PATCH 167/505] spice-gtk: port to libsoup 3 --- pkgs/applications/networking/remote/remmina/default.nix | 7 +++++-- pkgs/applications/virtualization/virt-viewer/default.nix | 9 +++++---- pkgs/development/libraries/spice-gtk/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 20496f38e868..8a39e31aa9c6 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -3,7 +3,7 @@ , freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core +, libsecret, libsoup, spice-protocol, spice-gtk_libsoup2, libepoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsoup spice-protocol spice-gtk libepoxy at-spi2-core + libsoup spice-protocol + # https://gitlab.com/Remmina/Remmina/-/issues/2754 + spice-gtk_libsoup2 + libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz python3 ] ++ optionals withLibsecret [ libsecret ] diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 95909e36d0c0..ed882709aa14 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -19,7 +19,8 @@ , pkg-config , python3 , shared-mime-info -, spice-gtk ? null +# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88 +, spice-gtk_libsoup2 ? null , spice-protocol ? null , spiceSupport ? true , vte @@ -29,7 +30,7 @@ assert spiceSupport -> ( gdbm != null && libcap != null - && spice-gtk != null + && spice-gtk_libsoup2 != null && spice-protocol != null ); @@ -78,12 +79,12 @@ stdenv.mkDerivation rec { ] ++ optionals spiceSupport [ gdbm libcap - spice-gtk + spice-gtk_libsoup2 spice-protocol ]; # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; strictDeps = true; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 7a647084f9cd..2564162c3bf1 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -17,13 +17,16 @@ , libdrm , libjpeg_turbo , libopus +, withLibsoup2 ? false , libsoup +, libsoup_3 , libusb1 , lz4 , meson , ninja , openssl , perl +, phodav_2_0 , phodav , pixman , pkg-config @@ -84,7 +87,6 @@ stdenv.mkDerivation rec { gettext gobject-introspection gtk-doc - libsoup meson ninja perl @@ -108,10 +110,11 @@ stdenv.mkDerivation rec { libcacard libjpeg_turbo libopus + (if withLibsoup2 then libsoup else libsoup_3) libusb1 lz4 openssl - phodav + (if withLibsoup2 then phodav_2_0 else phodav) pixman spice-protocol usbredir diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 143eef9cf2f4..7f06a91b7e05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22097,6 +22097,8 @@ with pkgs; spice-gtk = callPackage ../development/libraries/spice-gtk { }; + spice-gtk_libsoup2 = spice-gtk.override { withLibsoup2 = true; }; + spice-protocol = callPackage ../development/libraries/spice-protocol { }; spice-up = callPackage ../applications/office/spice-up { }; From 86a3c68628b15f5057d333f51bcdb165839810ae Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Aug 2022 19:27:24 +0000 Subject: [PATCH 168/505] =?UTF-8?q?grilo:=200.3.14=20=E2=86=92=200.3.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/grilo/-/compare/grilo-0.3.14...grilo-0.3.15 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/grilo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 2f8c291da0d6..bf5d1db13406 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -16,13 +16,13 @@ , libxml2 , gnome , gobject-introspection -, libsoup +, libsoup_3 , totem-pl-parser }: stdenv.mkDerivation rec { pname = "grilo"; - version = "0.3.14"; # if you change minor, also change ./setup-hook.sh + version = "0.3.15"; # if you change minor, also change ./setup-hook.sh outputs = [ "out" "dev" "man" "devdoc" ]; outputBin = "dev"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "A2nQsAuw9Zul966oz8Zl843xSltBgtKMfB4s0VtRh0M="; + sha256 = "81Ks9zZlZpk0JwY2/t5mtS2mgB/iD2OMQEirJnhXey0="; }; mesonFlags = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { liboauth gtk3 libxml2 - libsoup + libsoup_3 totem-pl-parser ]; From ce1b1e119da8e41eec9b68c98d691fa6021fd466 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Aug 2022 19:27:26 +0000 Subject: [PATCH 169/505] =?UTF-8?q?grilo-plugins:=200.3.14=20=E2=86=92=200?= =?UTF-8?q?.3.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/grilo-plugins/-/compare/grilo-plugins-0.3.14...grilo-plugins-0.3.15 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/grilo-plugins/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index db968f4730f8..624dbd70a617 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -7,9 +7,8 @@ , gettext , gperf , sqlite -, librest , libarchive -, libsoup +, libsoup_3 , gnome , libxml2 , lua5_3 @@ -31,11 +30,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.14"; + version = "0.3.15"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "aGhEs07HOySTH/bMT2Az8AcpR6bbYKzcf7Pq8Velgcg="; + sha256 = "hRjD2VT5MJXZVWJKBEzhanNFUy+BHSmdv6HhFM/rqzM="; }; patches = [ @@ -65,15 +64,14 @@ stdenv.mkDerivation rec { buildInputs = [ grilo libxml2 - libgdata + # libgdata lua5_3 liboauth sqlite gnome-online-accounts totem-pl-parser - librest libarchive - libsoup + libsoup_3 gmime gom json-glib From 811fe828dd71f3f78b1ce8e3507013d02f367c89 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Aug 2022 19:28:17 +0000 Subject: [PATCH 170/505] =?UTF-8?q?libsoup=5F3:=203.1.1=20=E2=86=92=203.1.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsoup/-/compare/3.1.1...3.1.3 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libsoup/3.x.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index a25224599c8e..f6d27ba8a765 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.1.1"; + version = "3.1.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-RAO/PnpMeoXLPEpSgcm5nSVuKGOfVXMKUq3UMqr84Fw="; + sha256 = "sha256-2KqVN6Fk6m+72ohY8ozGPYgPxEGMm+7T3mJe2XHrWac="; }; nativeBuildInputs = [ @@ -66,8 +66,6 @@ stdenv.mkDerivation rec { "-Dntlm=disabled" # Requires wstest from autobahn-testsuite. "-Dautobahn=disabled" - # Requires quart Python module. - "-Dhttp2_tests=disabled" # Requires gnutls, not added for closure size. "-Dpkcs11_tests=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ From 8fb8a8deb0eb58ed11e49c1bd8c6b94afc0a30fb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Aug 2022 00:49:31 +0000 Subject: [PATCH 171/505] =?UTF-8?q?libgnomekbd:=203.26.1=20=E2=86=92=203.2?= =?UTF-8?q?8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgnomekbd/-/compare/3.26.1...3.28.0 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/libgnomekbd/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 5efd751bbb1e..fae319ef894b 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,19 +1,31 @@ -{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome, gobject-introspection }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, glib +, gtk3 +, libxklavier +, wrapGAppsHook +, gnome +}: stdenv.mkDerivation rec { pname = "libgnomekbd"; - version = "3.26.1"; + version = "3.28.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; + sha256 = "swV6RD5MJvkf41Lc0RVKVs3VHxz9fLas4wDDzBKGWck="; }; nativeBuildInputs = [ - file - intltool + meson + ninja pkg-config wrapGAppsHook glib @@ -27,9 +39,9 @@ stdenv.mkDerivation rec { glib ]; - postPatch = '' - substituteInPlace libgnomekbd/Makefile.in \ - --replace "shell pkg-config" 'shell $(PKG_CONFIG)' + postInstall = '' + # Missing post-install script. + glib-compile-schemas "$out/share/glib-2.0/schemas" ''; passthru = { From 35d83c3f20c2ab893e5f9b5b58a4a87d6405ddf7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Aug 2022 16:58:39 +0000 Subject: [PATCH 172/505] =?UTF-8?q?gnome.totem:=2043.alpha=20=E2=86=92=204?= =?UTF-8?q?3.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Requires libx11 1.8 https://gitlab.gnome.org/GNOME/totem/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/totem/default.nix | 27 +++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 1c3a44d63deb..fa979752ddae 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , gettext @@ -30,13 +32,32 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9pKUwVa0vZU+AQBdY+M+RWOTX5kmMDj65LxNlMEOuII="; + sha256 = "qkgMw4JT7Y07M0/qfj550hQ/J6N27dXbZjvIccKGSHA="; }; + patches = [ + # Lower X11 dependency version since we do not have it. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem/-/commit/140d9eea70c3101ef3234abb4de5974cb84b13db.patch"; + sha256 = "ohppxqMiH8Ksc9B2e3AXighfM6KVN+RNXYL+fLELSN8="; + revert = true; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem/-/commit/2610b4536f73493587e4a5a38e01c9961fcabb96.patch"; + sha256 = "nPfzS+LQuAlyQOz67hCdtx93w2frhgWlg1KGX5bEU38="; + revert = true; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem/-/commit/5b871aee5292f25bbf39dca18045732e979e7a68.patch"; + sha256 = "LqQLdgyZkIVc+/hQ5sdBLqhtjCVIMDSs9tjVXwMFodg="; + revert = true; + }) + ]; + nativeBuildInputs = [ meson ninja From 7733617873e6358d032870eeda0f4e8abf423e3e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Aug 2022 22:41:05 +0200 Subject: [PATCH 173/505] =?UTF-8?q?gnome.file-roller:=203.42.0=20=E2=86=92?= =?UTF-8?q?=2043.alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/file-roller/-/compare/3.42.0...43.alpha Changelog-Reviewed-By: Jan Tojnar --- .../gnome/apps/file-roller/default.nix | 38 +++---------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index abd417d2c230..adbfbc9efe99 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -13,48 +13,26 @@ , python3 , wrapGAppsHook , cpio -, file , glib , gnome , gtk3 , libhandy , json-glib , libarchive -, libnotify +, libportal-gtk3 , nautilus , unzip }: stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.42.0"; + version = "43.alpha"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HEOObVPsEP9PLrWyLXu/KKfCqElXq2SnUcHN88UjAsc="; + url = "mirror://gnome/sources/file-roller/${lib.versions.major version}/file-roller-${version}.tar.xz"; + sha256 = "OiUnSWeaejmX+r+gylEzUTuPb8vdH7lG8qSP99j8EPE="; }; - patches = [ - # Fix build with Nautilus 43. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/file-roller/-/commit/361219cd9e20530789417eeefd03c7cc4037b7d7.patch"; - sha256 = "eP3BAa1SUS+EaV9UrlKnpoqJ78MhID863HPqsfFSTgM="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/file-roller/-/commit/d8461bbad8226d101beb02c2695a2f66cea675df.patch"; - sha256 = "OKEZGijiIYDMiyuLqyHHrnTw88p+0hwkt6liufv3T74="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/file-roller/-/commit/5cfaa00f04130084e42548abb2226c1c2e378e48.patch"; - sha256 = "/3ceT7fv/L9tV5kQwmiBBDL2AOjhjoPUT3AgVLk/q98="; - excludes = [ - "default.nix" - ]; - }) - ]; - - LANG = "en_US.UTF-8"; # postinstall.py - nativeBuildInputs = [ desktop-file-utils gettext @@ -70,22 +48,16 @@ stdenv.mkDerivation rec { buildInputs = [ cpio - file glib - gnome.adwaita-icon-theme gtk3 libhandy json-glib libarchive - libnotify + libportal-gtk3 nautilus ]; - PKG_CONFIG_LIBNAUTILUS_EXTENSION_4_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4"; - postPatch = '' - chmod +x postinstall.py # patchShebangs requires executable file - patchShebangs postinstall.py patchShebangs data/set-mime-type-entry.py ''; From 262f16221330677bab6cb58a14b70c1cb924078d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 29 Aug 2022 14:03:13 +0000 Subject: [PATCH 174/505] =?UTF-8?q?at-spi2-atk:=202.45.90=20=E2=86=92=202.?= =?UTF-8?q?45.91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/2.45.90...2.45.91 Changelog-Reviewed-By: Jan Tojnar --- 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 30b838a67601..8f034178d954 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.45.90"; + version = "2.45.91"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6QUK08JJN1SDlrI3fy/NuTIc4tr/rTXnVU6PathQqw0="; + sha256 = "OGDTCSMCaBeGdcNdQyucuoroP0f0UpxEvZYNtDRByDw="; }; nativeBuildInputs = [ From 4934030d88a608e8e61e2203a6130f5a7a92e6f6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 29 Aug 2022 14:04:35 +0000 Subject: [PATCH 175/505] =?UTF-8?q?glibmm=5F2=5F68:=202.72.1=20=E2=86=92?= =?UTF-8?q?=202.73.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glibmm/-/compare/2.72.1...2.73.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glibmm/2.68.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index f1f3df86349e..82aab278e770 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.72.1"; + version = "2.73.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KnZJooq13FOsTau3bJ9hWZ+8Yokjq2p910v2ddkVXNg="; + sha256 = "sha256-0JhwnDLozHqOIzFT3FVbiNUkb55QtychTBVFp2i3WiU="; }; nativeBuildInputs = [ From 86e762b36293fd795bd6ffc02af75a8a43045b62 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 29 Aug 2022 14:05:25 +0000 Subject: [PATCH 176/505] =?UTF-8?q?gnome.gnome-bluetooth:=2042.2=20?= =?UTF-8?q?=E2=86=92=2042.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/42.2...42.3 Changelog-Reviewed-By: Jan Tojnar --- 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 8b6eb8c4f1bb..91ff504fa819 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.2"; + version = "42.3"; # 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 = "jOjs+rKCctsYMKY/CPnMtTBHNNG+Lb/OeV/kAp5inww="; + sha256 = "w3oqB/d9SBayYebCCGoFbtl2fDiB36vIJvT4L24aowI="; }; nativeBuildInputs = [ From 663562821e8c32f1045a7e4b87d5456a42471377 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 29 Aug 2022 14:06:10 +0000 Subject: [PATCH 177/505] =?UTF-8?q?gnome.gnome-maps:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v43.alpha...v43.beta Changelog-Reviewed-By: Jan Tojnar --- .../gnome/apps/gnome-maps/default.nix | 59 ++++++++++++------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index e3c8f35f7e3e..982f43193ad5 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -1,37 +1,53 @@ { stdenv , lib , fetchurl +, fetchpatch , meson , ninja , gettext , python3 , pkg-config , gnome -, gtk3 +, glib +, gtk4 , gobject-introspection , gdk-pixbuf -, librest +, librest_1_0 , libgweather , geoclue2 -, wrapGAppsHook -, libchamplain +, wrapGAppsHook4 +, desktop-file-utils +, libshumate , libsecret -, libsoup +, libsoup_3 , gsettings-desktop-schemas , gjs -, libhandy -, geocode-glib +, libadwaita +, geocode-glib_2 }: stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wFE9g8trmJ5HFZz4nHLnsIgejanl6kfI1+c2LY6uE5A="; + sha256 = "sha256-19Nu9/GjmJ/8f2nRZ7Ya1V6FINxkjRWKP0Ya1JV97Xw="; }; + patches = [ + # Fix build without GTK 3. + # https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/248 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/248.patch"; + sha256 = "TxPzDYiqvFkXeIbtIXabb8XOajlMdShaWzQGsPjweGw="; + postFetch = '' + # Make the patch apply. + substituteInPlace "$out" --replace "version: '43.0'," "version: '43.beta'," + ''; + }) + ]; + doCheck = true; nativeBuildInputs = [ @@ -39,30 +55,31 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 - wrapGAppsHook + wrapGAppsHook4 + gobject-introspection + # For post install script + desktop-file-utils + glib + gtk4 ]; buildInputs = [ gdk-pixbuf + glib geoclue2 - geocode-glib + geocode-glib_2 gjs - gobject-introspection gsettings-desktop-schemas - gtk3 - libchamplain + gtk4 + libshumate libgweather - libhandy - librest + libadwaita + librest_1_0 libsecret - libsoup + libsoup_3 ]; postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - # The .service file isn't wrapped with the correct environment # so misses GIR files when started. By re-pointing from the gjs # entry point to the wrapped binary we get back to a wrapped From 30f68bbe97c140430dd99433611af9916a28167c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 29 Aug 2022 14:10:17 +0000 Subject: [PATCH 178/505] =?UTF-8?q?orca:=2043.alpha=20=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_43_ALPHA...ORCA_43_BETA Changelog-Reviewed-By: Jan Tojnar --- 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 9b3ed3990bad..078a0c45eac8 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "43.alpha"; + version = "43.beta"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6dZU+qBlHLm2UAvEsxj52X/Z8zvZ2Ut/JKGyeZarnkU="; + sha256 = "7Mks/WaZ7nvaS1+SVmrzzx1UJjAO9K/nG/yMMa6LbPU="; }; patches = [ From aa3aefaa066b3f565c93b967072d8940be6c4dc3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 29 Aug 2022 22:17:10 +0200 Subject: [PATCH 179/505] gnome.gnome-bluetooth: Use wrapGAppsHook4 This was forgotten in 42.beta update. --- 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 91ff504fa819..ba6a7d05c4b6 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -14,7 +14,7 @@ , upower , itstool , libxml2 -, wrapGAppsHook +, wrapGAppsHook4 , libnotify , gsound , gobject-introspection @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { itstool pkg-config libxml2 - wrapGAppsHook + wrapGAppsHook4 gobject-introspection gtk-doc docbook-xsl-nons From c030134f411605acca252796d7caf3c50dec14b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 31 Aug 2022 16:50:41 +0000 Subject: [PATCH 180/505] =?UTF-8?q?libgepub:=200.6.0=20=E2=86=92=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgepub/-/compare/0.6.0...0.7.0 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/libgepub/default.nix | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index 7ae7bff50efa..1c5d43af12e0 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,19 +1,43 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome -, webkitgtk, libsoup, libxml2, libarchive }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, glib +, gobject-introspection +, gnome +, webkitgtk_4_1 +, libsoup_3 +, libxml2 +, libarchive +}: stdenv.mkDerivation rec { pname = "libgepub"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7"; + sha256 = "IQpMeJXC6E8BpWglArpej6PqiWrzFw+yWS/OHdpW4C4="; }; - doCheck = true; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; - buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; + buildInputs = [ + glib + webkitgtk_4_1 + libsoup_3 + libxml2 + libarchive + ]; + + doCheck = true; passthru = { updateScript = gnome.updateScript { From fb7e3ad56c63a287077d54b00f1c772f22299f3c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 31 Aug 2022 20:01:27 +0200 Subject: [PATCH 181/505] video-trimmer: Drop broken update script --- pkgs/applications/video/video-trimmer/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index dbeb85821deb..230654d99579 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , fetchpatch , rustPlatform -, gnome , pkg-config , meson , wrapGAppsHook4 From 0d08ea5a3b60cbab8f6abad11bae7cc624e9b602 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 12:36:26 +0200 Subject: [PATCH 182/505] gnome.gdm: enable debug info --- pkgs/desktops/gnome/core/gdm/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index cf435b1e9ea3..4eba9e959eeb 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -144,6 +144,7 @@ stdenv.mkDerivation rec { rsync --archive "${DESTDIR}/etc" "$out" rm --recursive "${DESTDIR}/etc" for o in $outputs; do + if [[ "$o" = "debug" ]]; then continue; fi rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" rm --recursive "${DESTDIR}/''${!o}" done @@ -162,6 +163,8 @@ stdenv.mkDerivation rec { # location using DESTDIR and then move it to proper one in postInstall. DESTDIR = "${placeholder "out"}/dest"; + separateDebugInfo = true; + passthru = { updateScript = gnome.updateScript { packageName = "gdm"; From 07a952d06ad19d721da706f0873faa51f2d98bbf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 12:36:36 +0200 Subject: [PATCH 183/505] gnome.gnome-session: enable debug info --- pkgs/desktops/gnome/core/gnome-session/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 43bf56eb1fc8..e595ac8481b4 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -117,6 +117,8 @@ stdenv.mkDerivation rec { --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" ''; + separateDebugInfo = true; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-session"; From 14302c1f17e7a3d594f25cfb5106d67b4c8e4e56 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 12:36:52 +0200 Subject: [PATCH 184/505] gnome.mutter: enable debug info --- pkgs/desktops/gnome/core/mutter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 696d26558dbf..a833d5dc3e2e 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -143,6 +143,8 @@ let self = stdenv.mkDerivation rec { # Install udev files into our own tree. PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + separateDebugInfo = true; + passthru = { libdir = "${self}/lib/mutter-11"; From 09bdea10a4ac7203e6ba18b8a9f4378d6ea0a27d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 12:36:44 +0200 Subject: [PATCH 185/505] gnome.gnome-shell: enable debug info --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 34ca6b90190f..8c3f65f749e7 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -202,6 +202,8 @@ stdenv.mkDerivation rec { done ''; + separateDebugInfo = true; + passthru = { mozillaPlugin = "/lib/mozilla/plugins"; updateScript = gnome.updateScript { From 05d6af6dd8dcc9d8cbf238c2aae452235bd13c3f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 10:35:45 +0000 Subject: [PATCH 186/505] =?UTF-8?q?epiphany:=2043.beta=20=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 c7dec1398944..0737ea10c993 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TaAx7RnMtlmcrLe2mgPb+0pm7uyN2a0iR/p15qBrO34="; + sha256 = "eRA5L7PKsUU1YuASRAhjoiIRTetOSJxM4qwWcLHah8g="; }; patches = lib.optionals withPantheon [ From 2c179e6bddbb03ae4d7dc7d792e9a7a697e2932e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 10:35:47 +0000 Subject: [PATCH 187/505] =?UTF-8?q?evolution-ews:=203.45.2=20=E2=86=92=203?= =?UTF-8?q?.45.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.45.2...3.45.3 Changelog-Reviewed-By: Jan Tojnar --- .../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 537d90dc83df..502b77b971f9 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.45.2"; + version = "3.45.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "trqNVI3KpCqYMOnqGNX6lNs1ZBPxZQv9btNnYKGG4o8="; + sha256 = "YAykQOupPvfqKID4mFhzxZgKSE7VKgVuNr09mEU+QBc="; }; nativeBuildInputs = [ From c81b6e58ce6300877e64f336c199f672f78c9061 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 10:35:59 +0000 Subject: [PATCH 188/505] =?UTF-8?q?evolution:=203.45.2=20=E2=86=92=203.45.?= =?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.45.2...3.45.3 Changelog-Reviewed-By: Jan Tojnar Co-Authored-By: Bobby Rong --- .../networking/mailreaders/evolution/evolution/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 5a7295c7bb0d..eebd5ed50e3d 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -22,7 +22,6 @@ , shared-mime-info , libical , db -, gcr_4 , sqlite , gnome , gnome-desktop @@ -45,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.45.2"; + version = "3.45.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QjAM2fyIpmwra+8CHoqXaQvAOuvV+P4s9U4qyBys78g="; + sha256 = "JjFyDi/X1iSRo4SYIes4VGTWf71aWB7T6CqDeWhRjuA="; }; nativeBuildInputs = [ @@ -67,7 +66,6 @@ stdenv.mkDerivation rec { bogofilter db evolution-data-server - gcr_4 gdk-pixbuf glib glib-networking From 6a0555be7b77f8e4ee45c6321e7695e7df4c71dc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 10:36:02 +0000 Subject: [PATCH 189/505] =?UTF-8?q?evolution-data-server:=203.45.2=20?= =?UTF-8?q?=E2=86=92=203.45.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.45.2...3.45.3 Changelog-Reviewed-By: Jan Tojnar Co-Authored-By: Bobby Rong --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 76dc7b79826b..a21a4bbcf2f7 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -18,7 +18,6 @@ , sqlite , tzdata , libcanberra-gtk3 -, gcr_4 , p11-kit , db , nspr @@ -51,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.45.2"; + version = "3.45.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bBMkIoUAYzvgBz/67Z4ZNWFr8mghFbJVcc6aBJw6s6k="; + sha256 = "6uANOdV01l0EnJat8e4wMIeLLzMKZxNqstFVfM5KT/4="; }; patches = [ @@ -89,7 +88,6 @@ stdenv.mkDerivation rec { glib libsoup_3 gnome-online-accounts - gcr_4 p11-kit libgweather libaccounts-glib From fab4cc66bd0a80bb1dfaf88d48d28352a9ae95d4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 10:36:08 +0000 Subject: [PATCH 190/505] =?UTF-8?q?glib-networking:=202.74.beta=20?= =?UTF-8?q?=E2=86=92=202.74.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib-networking/-/compare/2.74.beta...2.74.rc Changelog-Reviewed-By: Jan Tojnar --- .../libraries/glib-networking/default.nix | 14 ++++---------- .../glib-networking/installed-tests-path.patch | 12 +++++++----- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 749bd14810e1..9b913289c01b 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , meson @@ -8,7 +9,6 @@ , glib , gettext , makeWrapper -, python3 , gnutls , p11-kit , libproxy @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.74.beta"; + version = "2.74.rc"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dI18G79OzOsP5yS5QUvSYdJ1KuU0PV+0e0MpYZQafAg="; + sha256 = "APLko2Hr6bEdrIVUYcot4OLEkMQYxwSZTYkaN5t4dWw="; }; patches = [ @@ -36,18 +36,12 @@ stdenv.mkDerivation rec { ./installed-tests-path.patch ]; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - nativeBuildInputs = [ meson ninja pkg-config gettext makeWrapper - python3 # for install_script ]; buildInputs = [ diff --git a/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/pkgs/development/libraries/glib-networking/installed-tests-path.patch index 942ca053dd4f..549307cca39d 100644 --- a/pkgs/development/libraries/glib-networking/installed-tests-path.patch +++ b/pkgs/development/libraries/glib-networking/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 4d91677..aaaeb2b 100644 +index 01e18a9..5dbb2fc 100644 --- a/meson.build +++ b/meson.build -@@ -12,8 +12,8 @@ +@@ -12,8 +12,8 @@ libdir = join_paths(prefix, get_option('libdir')) libexecdir = join_paths(prefix, get_option('libexecdir')) localedir = join_paths(prefix, get_option('localedir')) @@ -14,12 +14,14 @@ index 4d91677..aaaeb2b 100644 cc = meson.get_compiler('c') host_system = host_machine.system() diff --git a/meson_options.txt b/meson_options.txt -index 3a525dd..fc86302 100644 +index c566ccd..80f7c33 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -3,4 +3,5 @@ +@@ -10,6 +10,7 @@ option('environment_proxy', type: 'feature', value: 'auto', description: 'suppor option('libproxy', type: 'feature', value: 'auto', description: 'support for libproxy proxy configration') option('gnome_proxy', type: 'feature', value: 'auto', description: 'support for GNOME desktop proxy configuration') option('installed_tests', type: 'boolean', value: false, description: 'enable installed tests') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') - option('static_modules', type: 'boolean', value: false, description: 'build static modules') + option('debug_logs', type: 'boolean', value: false, description: 'enable debug log messages (slow)') + + # Deprecated, use -Ddefault_library=static instead. From 6c2263fef67a26c452d5181f15a71929d4aafa78 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 10:36:28 +0000 Subject: [PATCH 191/505] =?UTF-8?q?gnome.gnome-chess:=2042.1=20=E2=86=92?= =?UTF-8?q?=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-chess/-/compare/42.1...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 8716b6858cd3..51f5f9da3a70 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "42.1"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZikL9yhky8bufM6Mn0DegSTo5gl712hi8teqsMS9sCw="; + sha256 = "Z35PUU75rIjDnNdJQWOqBpdCYEuCZexGlxBwdhue5Yw="; }; nativeBuildInputs = [ From 8b1c3934ee3505e3f78a4a5fdca37eff543ba4cd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 13:35:25 +0200 Subject: [PATCH 192/505] gnome.gnome-software: use wrapGAppsHook4 It was ported to GTK 4 in 42.beta. --- 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 ed2f5bb6133e..95afefee2dc9 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -7,7 +7,7 @@ , ninja , gettext , gnome -, wrapGAppsHook +, wrapGAppsHook4 , packagekit , ostree , glib @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ninja pkg-config gettext - wrapGAppsHook + wrapGAppsHook4 libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 From cf2fa7b7b0df121f2af6c9b001d7705ba923701d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 10:39:32 +0000 Subject: [PATCH 193/505] =?UTF-8?q?gnome.gnome-software:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/43.beta...43.rc Testing the video screenshots implemented in https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/1451 wget https://gitlab.gnome.org/GNOME/gnome-software/uploads/0dc8042e43b346e80c70f26d27bc0330/test-typing-booster-test.appdata.xml gnome-software --show-metainfo test-typing-booster-test.appdata.xml requires - gst-plugins-base: “GStreamer-Play GstPlay: 'playbin' element not found, please check your setup” - gst-plugins-good: “GStreamer-Play GstPlay: scaletempo element not available. Audio pitch will not be preserved during trick modes” but it crashes for me in libdrm. Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-software/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 95afefee2dc9..fb7735a30390 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -36,6 +36,7 @@ , gtk-doc , desktop-file-utils , libsysprof-capture +, gst_all_1 }: let @@ -44,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ITO0nLxjT+s5cC/WGz+5fziQwYHvyEYmLe2FOh2O654="; + sha256 = "of6JJ7H/c6JXJTbYPCEdPrm/WP0RlSIu7LHGQuaVmzg="; }; patches = [ @@ -93,6 +94,9 @@ stdenv.mkDerivation rec { libxmlb malcontent libsysprof-capture + # For video screenshots + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ] ++ lib.optionals withFwupd [ fwupd ]; From d867631c5d479d2e278e3bdce2c4b24338caf666 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Sep 2022 10:41:00 +0000 Subject: [PATCH 194/505] =?UTF-8?q?libshumate:=201.0.0.alpha.1=20=E2=86=92?= =?UTF-8?q?=201.0.0.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.0.0.alpha.1...1.0.0.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libshumate/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index 7443ec4c502d..2c0b37a5122b 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -10,7 +10,7 @@ , glib , cairo , sqlite -, libsoup +, libsoup_3 , gtk4 , xvfb-run , gnome @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.0.alpha.1"; + version = "1.0.0.beta"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "4kCXFUJRglh1aIBk03MNUV8jfx0mJzIFCUDM4g9tzlg="; + sha256 = "Rnsxu4Vu4yzx3U5fdIUYaeh16cp7svoA0MSUX3etsyc="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { glib cairo sqlite - libsoup + libsoup_3 gtk4 ]; From 409c00e399910da1868b75bc3f07b595865a32d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Sep 2022 00:13:44 +0000 Subject: [PATCH 195/505] =?UTF-8?q?gnome.gnome-calculator:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/43.alpha...43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index f4fd7918c14e..4db7a229da70 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -16,7 +16,7 @@ , gnome , mpfr , gmp -, libsoup +, libsoup_3 , libmpc , libadwaita , gsettings-desktop-schemas @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "43.alpha"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "SUAYyg8lJQ55pbI1rUx+Pq88RzgV5qGi1tSqJW1F6LE="; + sha256 = "byc20DrpQXONb869vdSm8/7Sgo1A9gGVnCmHNoYAUoY="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { gmp libgee gsettings-desktop-schemas - libsoup + libsoup_3 libmpc libadwaita ]; From 337d27b6adae638242662ce79687f16cd7122226 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Sep 2022 00:15:37 +0000 Subject: [PATCH 196/505] =?UTF-8?q?libsoup=5F3:=203.1.3=20=E2=86=92=203.1.?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsoup/-/compare/3.1.3...3.1.4 Changelog-Reviewed-By: Jan Tojnar --- 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 f6d27ba8a765..cdbfee9180bc 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.1.3"; + version = "3.1.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2KqVN6Fk6m+72ohY8ozGPYgPxEGMm+7T3mJe2XHrWac="; + sha256 = "sha256-BBWZP8mXRrsPypVJAEqCgICxuTYhNUDyl8KQBZVwtVQ="; }; nativeBuildInputs = [ From e6e5d426ca7f69cadfc86df62b8cae0609705860 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:49:24 +0000 Subject: [PATCH 197/505] =?UTF-8?q?baobab:=2043.beta=20=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 9ef224016b37..28241908dfe5 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 = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "l4+ppXf1jSrzncgQShxoyfRvoUVTzy8ex4c20H1ZOVw="; + sha256 = "eCDZ6lMmEKZyEbCaEirf4HUyAEzQ2DbrStMaCdH+hlY="; }; nativeBuildInputs = [ From e3e7cb1c9b65802f88184bf634ca31a141f8edaa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:51:05 +0000 Subject: [PATCH 198/505] =?UTF-8?q?gnome.eog:=2043.beta=20=E2=86=92=2043.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/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 842fb6649d31..e3f23cdb7bfc 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 = "43.beta"; + version = "43.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Vef6Mz+Mk1yuc/7NWK6Kg2bO+eSTO2WheoiS4pdvgto="; + sha256 = "sha256-CWMSOK7h+7FnIsuD+2pEg3COuqEaA633p3vXnYHVK1o="; }; patches = [ From e6d4c3a4b774dfab374a167623cbbe7ad8d9f9d6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:51:37 +0000 Subject: [PATCH 199/505] =?UTF-8?q?gnome.devhelp:=2043.beta=20=E2=86=92=20?= =?UTF-8?q?43.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/devhelp/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- .../desktops/gnome/devtools/devhelp/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index 2542ec1c1e6b..61be465c7304 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -8,9 +8,7 @@ , gtk3 , wrapGAppsHook , glib -, appstream-glib , gobject-introspection -, python3 , gi-docgen , webkitgtk_4_1 , gettext @@ -21,13 +19,13 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "43.beta"; + version = "43.rc"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cVgG50RPktYW2xuI8Qq3zy9sFNrQDXhBqtz9x3ZJmTE="; + sha256 = "6RirnKpTBwZnxquzkgT6CJxOpVsnjL9lQWGptoykmQ0="; }; nativeBuildInputs = [ @@ -37,10 +35,11 @@ stdenv.mkDerivation rec { gettext itstool wrapGAppsHook - appstream-glib gobject-introspection - python3 gi-docgen + # post install script + glib + gtk3 ]; buildInputs = [ @@ -57,12 +56,6 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - # patchShebangs requires executable file - chmod +x build-aux/meson/meson_post_install.py - patchShebangs build-aux/meson/meson_post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # Fix pages being blank From 957711dbf7a48b6b58f272ae7a31e61afdd8a382 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:53:08 +0000 Subject: [PATCH 200/505] =?UTF-8?q?gnome.gnome-characters:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 ef23f3ade84a..3b3356280b19 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8ftBsNzo9vqN2LCgIygvF7QB4CmlAAbxVBhYzttjeDQ="; + sha256 = "kGbkD+29l6cF1lt+psPCW4+w6Y6mndI+y13RLjGmCj8="; }; patches = [ From 38423dd574adbe6544bddfa4888f03cba61ce328 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:53:11 +0000 Subject: [PATCH 201/505] =?UTF-8?q?gnome.gnome-calendar:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 fb577344b1d4..676f33f2cb29 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 = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "s5WvmLCWCFt3qTo/fcoXIROW/04gkWdhX84bIWbUb+Q="; + sha256 = "hsV4YnGDy+ewcRq9+BbwhPCuUPxjieiazvQAaqUcv+A="; }; nativeBuildInputs = [ From 0cbe3f6626f7a13faf6fffb00519178e1dae3611 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:53:30 +0000 Subject: [PATCH 202/505] =?UTF-8?q?gnome.gnome-font-viewer:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.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/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-font-viewer/default.nix | 6 ++++-- 1 file changed, 4 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 0e08abad528c..fe20a43e424b 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -10,6 +10,7 @@ , libxml2 , gnome-desktop , libadwaita +, fribidi , wrapGAppsHook4 , gnome , harfbuzz @@ -17,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "YT3kTZdcJ7yrecZEMMvBBumHMhd03ZaZppllGFckjck="; + sha256 = "Nm/z9WuqFwZWd+j4EnmEoLBrQYNRXupzO1km8cPauDE="; }; doCheck = true; @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { gnome-desktop harfbuzz libadwaita + fribidi ]; # Do not run meson-postinstall.sh From f3bc9f0276e0b0e50055d8f0500cbf3f46f77970 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:53:33 +0000 Subject: [PATCH 203/505] =?UTF-8?q?gnome.gnome-control-center:=2043.beta?= =?UTF-8?q?=20=E2=86=92=2043.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/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 363600a37525..2306f44b4fda 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 = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-cfmrzgWDyCKTLWvyxP9KPDxA3RjUMgUAPoMf7s62dQs="; + sha256 = "sha256-2hUuBo5wo2Q6vVoqCMsDNCC5TIU4k44Ddvsf5uKcvnw="; }; patches = [ From baf2974a64ad40ce24bc035ff75e88d87e118f1d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:53:39 +0000 Subject: [PATCH 204/505] =?UTF-8?q?gnome.gnome-disk-utility:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.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/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 f9d2c810c8e8..f9f889418209 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 = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PcOLsNyRMpHPKebKkEmtQ2Q8dxJhvvpXm7AHPOZfYtA="; + sha256 = "sha256-XNFaSv2cOtOEJ/1CJLmDm+G7k6/U8nnUqxaecRc82es="; }; nativeBuildInputs = [ From 5f0ebbd313d7890104a11ba1e77f344a029dd47e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:53:44 +0000 Subject: [PATCH 205/505] =?UTF-8?q?gnome.gnome-initial-setup:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.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/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 0833964b880b..a5e88c7df4e2 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1TiUryxad8/IMfeKK7jaTr34VL+0NYviWXDmZ7eIXro="; + sha256 = "lSzmwA2vcj2DLOt5WO3lnejU/eHi/QemfkB2NLvquyQ="; }; patches = [ From b9e612311bb879ad47f3e5c51c63c3fe412cda95 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:54:45 +0000 Subject: [PATCH 206/505] =?UTF-8?q?gnome.gnome-remote-desktop:=2043.beta?= =?UTF-8?q?=20=E2=86=92=2043.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/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index ad0f4f47171f..a9309af40ac6 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-th1u0ih9pV/Om1meTCsNBvuVEsvmkSYxu6cbfViVq+c="; + hash = "sha256-dLT4QCC3pgMu3Clh3691sqHVHYE/eW1zSbOtMg+78I0="; }; nativeBuildInputs = [ @@ -81,11 +81,9 @@ stdenv.mkDerivation rec { 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 + tests/run-vnc-tests.py substituteInPlace tests/vnc-test-runner.sh \ --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" From 818cf570cb586702ae49ec6b8cf122382f9be3de Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:55:06 +0000 Subject: [PATCH 207/505] =?UTF-8?q?gnome.gnome-maps:=2043.beta=20=E2=86=92?= =?UTF-8?q?=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/43.beta...43.rc gnome.gnome-maps: 43.beta → 43.rc https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v43.beta...v43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 982f43193ad5..e2c77e73ac07 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-19Nu9/GjmJ/8f2nRZ7Ya1V6FINxkjRWKP0Ya1JV97Xw="; + sha256 = "sha256-NBqS8OTo+lOaOggrdYXYA/4Od7byiF7ztq9zZxKSQ5k="; }; patches = [ @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/248 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/248.patch"; - sha256 = "TxPzDYiqvFkXeIbtIXabb8XOajlMdShaWzQGsPjweGw="; + sha256 = "koVpvz021b+rvauIc3kvEBdTttRSuYiPvDH/dVbs5pc="; postFetch = '' # Make the patch apply. - substituteInPlace "$out" --replace "version: '43.0'," "version: '43.beta'," + substituteInPlace "$out" --replace "version: '43.0'," "version: '43.rc'," ''; }) ]; From 0e7ae2acb6c454f18f3e538fb4b85aee76b03395 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:55:44 +0000 Subject: [PATCH 208/505] =?UTF-8?q?gnome.mutter:=2043.beta=20=E2=86=92=204?= =?UTF-8?q?3.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/mutter/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index a833d5dc3e2e..94c2cf48511e 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -8,6 +8,8 @@ , gettext , gobject-introspection , cairo +, colord +, lcms2 , pango , json-glib , libstartup_notification @@ -47,13 +49,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "43.beta"; + version = "43.rc"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "/nE+P+k+gHkzw8Xy3stscYtq3C1wjV8951+o7mnbjGg="; + sha256 = "ILLYyWWthlqr7xIJr8cHnrxQsotBuMPISW8fSaTGRQA="; }; patches = [ @@ -117,6 +119,8 @@ let self = stdenv.mkDerivation rec { libxkbcommon libxkbfile libXdamage + colord + lcms2 pango pipewire sysprof # for D-Bus interfaces From 5153981b72fefd0ef8f58c309c85c7e2419447bd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:55:26 +0000 Subject: [PATCH 209/505] =?UTF-8?q?gnome.gnome-shell:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 8c3f65f749e7..031a9823cdd5 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 = "43.beta"; + version = "43.rc"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "4Ri5bdn1sL0UVOSneXgPPVfONUD6vqmhaBonrpzelME="; + sha256 = "F/d0xxClzXLD565Si5h2VLoRQd70TnNNuEIWHoWMhhU="; }; patches = [ From 66e5a06ca9719f41fa62636b574e2ad1ef5eeef6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:55:29 +0000 Subject: [PATCH 210/505] =?UTF-8?q?gnome.gnome-shell-extensions:=2043.beta?= =?UTF-8?q?=20=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 73d60ad30815..0f9473263384 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 = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "3Z6QQONEtrkkgAvmxBG0OzbMy1HDHxLxTyPhoHPfWrU="; + sha256 = "nOCb3uM+uk1cpbaNywbA+mOUYIaGf5sn67R80di8VyE="; }; patches = [ From 197eb26e9d422b24a4692c602d8840771b798c61 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:55:35 +0000 Subject: [PATCH 211/505] =?UTF-8?q?gnome.gnome-weather:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 ef0e500b5a10..c5a7df8f6839 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 = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+dPEATKODdZBVvd3zYdqc+eu5RCd22NnPQMIGqr4B+E="; + sha256 = "8VyMn2jAYXTx/n0zIjCtw6aGvxe8l3cqlgkphjfSKzM="; }; nativeBuildInputs = [ From 9de61e3435fb9bcdce8bb0d57b079a1b8393049d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:55:44 +0000 Subject: [PATCH 212/505] =?UTF-8?q?gnome.nautilus:=2043.beta.1=20=E2=86=92?= =?UTF-8?q?=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/43.beta.1...43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/nautilus/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 3e9b88883b42..1bd4f34c8941 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gtk-doc +, gi-docgen , docbook-xsl-nons , gettext , libxml2 @@ -37,13 +37,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "43.beta.1"; + version = "43.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "vcNohRVfwJVzkkCy6VEAMvXZWCP5NL0bkpcIIQdWg1E="; + sha256 = "9w/Rm7J0XBr7lieVsxVOEKivbgWaEJnf9eoHoKNgdfc="; }; patches = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - gtk-doc + gi-docgen docbook-xsl-nons wrapGAppsHook4 ]; @@ -110,6 +110,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 f2334f046e5629b6759421a4d482fc88848240b8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:56:02 +0000 Subject: [PATCH 213/505] =?UTF-8?q?gnome-console:=2043.beta=20=E2=86=92=20?= =?UTF-8?q?43.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/console/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- .../applications/terminal-emulators/gnome-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index adb4bc577100..98a2c44a26bc 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "t4TcSBVe86AkzYij9/650JO9mcZfKpcVo3+fu7Wq8VY="; + sha256 = "DCLFqoO+3qxYxYGCBBSrBPuzeOUmKzDKT0+Qqg4SLiw="; }; buildInputs = [ From 554584ccaed4cca8253b33841d8871c12c0f0cdd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:56:13 +0000 Subject: [PATCH 214/505] =?UTF-8?q?gobject-introspection:=201.73.0=20?= =?UTF-8?q?=E2=86=92=201.73.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gobject-introspection/-/compare/1.73.0...1.73.1 Changelog-Reviewed-By: Jan Tojnar --- 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 e301c49050b4..9634dd3db23c 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.73.0"; + version = "1.73.1"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - sha256 = "1kUhjOFFEoW4tPCTXjXbweQZ9QzrZDt9ZvWeOPzAh3Y="; + sha256 = "ZNTWuauqb/VFDQglkvMysk/IHRFyzMMNEmIPrcToa74="; }; patches = [ From cf3aa1daa1a83802f740b72bc85593e41572767c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:56:35 +0000 Subject: [PATCH 215/505] =?UTF-8?q?gupnp=5F1=5F6:=201.5.3=20=E2=86=92=201.?= =?UTF-8?q?5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gupnp/-/compare/gupnp-1.5.3...gupnp-1.5.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gupnp/1.6.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 8aeae4310cf5..35a2d7fdb71d 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -17,29 +16,15 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.5.3"; + version = "1.5.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-dF4/qzOzqhbbNCYxmK/c/9XjWCKjKA277O9210HEhoc="; + sha256 = "sha256-mIMpFXw1ElKuB7qtiq6/EKfLVaZCwi1hOqhbp0wFG3g="; }; - patches = [ - # Do not use deprecated symbols after libsoup update. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/1296d10eda308792d2924f141d72b8b6818878bd.patch"; - sha256 = "mboJQ9I7oV+HXt0atUSLt6FDTCCT22lbuI7OUb0tDLM="; - }) - - # Fix test after libsoup update. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/fba0ca75445189f6554bd66fb3aa4f022b8f69e9.patch"; - sha256 = "6dkpnDqHVvesrzEIYLbHdoB0dfePr0ll8jQxijuu24E="; - }) - ]; - depsBuildBuild = [ pkg-config ]; From cbcf769e8885d6ca971343e2afc07e2aa567c4d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:56:51 +0000 Subject: [PATCH 216/505] =?UTF-8?q?libgnomekbd:=203.28.0=20=E2=86=92=203.2?= =?UTF-8?q?8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgnomekbd/-/compare/3.28.0...3.28.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libgnomekbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index fae319ef894b..251f86b05789 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libgnomekbd"; - version = "3.28.0"; + version = "3.28.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "swV6RD5MJvkf41Lc0RVKVs3VHxz9fLas4wDDzBKGWck="; + sha256 = "ItxZVm1zwAZTUPWpc0DmLsx7CMTfGRg4BLuL4kyP6HA="; }; nativeBuildInputs = [ From a853ca35996f78bc5173b384b7eeacfcacd54c99 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:57:34 +0000 Subject: [PATCH 217/505] =?UTF-8?q?vala:=200.56.2=20=E2=86=92=200.56.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/-/compare/0.56.2...0.56.3 Changelog-Reviewed-By: Jan Tojnar --- 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 43ff938598d5..e0380b04e0f2 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -103,8 +103,8 @@ in rec { }; vala_0_56 = generic { - version = "0.56.2"; - sha256 = "Zslhm7F4Wf0aw6ugpXlwYT44/Soe4wVBF0JgyfuQEkw="; + version = "0.56.3"; + sha256 = "4QZiIb97icsfpzJ6OIhkXLM7YE3jv0WqgRMv0EC2mb8="; }; vala = vala_0_56; From 6beefb2e231847f8278a2f889fbe3bd81fa21ab6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:57:37 +0000 Subject: [PATCH 218/505] =?UTF-8?q?vte:=200.69.92=20=E2=86=92=200.69.99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.69.92...0.69.99 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index d3b16a08a698..aeafff544e93 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.69.92"; + version = "0.69.99"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-LXk9HP/lT1zMFqJCMp1H1P1hcssY7LSdFIeVOEDJ1cQ="; + sha256 = "sha256-6bHBStg856qtExNgTATCNYGDhx5jvKC3RYRBmT0acew="; }; patches = [ From 3732af5716e1a85cade8ea1b46fc8f5a9b70f8a9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Sep 2022 18:57:38 +0000 Subject: [PATCH 219/505] =?UTF-8?q?xdg-desktop-portal-gnome:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.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/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- .../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 8001f8990077..b669a2a41798 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 = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "r5jrRMk0Oldm2EcK9luudNf5v0fL6SqoR7s1ZrmEPE8="; + sha256 = "+b+3mFDgMXAvMA3K0jVzBgUYX3+vIeUE1pUZt1tM6VQ="; }; nativeBuildInputs = [ From 41d0d25025b831d02f9bb5feeed932dac87e3fd2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:03:23 +0000 Subject: [PATCH 220/505] =?UTF-8?q?gcr=5F4:=203.90.0=20=E2=86=92=203.92.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gcr/-/compare/3.90.0...3.92.0 Removes UI libraries, GTK 4 only used for cert viewer tool. Let’s move it to a separate output. Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gcr/4.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix index 0346c20f1211..f452d00b40d4 100644 --- a/pkgs/development/libraries/gcr/4.nix +++ b/pkgs/development/libraries/gcr/4.nix @@ -10,14 +10,13 @@ , glib , libgcrypt , libtasn1 -, gtk3 , gtk4 , pango , libsecret , openssh , systemd , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook4 , vala , gi-docgen , gnome @@ -27,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.90.0"; + version = "3.92.0"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "bin" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5ZB0nsh2A38LDimVDCyyCIEnDAX0fsUmlSCog9iTSE4="; + sha256 = "iWq/jh2w9A6ygHPzZPNqcjhayKv4zRNisQFul3If9Rg="; }; nativeBuildInputs = [ @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { gettext gobject-introspection gi-docgen - wrapGAppsHook + wrapGAppsHook4 vala gi-docgen shared-mime-info @@ -57,12 +56,11 @@ stdenv.mkDerivation rec { libsecret openssh systemd + gtk4 ]; propagatedBuildInputs = [ glib - gtk3 - gtk4 p11-kit ]; From f3876e8e87c64fe83ccf566263109b107b7f6de4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:03:46 +0000 Subject: [PATCH 221/505] =?UTF-8?q?gnome.gnome-bluetooth:=2042.3=20?= =?UTF-8?q?=E2=86=92=2042.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/42.3...42.4 Changelog-Reviewed-By: Jan Tojnar --- 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 ba6a7d05c4b6..9596f6d84cd5 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.3"; + version = "42.4"; # 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 = "w3oqB/d9SBayYebCCGoFbtl2fDiB36vIJvT4L24aowI="; + sha256 = "HW/PHNtsyZI6szSiwLw3osG7qdGN4VPUhO7cBPPAvNw="; }; nativeBuildInputs = [ From 4039ac36bd5f5e5f0addb44f30de428e27cfb2a6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:03:50 +0000 Subject: [PATCH 222/505] =?UTF-8?q?gnome.gnome-boxes:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 18340c3e782a..088eac60769a 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -14,7 +14,6 @@ , gtk3 , libvirt , spice-gtk -, python3 , appstream-glib , spice-protocol , libhandy @@ -52,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "WqNgpIepZCy/qJLNVFlgCXCRLT6FjyCKJDlz0Jev7Ts="; + sha256 = "NVes9/6x1eIEa8HcOnKayAFr3DehaYEOQ8aFEArnxq8="; }; patches = [ @@ -69,16 +68,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib # for appstream-util - desktop-file-utils gettext gobject-introspection itstool meson ninja pkg-config - python3 vala wrapGAppsHook + # For post install script + glib + gtk3 + desktop-file-utils ]; # Required for USB redirection PolicyKit rules file @@ -125,11 +126,6 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}") ''; - postPatch = '' - chmod +x build-aux/post_install.py # patchShebangs requires executable file - patchShebangs build-aux/post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; From d304b2d5e535072eeff6843ec23cd8d57df4e6b7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:03:58 +0000 Subject: [PATCH 223/505] =?UTF-8?q?gnome.gnome-contacts:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 35064cdada94..fb3677f84829 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "MuyrNZ1h0r45fYhSHzuW8IrLm9PkZYt5SIUfVpWSzdU="; + sha256 = "Hoyo2nF429WpIQJVBkokvdwz35WFx1hOExBxTJprjco="; }; propagatedUserEnvPkgs = [ From 34c9814c83e47887eff0ee9372734546cb38d645 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:04:01 +0000 Subject: [PATCH 224/505] =?UTF-8?q?gnome.gnome-backgrounds:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 50f01d1f05ac..cdd911dec266 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rrXUNqeLpet3VB5NmWQmu2DT2OwQ5FGDb4cSE/XzT4M="; + sha256 = "0wjgCLh5FKh2EinEPdhgemRqBewMSXNmOG5cfvUxCG0="; }; patches = [ From dc590d57e7a8cbf03f79e6ef09eaffc23bfe97aa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:04:07 +0000 Subject: [PATCH 225/505] =?UTF-8?q?gnome.gnome-initial-setup:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.rc.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/43.rc...43.rc.1 Changelog-Reviewed-By: Jan Tojnar --- 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 a5e88c7df4e2..6a94ebae33c8 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "43.rc"; + version = "43.rc.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lSzmwA2vcj2DLOt5WO3lnejU/eHi/QemfkB2NLvquyQ="; + sha256 = "St8/CvBkygq0GyiFZzznQRxg8qjJXfoBBGCD/i2Rcrk="; }; patches = [ From c1798b9f83ac570e9577eb8929cf790fc67ac2eb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:04:20 +0000 Subject: [PATCH 226/505] =?UTF-8?q?gnome.gnome-settings-daemon:=2043.beta?= =?UTF-8?q?=20=E2=86=92=2043.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/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 2f1cb91e80bf..abef044258dc 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 = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PDPeNaxpZgo/JQKkv7YS1bR05MIuWw8zoNCB+UbdMcs="; + sha256 = "VQpWZsOf7rvvYO8k6IqH6yJpV/qkMM6cQJBSH8vC9Fc="; }; patches = [ @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do chmod +x $f patchShebangs $f done From e5a1f3f13e95f60b8d6ad6def39350d95bba09ee Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:04:51 +0000 Subject: [PATCH 227/505] =?UTF-8?q?gnome-desktop:=2043.alpha=20=E2=86=92?= =?UTF-8?q?=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/43.alpha...43.rc Changelog-Reviewed-By: Jan Tojnar --- 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 7cf1ca9d326d..ec1caeda98df 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 = "43.alpha"; + version = "43.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3yLHsaINGFC5fP8ayrGofw32CYefS33ZTjUKxqC4gls="; + sha256 = "sha256-KiA9duBPDruj3Re/M0dKwZ/EdotuhPyRdxMu1M7KbO0="; }; patches = lib.optionals stdenv.isLinux [ From 4bc540dff3b03f0029867c68cdfea81c9479e788 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:05:07 +0000 Subject: [PATCH 228/505] =?UTF-8?q?gsettings-desktop-schemas:=2043.alpha?= =?UTF-8?q?=20=E2=86=92=2043.rc.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/compare/43.alpha...43.rc.1 Changelog-Reviewed-By: Jan Tojnar --- .../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 45d7ffd6ed31..104f7c7015e3 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 = "43.alpha"; + version = "43.rc.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JrGCkfh7bPrF7APRrKrCwCNQMr7gNOZgaOcEfe8CICg="; + sha256 = "5mf1XALmovyRtYamDAJ/ws64NR0XpBRo5ENncVB9tws="; }; strictDeps = true; From 9a91313fdb1739f6923584c90039c511fe073323 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:05:45 +0000 Subject: [PATCH 229/505] =?UTF-8?q?libnma:=201.8.40=20=E2=86=92=201.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libnma/-/compare/1.8.40...1.10.0 --- 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 00e68176c107..9af95a12ad41 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "libnma"; - version = "1.8.40"; + version = "1.10.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hwp1+NRkHtDZD4Nq6m/1ESJL3pf/1W1git4um1rLKyI="; + sha256 = "dqFyxVJpcJvxZtGKOry2Fac3GN48KwD0KPi9bkk27p8="; }; patches = [ From f1a67acc99846e888a648e9321699d8c412ccec0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:05:55 +0000 Subject: [PATCH 230/505] =?UTF-8?q?librsvg:=202.55.0=20=E2=86=92=202.55.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now following the new GNOME version policy (no more odd-unstable). https://gitlab.gnome.org/GNOME/librsvg/-/compare/2.55.0...2.55.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/librsvg/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 0d3d5a2a1eb5..1d2954eb74fc 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.55.0"; + version = "2.55.1"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bmJsVk41S82MOEuQ+OTzCzA6+mweDLXMVroUkAxdtzA="; + sha256 = "a69IqdOlb9E7v7ufH3Z1myQLcKH6Ig/SOEdNZqkm+Yw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-tvfdRGyrEkEh6sb69f0ugfzR2bgGdWa05pSyovpXAF8="; + hash = "sha256-nRmOB9Jo+mmB0+wXrQvoII4e0ucV7bNCDeuk6CbcPdk="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; @@ -138,7 +138,6 @@ stdenv.mkDerivation rec { let updateSource = gnome.updateScript { packageName = "librsvg"; - versionPolicy = "odd-unstable"; }; updateLockfile = { From ecb886dff4d9247ae2685e974679ef70a2819c01 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:06:21 +0000 Subject: [PATCH 231/505] =?UTF-8?q?tracker:=203.4.0.beta=20=E2=86=92=203.4?= =?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.4.0.beta...3.4.0.rc Changelog-Reviewed-By: Jan Tojnar --- 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 3b163b310dc4..44996604d6af 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.4.0.beta"; + version = "3.4.0.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "r7evHXAHaELU6Fg691l6qJG9phTqiyjmAwiT/gxSpiE="; + sha256 = "JNLh7Un213v1CJmjZULoYSmTPviY4hG5kWGdNahWM4E="; }; postPatch = '' From d8e3c9ca6a268c6361fad19a0da440e71ffd71bf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 21:06:24 +0000 Subject: [PATCH 232/505] =?UTF-8?q?tracker-miners:=203.4.0.beta=20?= =?UTF-8?q?=E2=86=92=203.4.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.4.0.beta...3.4.0.rc Changelog-Reviewed-By: Jan Tojnar --- .../development/libraries/tracker-miners/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 8daad8df0dce..738ad017a2dc 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , asciidoc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -49,20 +48,13 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.0.beta"; + version = "3.4.0.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "49XkMVzkLwKf6VKIPnCqb4uXLY+qwmGAjDdKSzglLwo="; + sha256 = "SWjC2YHQ7SKtR42DP9tzocejQkiIbFOFrY49azYyxWU="; }; - patches = [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/9e613ceb37ec41fd1cd88c3d539e3ee03e8f6ba6.patch"; - sha256 = "sha256-ht7EfZztyl0st0Sv7H92Q37vwXY4T61GQm9WJ8IxTTg="; - }) - ]; - nativeBuildInputs = [ asciidoc docbook-xsl-nons From a05b4f2b746ca1e406fb33b7fd59bd2c61eb3e62 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 8 Sep 2022 15:21:56 +0200 Subject: [PATCH 233/505] gnome.gpaste: Upgrade for GNOME 43 --- pkgs/desktops/gnome/misc/gpaste/default.nix | 30 ++++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index ba42a8028369..058499bf8245 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -9,6 +9,7 @@ , gobject-introspection , gtk3 , gtk4 +, gcr_4 , libadwaita , meson , mutter @@ -16,6 +17,7 @@ , pango , pkg-config , vala +, desktop-file-utils , wrapGAppsHook }: @@ -32,6 +34,28 @@ stdenv.mkDerivation rec { patches = [ ./fix-paths.patch + + # Fix GNOME 43 compatibility. + (fetchpatch { + url = "https://github.com/Keruspe/GPaste/commit/eece9c374a823234bc20e58bf95bb10ace9590f4.patch"; + sha256 = "+GoiNsge+ki2X3OIoFA+r3K8WLN00nExYj8gDuCSNiA="; + }) + (fetchpatch { + url = "https://github.com/Keruspe/GPaste/commit/614bbe65e7d8f2ddca447daaada86156334bb71a.patch"; + sha256 = "q6fjBTVRx6/5xf5ZhQJpvnwvroLiNxF73P7vTFTmNqI="; + }) + (fetchpatch { + url = "https://github.com/Keruspe/GPaste/commit/971e690a74b4de6b78bdaf1300507a6190ffb474.patch"; + sha256 = "bCLnuLqLgq7BlZN49NFrQjbCJBneVHl1t+WnAAIofkY="; + }) + (fetchpatch { + url = "https://github.com/Keruspe/GPaste/commit/0378cb4a657042ce5321f1d9728cff31e55bede6.patch"; + sha256 = "0Ngr+/fS5/wICR84GEiE0pXEXQ/f/3G59lDivH167m8="; + }) + (fetchpatch { + url = "https://github.com/Keruspe/GPaste/commit/6d29385f8c935b1def28340bc165ca6a7756f29b.patch"; + sha256 = "crkkIrLwogRzr1JfJEt5TPK65Y4zY1H5Gt+s0z3A8Dg="; + }) ]; # TODO: switch to substituteAll with placeholder @@ -52,6 +76,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala + desktop-file-utils wrapGAppsHook ]; @@ -61,6 +86,7 @@ stdenv.mkDerivation rec { glib gtk3 gtk4 + gcr_4 libadwaita mutter pango @@ -72,10 +98,6 @@ stdenv.mkDerivation rec { "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user" ]; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - meta = with lib; { homepage = "https://github.com/Keruspe/GPaste"; description = "Clipboard management system with GNOME 3 integration"; From 8ea60018e341decd7d2dc67172a87c351fc1dd40 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 10 Sep 2022 21:23:25 +0000 Subject: [PATCH 234/505] =?UTF-8?q?libnma:=201.10.0=20=E2=86=92=201.10.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libnma/-/compare/1.10.0...1.10.2 Changelog-Reviewed-By: Jan Tojnar --- 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 9af95a12ad41..5db28c427d1e 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "libnma"; - version = "1.10.0"; + version = "1.10.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dqFyxVJpcJvxZtGKOry2Fac3GN48KwD0KPi9bkk27p8="; + sha256 = "T8PZxAS3sTMD2TlPlpYcUpjXGvqfH6evXk8PboQqCUA="; }; patches = [ From c57078f858bd9df2fbbed1a0908ead7293628759 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Sep 2022 01:18:33 +0200 Subject: [PATCH 235/505] modemmanager: fix and re-enable tests This reverts commit 2c40baad4cf2999b5ace2c87cd8196794cd64d37. --- pkgs/tools/networking/modemmanager/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index bd109834907f..4561661df5a0 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, fetchpatch , glib, udev, libgudev, polkit, ppp, gettext, pkg-config, python3 , libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: @@ -12,6 +13,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-FiVfginu6y3+y43RNwNg1G8QFeyF5vulwcvZ9DcdZes="; }; + patches = [ + # Fix tests with GLib 2.73.2 + # https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/601 + (fetchpatch { + url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/79a5a4eed2189ea87d25cbe00bc824a2572cad66.patch"; + sha256 = "egGXkCzAMyqPjeO6ro23sdTddTDEGJUkV7rH8sSlSGE="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/51a333cd9a6707de7c623fd4c94cb6032477572f.patch"; + sha256 = "1XyJ0GBmpBRwnsKPI4i/EBrF7W08HelL/PMDwmlQWcw="; + }) + ]; + nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; @@ -40,9 +54,7 @@ stdenv.mkDerivation rec { # load libraries from the install path, which doesn't usually exist # when `make check' is run. So to work around that, we run it as an # install check instead, when those paths will have been created. - # Failing with GLib 2.73.2 - # https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/601 - doInstallCheck = false; + doInstallCheck = true; preInstallCheck = '' export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" patchShebangs tools/tests/test-wrapper.sh From 6935bd2779fd7c8cae41a57d7f2418a6c54f9ab2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 12 Sep 2022 22:37:34 +0000 Subject: [PATCH 236/505] =?UTF-8?q?gnome.totem:=2043.beta=20=E2=86=92=2043?= =?UTF-8?q?.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/totem/-/compare/43.beta...43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/totem/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index fa979752ddae..e30fc644a1b6 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "43.beta"; + version = "43.rc"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "qkgMw4JT7Y07M0/qfj550hQ/J6N27dXbZjvIccKGSHA="; + sha256 = "5dj9wbs3Wd92e/n7tUg4iz/CybL0cmyXqbrTXq1Xz8g="; }; patches = [ @@ -110,10 +110,9 @@ stdenv.mkDerivation rec { doCheck = false; postPatch = '' - chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file + chmod +x meson_compile_python.py # patchShebangs requires executable file patchShebangs \ - ./meson_compile_python.py \ - ./meson_post_install.py + ./meson_compile_python.py ''; checkPhase = '' From 96aebe63d4ad6771bf70e8e00be2c36d002e5b06 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 12 Sep 2022 22:38:13 +0000 Subject: [PATCH 237/505] =?UTF-8?q?gtkmm3:=203.24.6=20=E2=86=92=203.24.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtkmm/-/compare/3.24.6...3.24.7 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtkmm/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 7245b9749303..82c5ea6597a5 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.6"; + version = "3.24.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Sz4ULpROFjO7oAiQBgXDQak8/XVaf6KgCwXQQTQfEdY="; + sha256 = "HXo1r5xc7MrLJE7jwt65skVyDYUQrFx+b0tvmUfmeJw="; }; outputs = [ "out" "dev" ]; From 4bd2b7bc8a4ed3152066848c2e4d1072a2caa1a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 15 Sep 2022 11:40:40 +0000 Subject: [PATCH 238/505] =?UTF-8?q?libsoup=5F3:=203.1.4=20=E2=86=92=203.2.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsoup/-/compare/3.1.4...3.2.0 Changelog-Reviewed-By: Jan Tojnar --- 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 cdbfee9180bc..efc960f21793 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.1.4"; + version = "3.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BBWZP8mXRrsPypVJAEqCgICxuTYhNUDyl8KQBZVwtVQ="; + sha256 = "sha256-KDI3BpjKj5+/F0w0W3PYm2BWEQOmJsLfcHJrBwf3m9M="; }; nativeBuildInputs = [ From 13b1638fe169ec62500014416589b75c42817a72 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 15 Sep 2022 16:06:25 +0200 Subject: [PATCH 239/505] =?UTF-8?q?gnome.gnome-terminal:=203.44.1=20?= =?UTF-8?q?=E2=86=92=203.47.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-terminal/-/compare/3.44.1...3.47.0 No longer ships tarballs https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916#note_1530564 Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/gnome-terminal/default.nix | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 14ee8e94337b..d344eec3c64a 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchFromGitLab , fetchpatch , meson , ninja @@ -8,7 +8,7 @@ , python3 , libxml2 , gnome -, dconf +, nix-update-script , nautilus , glib , gtk4 @@ -30,23 +30,22 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.44.1"; + version = "3.47.0"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+28g7h/yMamq7asT1dxuWmTJVXESJISLeQCG6IlZ03s="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-terminal"; + rev = version; + sha256 = "sha256-CriI1DtDBeujaz0HtXCyzoGxnas7NmD6EMQ+gLph3E4="; }; patches = [ - # Fix Nautilus extension in 43. - # https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7911 - (fetchurl { - url = "https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/e0999b42fb4954d3935f1705bea54b99a45734e5.patch"; - sha256 = "2+25xXXiVtIeq/Djo/kvVHaSmYjgGYUqK6OMHU7kPKc="; - }) + # Fix Nautilus extension build. + # https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/17f4ad7909c819f0fe574d723de119dc10ec397f.patch"; - sha256 = "6BIfp9qNecqJHify7qyjzgdfXrs8EvafeXiqHPL54Eg="; + url = "https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/614ea99b16fb09e10341fc6ccf5e115ac3f93caf.patch"; + sha256 = "K7JHPfXywF3QSjSjyUnNZ11/ed+QXHQ47i135QBMIR8="; }) ]; @@ -75,7 +74,6 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas vte libuuid - dconf nautilus # For extension ]; @@ -93,13 +91,14 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-terminal"; + updateScript = nix-update-script { attrPath = "gnome.gnome-terminal"; }; - }; - passthru.tests.test = nixosTests.terminal-emulators.gnome-terminal; + tests = { + test = nixosTests.terminal-emulators.gnome-terminal; + }; + }; meta = with lib; { description = "The GNOME Terminal Emulator"; From 14c9b6a9152451d7c142fc4bc0accb7b5f85443b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:35:25 +0000 Subject: [PATCH 240/505] =?UTF-8?q?epiphany:=2043.rc=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 0737ea10c993..68c86a5c32ea 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "eRA5L7PKsUU1YuASRAhjoiIRTetOSJxM4qwWcLHah8g="; + sha256 = "tm1Jn57nJpbYPPhEElN3GBqVRVSkuzeFtzKTOArAwic="; }; patches = lib.optionals withPantheon [ From c2d261046a0646df490bef09b192553212079eb1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:35:31 +0000 Subject: [PATCH 241/505] =?UTF-8?q?evolution:=203.45.3=20=E2=86=92=203.46.?= =?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.45.3...3.46.0 Changelog-Reviewed-By: Jan Tojnar --- .../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 eebd5ed50e3d..6cac048cfd27 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.45.3"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "JjFyDi/X1iSRo4SYIes4VGTWf71aWB7T6CqDeWhRjuA="; + sha256 = "4J6Sdrxrmr8NrTpOgT7qHQJfT2qvH6w7ew+IiVdCkT8="; }; nativeBuildInputs = [ From 92faab64a39eb7f4049a1ca583a702d8a37beb7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:35:33 +0000 Subject: [PATCH 242/505] =?UTF-8?q?evolution-ews:=203.45.3=20=E2=86=92=203?= =?UTF-8?q?.46.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.45.3...3.46.0 Changelog-Reviewed-By: Jan Tojnar --- .../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 502b77b971f9..f97bbea0023c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.45.3"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "YAykQOupPvfqKID4mFhzxZgKSE7VKgVuNr09mEU+QBc="; + sha256 = "vZe6IFzEW60SmXvuE0ii+R2LAtcUWD159PrheU2sG4A="; }; nativeBuildInputs = [ From 3cd2b7eaf8040fbe8c837e1914507ff879db6420 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:35:54 +0000 Subject: [PATCH 243/505] =?UTF-8?q?glib-networking:=202.74.rc=20=E2=86=92?= =?UTF-8?q?=202.74.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.74.rc...2.74.0 Changelog-Reviewed-By: Jan Tojnar --- 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 9b913289c01b..60d812b16dcd 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.74.rc"; + version = "2.74.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "APLko2Hr6bEdrIVUYcot4OLEkMQYxwSZTYkaN5t4dWw="; + sha256 = "HxharvCUEj+OJdj6VWYbP9cQIBY6AXSts1o3aFzaYTs="; }; patches = [ From 45ad3c4b0b9ebdd189118a2b02bdc4328e17e7cd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:36:40 +0000 Subject: [PATCH 244/505] =?UTF-8?q?gnome.gnome-boxes:=2043.rc=20=E2=86=92?= =?UTF-8?q?=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 088eac60769a..08679b94e2fb 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NVes9/6x1eIEa8HcOnKayAFr3DehaYEOQ8aFEArnxq8="; + sha256 = "V0UFCWQUyCC4COzQ9x4tGakzI1HhKj3YJvdi5DK/ayY="; }; patches = [ From baa1165fe61a1890ff923ed69d3940d5731b44d6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:36:41 +0000 Subject: [PATCH 245/505] =?UTF-8?q?gnome.gnome-calendar:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 676f33f2cb29..1f178d964f6d 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 = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hsV4YnGDy+ewcRq9+BbwhPCuUPxjieiazvQAaqUcv+A="; + sha256 = "CeXA+TYPP4Vt6qfA2zD12rAVEYDfQYOAfGzzYCmS9cw="; }; nativeBuildInputs = [ From e5de3e0cd2f4ea503fbecbb126273bb45d7cc236 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:36:44 +0000 Subject: [PATCH 246/505] =?UTF-8?q?gnome.gnome-calculator:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/43.rc...43.0.1 Changelog-Reviewed-By: Jan Tojnar --- 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 4db7a229da70..59aafb530d79 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 = "43.rc"; + version = "43.0.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "byc20DrpQXONb869vdSm8/7Sgo1A9gGVnCmHNoYAUoY="; + sha256 = "AsEt7Tz1BT0XU32V7GlYf0uRmJnXcm7O7NtLR/+xyQ8="; }; nativeBuildInputs = [ From 2adfd0bdcc6595414b6c0d7f9e99638b69b6dd21 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:36:51 +0000 Subject: [PATCH 247/505] =?UTF-8?q?gnome.gnome-chess:=2043.rc=20=E2=86=92?= =?UTF-8?q?=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-chess/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/games/gnome-chess/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index 51f5f9da3a70..112c9cf89554 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -5,12 +5,12 @@ , ninja , vala , pkg-config +, desktop-file-utils , wrapGAppsHook4 , gobject-introspection , gettext , itstool , libxml2 -, python3 , gnome , glib , gtk4 @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Z35PUU75rIjDnNdJQWOqBpdCYEuCZexGlxBwdhue5Yw="; + sha256 = "ZDP+3y9C+yK/IC2fE47C7gcjetXXQ4CQULXICbVs28s="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gettext itstool libxml2 - python3 + desktop-file-utils wrapGAppsHook4 gobject-introspection ]; @@ -49,11 +49,6 @@ stdenv.mkDerivation rec { pango ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-chess"; From 4d3ac2084406ea28c6a7f085a672288aee109dd4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:37:13 +0000 Subject: [PATCH 248/505] =?UTF-8?q?gnome.gnome-disk-utility:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.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/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 f9f889418209..4cf083ed5644 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 = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-XNFaSv2cOtOEJ/1CJLmDm+G7k6/U8nnUqxaecRc82es="; + sha256 = "sha256-evypgFprkttpM91+/OxK+DhsAbvB+HHi2uTe9+GSosU="; }; nativeBuildInputs = [ From ee1ceed5b3e5c41c621c3e14635759fa8b4e29f5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:37:20 +0000 Subject: [PATCH 249/505] =?UTF-8?q?gnome.gnome-initial-setup:=2043.rc.1=20?= =?UTF-8?q?=E2=86=92=2043.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/43.rc.1...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 6a94ebae33c8..7bf3e42ff3ca 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "43.rc.1"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "St8/CvBkygq0GyiFZzznQRxg8qjJXfoBBGCD/i2Rcrk="; + sha256 = "Ap7LgZM/QE+k9spVvuR7A++JDoRGK/FF9u4JR34aOVU="; }; patches = [ From f594becbd0e716b4f59aaffa02a2c460b4a68db3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:37:26 +0000 Subject: [PATCH 250/505] =?UTF-8?q?gnome.gnome-control-center:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.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/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 2306f44b4fda..2c6db7f854ac 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 = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2hUuBo5wo2Q6vVoqCMsDNCC5TIU4k44Ddvsf5uKcvnw="; + sha256 = "sha256-mIyTNZLL3E5/DbqakyYuYXtzniWSeqFuF3lgx1TjHEg="; }; patches = [ From d07915d46c4c23f038a3b954ba54401e22539992 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:38:02 +0000 Subject: [PATCH 251/505] =?UTF-8?q?gnome.gnome-software:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 fb7735a30390..f5d299817a81 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "of6JJ7H/c6JXJTbYPCEdPrm/WP0RlSIu7LHGQuaVmzg="; + sha256 = "8WUuquJ0pqhwlQAENRZGUgDMdVlNzM2bShWZsKxJ5o8="; }; patches = [ From e77b6cccfc25bfdf36a0db8345172c8ba3dcd6cc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:38:34 +0000 Subject: [PATCH 252/505] =?UTF-8?q?gnome.gnome-user-share:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-share/-/compare/43.alpha...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-user-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix index cb1f29c4cbe7..2a09ef1ae2b0 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-share"; - version = "43.alpha"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major version}/gnome-user-share-${version}.tar.xz"; - sha256 = "7XmBH77PI6o0rIUx9j7y4nSw73/CjyXo7Iz3Oy9DPpo="; + sha256 = "DfMGqgVYMT81Pvf1G/onwDYoGtxFZ34c+/p8n4YVOM4="; }; preConfigure = '' From 8fa65f1e50bf3a085f91000f834dfff98e7094c8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:39:09 +0000 Subject: [PATCH 253/505] =?UTF-8?q?gnome.sushi:=2042.0=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sushi/-/compare/42.0...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/sushi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index 9817f77b6b68..3c7377630c75 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -9,7 +9,7 @@ , gtksourceview4 , gjs , libsoup -, webkitgtk +, webkitgtk_4_1 , icu , wrapGAppsHook , gst_all_1 @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "RdjbevRaeXhOejRYjRSeqVXIvkS7gqNuiWgpQFt8iCA="; + sha256 = "V4SFJhSasceE+5L7yTTDUU/lIqumSdXZ/t7H4bFHUns="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gdk-pixbuf librsvg libsoup - webkitgtk + webkitgtk_4_1 libepoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base From 41b546c266f3d1e5575c4a59a40181e2d995b0eb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:39:11 +0000 Subject: [PATCH 254/505] =?UTF-8?q?gnome.totem:=2043.rc=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/totem/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 e30fc644a1b6..e7e3e225fa6d 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "5dj9wbs3Wd92e/n7tUg4iz/CybL0cmyXqbrTXq1Xz8g="; + sha256 = "s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4="; }; patches = [ From 005cbf2ffce31ed2d6e5459aaf74a0219e3d6f35 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:40:03 +0000 Subject: [PATCH 255/505] =?UTF-8?q?gnome-connections:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/connections/-/compare/43.beta...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 649ea8ba979c..6fc3519e5e54 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 = "43.beta"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-kzdY9NJMQzgVPZEcquvWS1nfbtirewm5WVcreKsM2kU="; + hash = "sha256-hdrYL5PAsvYJ/o7H7N7scGAKVWEq/A4/AndMJaC7MJ8="; }; nativeBuildInputs = [ From 1a3ac3b8aaf9f2dbe247fa5bb96c2fa60b521fec Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:41:12 +0000 Subject: [PATCH 256/505] =?UTF-8?q?libhandy:=201.7.90=20=E2=86=92=201.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libhandy/-/compare/1.7.90...1.8.0 Changelog-Reviewed-By: Jan Tojnar --- 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 a56e7e8a5d1e..de3bdad3e8df 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.7.90"; + version = "1.8.0"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-M4H+glCF/hqdB1oNzM9sSbAqvXGPPY2yH3BffRiWthM="; + sha256 = "sha256-bCVCwFeJJLDCm3rmy0TrJt846wHW1e89fQsIJXYyMOg="; }; depsBuildBuild = [ From 77ac3010544f772f2a806792a9fb4052bb4c791d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:41:26 +0000 Subject: [PATCH 257/505] =?UTF-8?q?libwnck:=2040.1=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libwnck/-/compare/40.1...43.0 Changelog-Reviewed-By: Jan Tojnar Co-Authored-By: Bobby Rong --- pkgs/development/libraries/libwnck/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 9f92ed5fd459..d6e647591729 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , fetchpatch , meson @@ -21,16 +22,25 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "40.1"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AxNPoRTvP740B1qoNnj1iqLevp/O9OojwHeeKGAdZhE="; + sha256 = "kFvNuFhH1rj4hh5WswzW3GHq5n7O9M2ZSp+SWiaiwf4="; }; + patches = [ + # bamfdaemon crashes with libwnck3 43.0 + # https://bugs.launchpad.net/ubuntu/+source/libwnck3/+bug/1990263 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libwnck/-/commit/6ceb684442eb26e3bdb8a38bf52264ad55f96a7b.patch"; + sha256 = "/1wCnElCrZB7XTDW/l3dxMKZ9czGnukbGu4/aQStoXE="; + }) + ]; + nativeBuildInputs = [ meson ninja From d183cf2990b3a7ff7af2afafb1ba147242acd664 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:42:29 +0000 Subject: [PATCH 258/505] =?UTF-8?q?vala=5F0=5F48:=200.48.24=20=E2=86=92=20?= =?UTF-8?q?0.48.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/-/compare/0.48.24...0.48.25 Changelog-Reviewed-By: Jan Tojnar --- 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 e0380b04e0f2..a76a9d5b4a39 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -93,8 +93,8 @@ let in rec { vala_0_48 = generic { - version = "0.48.24"; - sha256 = "NknvhFc7aGX8NHBkDuYDcgCZ65FbOfqtGbdJjeGn3yQ="; + version = "0.48.25"; + sha256 = "UMs8Xszdx/1DaL+pZBSlVgReedKxWmiRjHJ7jIOxiiQ="; }; vala_0_54 = generic { From 46dfb8bade645c677d886043f5305e3a4dac79b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:42:30 +0000 Subject: [PATCH 259/505] =?UTF-8?q?xdg-desktop-portal-gnome:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.0?= 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/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- .../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 b669a2a41798..5339a0c54cbb 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 = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+b+3mFDgMXAvMA3K0jVzBgUYX3+vIeUE1pUZt1tM6VQ="; + sha256 = "DhhnpFvKpd2yQKTP2yLdBVz4fwchC547twlJ88e+FqY="; }; nativeBuildInputs = [ From a4fc48017a92785cf2eaa17a6f5f61b8d9a1ea13 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:42:34 +0000 Subject: [PATCH 260/505] =?UTF-8?q?vala=5F0=5F54:=200.54.8=20=E2=86=92=200?= =?UTF-8?q?.54.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/-/compare/0.54.8...0.54.9 Changelog-Reviewed-By: Jan Tojnar --- 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 a76a9d5b4a39..6db4b9c959b1 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -98,8 +98,8 @@ in rec { }; vala_0_54 = generic { - version = "0.54.8"; - sha256 = "7fs+eUhqS/SM666pKR5X/HfakyK2lh6VSd9tlz0EvIA="; + version = "0.54.9"; + sha256 = "hXLA6Nd9eMFZfVFgCPBUDH50leA10ou0wlzJk+U85LQ="; }; vala_0_56 = generic { From 9155c3d0d5feab23bdf22054d6c33b6ca32bc01e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:34:53 +0000 Subject: [PATCH 261/505] =?UTF-8?q?at-spi2-core:=202.45.91=20=E2=86=92=202?= =?UTF-8?q?.46.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_45_91...AT_SPI2_CORE_2_46_0 Changelog-Reviewed-By: Jan Tojnar --- 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 8f034178d954..766877645869 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.45.91"; + version = "2.46.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "OGDTCSMCaBeGdcNdQyucuoroP0f0UpxEvZYNtDRByDw="; + sha256 = "qgyGx596jWe65JpbelqwhDDGCM/+bjO/R6cvQasDw9A="; }; nativeBuildInputs = [ From bdd3746cb6d91a9124c4ca1e2643e6f121db459d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:35:20 +0000 Subject: [PATCH 262/505] =?UTF-8?q?glib:=202.73.3=20=E2=86=92=202.74.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.73.3...2.74.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glib/default.nix | 4 +- .../libraries/glib/split-dev-programs.patch | 43 ++++++++++--------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 7e0090dc4679..f288bdf03ea6 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.73.3"; + version = "2.74.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "3xorhBZn1rSLLvaWnr2kMoJDgp9uRYZnJvgG+Q9k7q0="; + sha256 = "NlLH8HLXsDGmte3WI/d+vF3NKuaYWYq8yJ/znKda3TA="; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch index 39c857343366..247db2150ede 100644 --- a/pkgs/development/libraries/glib/split-dev-programs.patch +++ b/pkgs/development/libraries/glib/split-dev-programs.patch @@ -1,5 +1,5 @@ diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build -index bf25cdaeb..bff7016cc 100644 +index f0a256898..9c8497cd0 100644 --- a/gio/gdbus-2.0/codegen/meson.build +++ b/gio/gdbus-2.0/codegen/meson.build @@ -19,7 +19,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) @@ -8,14 +8,14 @@ index bf25cdaeb..bff7016cc 100644 output : 'gdbus-codegen', - install_dir : get_option('bindir'), + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', configuration : gdbus_codegen_conf ) - # Provide tools for others when we're a subproject and they use the Meson GNOME module diff --git a/gio/meson.build b/gio/meson.build -index 69bb0603e..839b1cfb4 100644 +index fdd2528df..cf359c7d7 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -858,14 +858,15 @@ pkg.generate(libgio, +@@ -859,14 +859,15 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -36,41 +36,42 @@ index 69bb0603e..839b1cfb4 100644 'gsettings=' + join_paths('${bindir}', 'gsettings')], version : glib_version, install_dir : glib_pkgconfigreldir, -@@ -966,13 +967,14 @@ executable('gio', gio_tool_sources, +@@ -968,6 +969,7 @@ executable('gio', gio_tool_sources, executable('gresource', 'gresource-tool.c', install : true, + install_dir : get_option('devbindir'), + install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, - dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) +@@ -975,7 +977,7 @@ executable('gresource', 'gresource-tool.c', gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', install : true, - install_dir : multiarch_bindir, + install_dir : get_option('devbindir'), + install_tag : 'bin', c_args : gio_c_args, # intl.lib is not compatible with SAFESEH - link_args : noseh_link_args, -@@ -981,7 +983,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -985,7 +987,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu glib_compile_schemas = executable('glib-compile-schemas', ['glib-compile-schemas.c'], install : true, - install_dir : multiarch_bindir, + install_dir : get_option('devbindir'), + install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, - dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep]) -@@ -989,6 +991,7 @@ glib_compile_schemas = executable('glib-compile-schemas', +@@ -994,6 +996,7 @@ glib_compile_schemas = executable('glib-compile-schemas', glib_compile_resources = executable('glib-compile-resources', [gconstructor_as_data_h, 'glib-compile-resources.c'], install : true, + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', c_args : gio_c_args, # intl.lib is not compatible with SAFESEH - link_args : noseh_link_args, diff --git a/glib/meson.build b/glib/meson.build -index bcfcba94f..162fc86f2 100644 +index 1e6dc36be..6b5de6c86 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -396,9 +396,10 @@ pkg.generate(libglib, @@ -92,20 +93,20 @@ index bcfcba94f..162fc86f2 100644 gtester = executable('gtester', 'gtester.c', install : true, + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', c_args : ['-UG_DISABLE_ASSERT'], include_directories : configinc, - dependencies : [libglib_dep]) -@@ -446,7 +448,7 @@ report_conf.set('PYTHON', python_name) +@@ -447,7 +449,7 @@ report_conf.set('PYTHON', python_name) configure_file( input: 'gtester-report.in', output: 'gtester-report', - install_dir: get_option('bindir'), + install_dir: get_option('devbindir'), + install_tag : 'bin-devel', configuration: report_conf, install_mode: 'rwxr-xr-x' - ) diff --git a/gobject/meson.build b/gobject/meson.build -index 07d096f36..865891e8c 100644 +index a994eb591..36b36b925 100644 --- a/gobject/meson.build +++ b/gobject/meson.build @@ -79,7 +79,7 @@ foreach tool: python_tools @@ -114,17 +115,17 @@ index 07d096f36..865891e8c 100644 configuration : python_tools_conf, - install_dir : glib_bindir, + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', ) - # Set variables for later use -@@ -154,6 +154,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep) +@@ -155,6 +155,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep) executable('gobject-query', 'gobject-query.c', install : true, + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', dependencies : [libglib_dep, libgobject_dep]) - install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) diff --git a/meson_options.txt b/meson_options.txt index f13cbfdd5..f218db581 100644 --- a/meson_options.txt @@ -142,7 +143,7 @@ index f13cbfdd5..f218db581 100644 type : 'combo', choices : ['auto', 'libc', 'external'], diff --git a/tools/meson.build b/tools/meson.build -index d550a0e37..cff7fdae5 100644 +index 0542fb89b..bfb10cd80 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -8,7 +8,7 @@ if have_sh @@ -151,6 +152,6 @@ index d550a0e37..cff7fdae5 100644 configure_file(input : 'glib-gettextize.in', - install_dir : glib_bindir, + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', output : 'glib-gettextize', configuration : gettextize_conf) - endif From aa925d554ffe28f1329c99227831b508ce24f062 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:57:22 +0000 Subject: [PATCH 263/505] =?UTF-8?q?gobject-introspection:=201.73.1=20?= =?UTF-8?q?=E2=86=92=201.74.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.73.1...1.74.0 Changelog-Reviewed-By: Jan Tojnar --- 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 9634dd3db23c..bb306fb3a859 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.73.1"; + version = "1.74.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 @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - sha256 = "ZNTWuauqb/VFDQglkvMysk/IHRFyzMMNEmIPrcToa74="; + sha256 = "NHs6cZ5oukxp/y1X7iaJIz6owH/EkiBeVzOGd55C1lM="; }; patches = [ From c53d6f47b1eec373b3c7d0221bd7d3b1b95afe78 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:35:25 +0000 Subject: [PATCH 264/505] =?UTF-8?q?gnome.dconf-editor:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/dconf-editor/-/compare/43.beta...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/dconf-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix index fa86c1034eaa..7cf366b7dc06 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "dconf-editor"; - version = "43.beta"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SNYG/ZZ20xX3ysml7kh/U8mDveX4jb09Qpd8qL6F+/s="; + sha256 = "sha256-k1o8Lddswqk81a7ppU05R/sRHrOW9LY9xfC6j40JkTY="; }; patches = [ From 841d89c6ff5473cb97d2f64788f885a4d453ec9e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:50:31 +0000 Subject: [PATCH 265/505] =?UTF-8?q?gnome.file-roller:=2043.alpha=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/file-roller/-/compare/43.alpha...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 adbfbc9efe99..4c876e39db17 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 = "43.alpha"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${lib.versions.major version}/file-roller-${version}.tar.xz"; - sha256 = "OiUnSWeaejmX+r+gylEzUTuPb8vdH7lG8qSP99j8EPE="; + sha256 = "KYcp/b252oEywLvGCQdRfWVoWwVhiuBRZzNeZIT1c6E="; }; nativeBuildInputs = [ From 441e68565ac00ff3078f7efd311c3880f56a9ec6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:50:33 +0000 Subject: [PATCH 266/505] =?UTF-8?q?gnome.eog:=2043.rc=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 e3f23cdb7bfc..ccb4d439240f 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 = "43.rc"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CWMSOK7h+7FnIsuD+2pEg3COuqEaA633p3vXnYHVK1o="; + sha256 = "sha256-pSovPrGju1ADijNikCvHlRY+GphnY+6C0gQk566EVG8="; }; patches = [ From 636549aa6b9e6292ed1f38e780658bab8a107fcf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:51:01 +0000 Subject: [PATCH 267/505] =?UTF-8?q?gnome.gnome-maps:=2043.rc=20=E2=86=92?= =?UTF-8?q?=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v43.rc...v43.0 Changelog-Reviewed-By: Jan Tojnar --- .../desktops/gnome/apps/gnome-maps/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index e2c77e73ac07..9d455bd9be25 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , gettext @@ -28,26 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-NBqS8OTo+lOaOggrdYXYA/4Od7byiF7ztq9zZxKSQ5k="; + sha256 = "sha256-CGjPz7eMOiesW+YM2E0wuz08KMiFqY+qCeN/o6UyNOQ="; }; - patches = [ - # Fix build without GTK 3. - # https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/248 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/248.patch"; - sha256 = "koVpvz021b+rvauIc3kvEBdTttRSuYiPvDH/dVbs5pc="; - postFetch = '' - # Make the patch apply. - substituteInPlace "$out" --replace "version: '43.0'," "version: '43.rc'," - ''; - }) - ]; - doCheck = true; nativeBuildInputs = [ From d78f7806e0f7c5f607ba37246cefa3ab245f8b98 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:51:06 +0000 Subject: [PATCH 268/505] =?UTF-8?q?gnome.gnome-remote-desktop:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.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/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 a9309af40ac6..e1655b2b7c50 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-dLT4QCC3pgMu3Clh3691sqHVHYE/eW1zSbOtMg+78I0="; + hash = "sha256-NrWdIeyuRLllzZHmynwMAJ1gcOwxyEt3wERZXddSeAs="; }; nativeBuildInputs = [ From dd9f466eb0ae674443eed62e78d39764aa7aa2dc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:51:12 +0000 Subject: [PATCH 269/505] =?UTF-8?q?gnome.gnome-shell-extensions:=2043.rc?= =?UTF-8?q?=20=E2=86=92=2043.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/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 0f9473263384..2f75893b0b5e 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 = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nOCb3uM+uk1cpbaNywbA+mOUYIaGf5sn67R80di8VyE="; + sha256 = "5Hw51CeCpyRJu/fes28D/ZbLWSkZRikTkSEuL9mNX5M="; }; patches = [ From e39c7a4683985a2ce927e21ca4b1b71635483deb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 22:53:25 +0200 Subject: [PATCH 270/505] =?UTF-8?q?gnome.gnome-power-manager:=203.32.0=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-power-manager/-/compare/GNOME_POWER_MANAGER_3_32_0...GNOME_POWER_MANAGER_43_0 Changelog-Reviewed-By: Jan Tojnar --- .../apps/gnome-power-manager/default.nix | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix index a883067e7804..eb0070344bd7 100644 --- a/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , gettext , fetchurl , pkg-config @@ -10,24 +11,16 @@ , python3 , desktop-file-utils , wrapGAppsHook -, gnome }: +, gnome +}: -let +stdenv.mkDerivation rec { pname = "gnome-power-manager"; - version = "3.32.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"; - }; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; - }; + url = "mirror://gnome/sources/gnome-power-manager/${lib.versions.major version}/gnome-power-manager-${version}.tar.xz"; + sha256 = "faq0i73bMOnfKrplDLYNBeZnyfiFrOagoeeVDgy90y8="; }; nativeBuildInputs = [ @@ -39,7 +32,7 @@ in stdenv.mkDerivation rec { # needed by meson_post_install.sh python3 - glib.dev + glib desktop-file-utils ]; @@ -47,9 +40,15 @@ in stdenv.mkDerivation rec { gtk3 glib upower - gnome.adwaita-icon-theme ]; + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-power-manager"; + attrPath = "gnome.gnome-power-manager"; + }; + }; + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-power-manager"; description = "View battery and power statistics provided by UPower"; From 31df01cbaf81dcb0ddbd2bf627e7f71ce417b560 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:56:51 +0000 Subject: [PATCH 271/505] =?UTF-8?q?gnome.mutter:=2043.rc=20=E2=86=92=2043.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 94c2cf48511e..6e1c254a49b2 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -49,13 +49,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "43.rc"; + version = "43.0"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ILLYyWWthlqr7xIJr8cHnrxQsotBuMPISW8fSaTGRQA="; + sha256 = "jZulKO2Z72eZZC4Uez/p8ry+ypvs7ShFwcrbMxzT5SU="; }; patches = [ From 31f1c5c6ae892737967383f12cd3490459ae11cb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:56:32 +0000 Subject: [PATCH 272/505] =?UTF-8?q?gnome.gnome-shell:=2043.rc=20=E2=86=92?= =?UTF-8?q?=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 031a9823cdd5..4354576c79df 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 = "43.rc"; + version = "43.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "F/d0xxClzXLD565Si5h2VLoRQd70TnNNuEIWHoWMhhU="; + sha256 = "9u7JdwP588xv5ua0H23IIbGOyE34NRxN+XsXroJ0G0E="; }; patches = [ From 9d6f64834dc6f64eb8ccb76c95ea0a1afd6819c3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:56:36 +0000 Subject: [PATCH 273/505] =?UTF-8?q?gnome.gnome-sudoku:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/43.beta...43.0 Format the expression, drop python since it is now using Meson’s post-install function, and correct license. Changelog-Reviewed-By: Jan Tojnar --- .../gnome/games/gnome-sudoku/default.nix | 51 +++++++++++++++---- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 4cd5b73c7994..388253f131bf 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -1,22 +1,51 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome, wrapGAppsHook -, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, vala +, pkg-config +, gobject-introspection +, gettext +, gtk3 +, gnome +, wrapGAppsHook +, libgee +, json-glib +, qqwing +, itstool +, libxml2 +, desktop-file-utils +}: stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "43.beta"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hybZ0Dmtee250tDztEu+Dm+K08ycSylBzHh3t1wCgpU="; + sha256 = "ftJ0KJz1ykELHJKxU3BQpcNi99szmaMrU0PQ3nBGbkk="; }; - nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 libgee json-glib qqwing ]; + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + gobject-introspection + gettext + itstool + libxml2 + desktop-file-utils + wrapGAppsHook + ]; - postPatch = '' - chmod +x build-aux/post_install.py - patchShebangs build-aux/post_install.py - ''; + buildInputs = [ + gtk3 + libgee + json-glib + qqwing + ]; passthru = { updateScript = gnome.updateScript { @@ -29,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Sudoku"; description = "Test your logic skills in this number grid puzzle"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } From 9e21c396b1a6fcda1d96bd2a4ba3e1744e5b8fcd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:56:48 +0000 Subject: [PATCH 274/505] =?UTF-8?q?gnome.nautilus-python:=204.0.alpha=20?= =?UTF-8?q?=E2=86=92=204.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus-python/-/compare/4.0.alpha...4.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/misc/nautilus-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix index b75e7839d06c..b99d939bc12c 100644 --- a/pkgs/desktops/gnome/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nautilus-python"; - version = "4.0.alpha"; + version = "4.0"; outputs = [ "out" "dev" "doc" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor version}/nautilus-python-${version}.tar.xz"; - sha256 = "cuWLpOIZZ0FqIwNV304EaWsKJZ5JHcsFyyp/BFiUmg4="; + sha256 = "FyQ9Yut9fYOalGGrjQcBaIgFxxYaZwXmFBOljsJoKBo="; }; patches = [ From 06c2b7d2206d504b9c90b62f125c5522d05df0d2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:56:57 +0000 Subject: [PATCH 275/505] =?UTF-8?q?gnome.rygel:=200.41.2=20=E2=86=92=200.4?= =?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/rygel/-/compare/rygel-0.41.2...rygel-0.42.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/rygel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index 9c349f3b845c..c2414020968e 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.41.2"; + version = "0.42.0"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sRhMYUsSYYrFgHqCgflD9/c7SypKZw1HViUEC4FpO3I="; + sha256 = "AG2nhnffKMruKHxEwp/NntyxshYkI7x/LdLchWuOK7s="; }; patches = [ From 9a8fe1349c1d04f8560a3b0cc50b8ef7ce1efc8c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:57:03 +0000 Subject: [PATCH 276/505] =?UTF-8?q?gnome.yelp:=2042.1=20=E2=86=92=2042.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp/-/compare/42.1...42.2 Changelog-Reviewed-By: Jan Tojnar --- 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 4ae54200d09c..a6020dbafaa6 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.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-JbEUarhUmIilqNoGf2O0cLDw+AC2roicrNEU0B1xO0E="; + sha256 = "sha256-osX9B4epCJxyLMZr0Phc33CI2HDntsyFeZ+OW/+erEs="; }; nativeBuildInputs = [ From 25aef96a105ec5cb6e4b8c417cdb7840e5c2ce80 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:57:09 +0000 Subject: [PATCH 277/505] =?UTF-8?q?gnome.yelp-xsl:=2042.0=20=E2=86=92=2042?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp-xsl/-/compare/42.0...42.1 Changelog-Reviewed-By: Jan Tojnar --- 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 3398e8ddd571..2fa3ec0ecdd4 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.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KbJzzAvRbvtumDRDgD8en9wDUR5cT/Y0j9MKYE1NyEY="; + sha256 = "sha256-I4vhULFlMIDOE5lxMw/TbTomWV4NagQKLAML89IAW80="; }; nativeBuildInputs = [ From 53f9485fcc6cf262084bac86d816052dadf862a9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:57:19 +0000 Subject: [PATCH 278/505] =?UTF-8?q?gnome-online-accounts:=203.45.2=20?= =?UTF-8?q?=E2=86=92=203.46.0?= 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.45.2...3.46.0 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/gnome-online-accounts/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index b0651a25dafe..9ffa5d2a0d72 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -6,7 +6,6 @@ , glib , meson , ninja -, python3 , libxslt , gtk3 , webkitgtk_4_1 @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.45.2"; + version = "3.46.0"; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-ST8hHMBCURI78HcT3iGL5D+O/v4gdqxToTanXWI4/Vw="; + sha256 = "sha256-qVd55fmhY05zJ871OWc3hd1eWjYbYJuxlE/T2i3VCUA="; }; mesonFlags = [ @@ -63,7 +62,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook ]; @@ -86,11 +84,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { versionPolicy = "odd-unstable"; From 7aa5e4bf9fc1b0f41f8cb1355d87e265a7d68752 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:57:25 +0000 Subject: [PATCH 279/505] =?UTF-8?q?goffice:=200.10.52=20=E2=86=92=200.10.5?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/goffice/-/compare/GOFFICE_0_10_52...GOFFICE_0_10_53 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/goffice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 4428b077a47d..9e2585d7ee03 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.52"; + version = "0.10.53"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "YLnv2UNw8JabOU8KrIxuuR4V68DOEja0Sqc16xyYhAw="; + sha256 = "J/1YeW+qHNTMASDDTqhTFaCJHscfVbxnk8FOzxaKP1c="; }; nativeBuildInputs = [ pkg-config intltool ]; From ed7392af5a55daca20084560ba3ed11d58840fae Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:57:31 +0000 Subject: [PATCH 280/505] =?UTF-8?q?gnumeric:=201.12.52=20=E2=86=92=201.12.?= =?UTF-8?q?53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnumeric/-/compare/GNUMERIC_1_12_52...GNUMERIC_1_12_53 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/office/gnumeric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index c9b4ef139126..e93be60741bb 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.52"; + version = "1.12.53"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "c89zBJoiodgoUGJ1ssk3jsN8X/N7aLsfL0lPDWQAgjs="; + sha256 = "VWjkyNzqu5Ao8TYdEEVSL5Xwpx2qWelzy90tObrdTwI="; }; configureFlags = [ "--disable-component" ]; From e33dff6b30f843cbb7a41761f61ebc071df5e5cc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:57:37 +0000 Subject: [PATCH 281/505] =?UTF-8?q?gssdp=5F1=5F6:=201.5.2=20=E2=86=92=201.?= =?UTF-8?q?6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gssdp/-/compare/gssdp-1.5.2...gssdp-1.6.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gssdp/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index 0408d1544353..7dcd20991a26 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "gssdp"; - version = "1.5.2"; + version = "1.6.0"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "60CscnTY3AbRonW8iBMlfZlg54qKbZrPPgF6oWoXFh4="; + sha256 = "FI7UFijI8XM2osj6SxSrD7rpi2Amvi2s/d6nv0OGZok="; }; nativeBuildInputs = [ From eccead48b4fdd8ba8d6d52425ab6cb896073a56b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:57:45 +0000 Subject: [PATCH 282/505] =?UTF-8?q?gtksourceview5:=205.5.1=20=E2=86=92=205?= =?UTF-8?q?.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.5.1...5.6.0 Changelog-Reviewed-By: Jan Tojnar --- 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 dc5facea3301..94e87db5b25d 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.5.1"; + version = "5.6.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "SuWMzRXwceRfiBhfWpsCBWCgsalQ+ZyrfcXozRTEDRk="; + sha256 = "DKPfHSr2G942CNDT8jPkpB+Vjirlm5/CCcPfYQLor90="; }; patches = [ From 56e823788bb85d72038ba478298374293c41457c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:57:51 +0000 Subject: [PATCH 283/505] =?UTF-8?q?gupnp=5F1=5F6:=201.5.4=20=E2=86=92=201.?= =?UTF-8?q?6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gupnp/-/compare/gupnp-1.5.4...gupnp-1.6.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gupnp/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 35a2d7fdb71d..7054a75d3887 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.5.4"; + version = "1.6.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-mIMpFXw1ElKuB7qtiq6/EKfLVaZCwi1hOqhbp0wFG3g="; + sha256 = "sha256-MsSdrkd4zT74/Zpg9jdenId2ju5sPAWzPYp5+R4Ivcs="; }; depsBuildBuild = [ From 7ae7e0e963460f839bd6e3bbf6c6476c181a6acb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:58:00 +0000 Subject: [PATCH 284/505] =?UTF-8?q?libgee:=200.20.5=20=E2=86=92=200.20.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgee/-/compare/0.20.5...0.20.6 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libgee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index b34790d59c73..cec611f366cf 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.5"; + version = "0.20.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "MYY6iVfVpyf5BnSVyr8KCIn6XT1EYm5UCUMxGI1cFRg="; + sha256 = "G/g09eENYMxhJNdO08HdONpkZ4f794ciILi0Bo5HbU0="; }; doCheck = true; From ee8fd4ac3d3707299381fdb1be6e8cf6173c60ba Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:58:15 +0000 Subject: [PATCH 285/505] =?UTF-8?q?libpeas:=201.32.0=20=E2=86=92=201.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpeas/-/compare/libpeas-1.32.0...libpeas-1.34.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libpeas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 95e56153e51c..e218a78bdfc3 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.32.0"; + version = "1.34.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1iVSD6AuiXcCmyRq5Dm8IYloll8egtYSIItxPx3MPQ4="; + sha256 = "QwX3Fdq0ta0+gAfa7DFmJecGWpTmPiXvVese+5ZKe/A="; }; depsBuildBuild = [ From 989c26c08f644f3bd619c43b9b0581667eaef6b0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:58:44 +0000 Subject: [PATCH 286/505] =?UTF-8?q?template-glib:=203.35.0=20=E2=86=92=203?= =?UTF-8?q?.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/template-glib/-/compare/3.35.0...3.36.0 Changelog-Reviewed-By: Jan Tojnar --- 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 8aa3af0c7b71..bbb5aef36f14 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "template-glib"; - version = "3.35.0"; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "PPAnJkSwiLALcbqdB1Lo5OQd0P/knFd9vct8H+ABhok="; + sha256 = "HBKVJa5kQDpmL3Zm9jWDhqgVZohyrPEctWirObuh9CE="; }; nativeBuildInputs = [ From e6964aea3891ec2828138459cdb182b01fbf3bc3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Sep 2022 20:58:45 +0000 Subject: [PATCH 287/505] =?UTF-8?q?sysprof:=203.45.1=20=E2=86=92=203.46.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sysprof/-/compare/3.45.1...3.46.0 Changelog-Reviewed-By: Jan Tojnar --- 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 81b183e7fb58..fed8af725fbc 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.45.1"; + version = "3.46.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ZAKg8WrnCWfI+Yo+cf7hVhwbzzLyoyI5pF7oo3HI1Zo="; + sha256 = "PkMNV4FQqN0LB1sX0vzBunBNQogCYvDMZR8z5JO+QHE="; }; nativeBuildInputs = [ From 0985312f4faa4e95c669f32d94e47a09c175e80e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 17 Sep 2022 10:30:59 +0800 Subject: [PATCH 288/505] gnome.mutter338: Fix build with separate sysprof --- .../gnome/core/mutter/3.38/default.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/3.38/default.nix index 3c2d30b813ba..464cd285a780 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/3.38/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , substituteAll , runCommand , lib @@ -36,12 +37,12 @@ , python3 , wrapGAppsHook , sysprof +, libsysprof-capture , desktop-file-utils , libcap_ng , egl-wayland , graphene , wayland-protocols -, pantheon }: let self = stdenv.mkDerivation rec { @@ -65,6 +66,20 @@ let self = stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/mutter/issues/536 ./fix-glitches-in-gala.patch + # Stop using source_root()/build_root(). + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/6288763671692edbc953a2b80225e9a7c7fc87e7.patch"; + sha256 = "immnfZiY+Cgu7xTbo5y8xs0olTa6UGsKgDJ1Xhkhns0="; + }) + + # Fix build with separate sysprof. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; + sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; + }) + (substituteAll { src = ./fix-paths.patch; inherit zenity; @@ -122,7 +137,8 @@ let self = stdenv.mkDerivation rec { libXdamage pango pipewire - sysprof + sysprof # for D-Bus interfaces + libsysprof-capture xkeyboard_config xwayland wayland-protocols From 650985e691d5008777b7609b8f6f0fbb29be9cd0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:35:35 +0000 Subject: [PATCH 289/505] =?UTF-8?q?baobab:=2043.rc=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 28241908dfe5..8419aa17ea70 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 = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "eCDZ6lMmEKZyEbCaEirf4HUyAEzQ2DbrStMaCdH+hlY="; + sha256 = "UsaGQRj1aX9aVzaILc2ifbIuciC8SSg43uzGmSRs2yY="; }; nativeBuildInputs = [ From 619892bab4a2f465d7d235002800bae86fe05c10 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:35:46 +0000 Subject: [PATCH 290/505] =?UTF-8?q?evince:=2043.alpha=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/43.alpha...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/evince/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 17e09f0ff2c1..7138b9947632 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -31,7 +31,6 @@ , gsettings-desktop-schemas , gnome-desktop , dbus -, python3 , texlive , gst_all_1 , gi-docgen @@ -43,20 +42,15 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "43.alpha"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PPVNKPeX74sFBL67HBaKGA1N35JcuDqfnGn+DRie9hE="; + sha256 = "Zr4N5LR7ETBIYQOYjMFSwErqlZULo+8W3CDC72toHUc="; }; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - nativeBuildInputs = [ appstream gettext @@ -66,7 +60,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 wrapGAppsHook yelp-tools ]; From 66efd06d7d73329198f7e658827d448f8eae1767 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:36:09 +0000 Subject: [PATCH 291/505] =?UTF-8?q?glibmm:=202.66.4=20=E2=86=92=202.66.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glibmm/-/compare/2.66.4...2.66.5 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glibmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 996eacd65f4c..9f4a16a0ce41 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.4"; + version = "2.66.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GZrOVoLYGxWh1WVIC0qVBoLy22QCyKpd1yF9ce3/gdU="; + sha256 = "sha256-ezhGYt1uw7hsBXAzHTKvBdsr2Zp5FgK3Z7SgslZuwUk="; }; outputs = [ "out" "dev" ]; From dea66f99fa54ac1d5f8b7e8ae68367ad53c359f9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:36:12 +0000 Subject: [PATCH 292/505] =?UTF-8?q?glibmm=5F2=5F68:=202.73.2=20=E2=86=92?= =?UTF-8?q?=202.74.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glibmm/-/compare/2.73.2...2.74.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glibmm/2.68.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index 82aab278e770..531d487cb933 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.73.2"; + version = "2.74.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0JhwnDLozHqOIzFT3FVbiNUkb55QtychTBVFp2i3WiU="; + sha256 = "sha256-K0cmlsuseduOQFckEY7JRSGcW5sYr2PcjPt/HYmw8fo="; }; nativeBuildInputs = [ From cc2e9c1c3c10e642ee74c193f349f1a16896fa92 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:36:28 +0000 Subject: [PATCH 293/505] =?UTF-8?q?gnome.gnome-characters:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 3b3356280b19..9dc7d113571d 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "kGbkD+29l6cF1lt+psPCW4+w6Y6mndI+y13RLjGmCj8="; + sha256 = "poW5y/k1Re05EWjEHJ2L+DeFq7+0iWdYJ+5zQkcbqsg="; }; patches = [ From 79c0bacd881e319b9ea4350e64e9754cced5d788 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:36:38 +0000 Subject: [PATCH 294/505] =?UTF-8?q?gnome.gnome-font-viewer:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.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/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 fe20a43e424b..5ebf4903cbd3 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Nm/z9WuqFwZWd+j4EnmEoLBrQYNRXupzO1km8cPauDE="; + sha256 = "gca/+wbVMyNG4A6uyuwb3P1hfFHf2VvNBY1sdsdt0rk="; }; doCheck = true; From 0188f0a5701382dc7d2033a9150c37b2ca74810d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:36:54 +0000 Subject: [PATCH 295/505] =?UTF-8?q?gnome.gnome-settings-daemon:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 abef044258dc..0c20e07a770d 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 = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VQpWZsOf7rvvYO8k6IqH6yJpV/qkMM6cQJBSH8vC9Fc="; + sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A="; }; patches = [ From d2b7085aa945dc8ef94483e897a928ed50536f35 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:37:02 +0000 Subject: [PATCH 296/505] =?UTF-8?q?gnome.gnome-weather:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 c5a7df8f6839..bc0fec6cfa71 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 = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8VyMn2jAYXTx/n0zIjCtw6aGvxe8l3cqlgkphjfSKzM="; + sha256 = "LxERf3VVK/G7ngHwHPs8L82mo/aQcP/gUZoHYVMrjyY="; }; nativeBuildInputs = [ From ec9acea1e4ed2c4bd2a0af97ab0d1a41fd002d7f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:37:13 +0000 Subject: [PATCH 297/505] =?UTF-8?q?gnome.nautilus:=2043.rc=20=E2=86=92=204?= =?UTF-8?q?3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 1bd4f34c8941..163c562a1ab6 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "43.rc"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9w/Rm7J0XBr7lieVsxVOEKivbgWaEJnf9eoHoKNgdfc="; + sha256 = "PPVPrAqKvuCQ4VVBf3sW9j6grAwmTvT1RXSvNFgBqRE="; }; patches = [ From 5b1ed07d2fcd7118dfb71b4a3751565caa669cdc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:37:30 +0000 Subject: [PATCH 298/505] =?UTF-8?q?gnome-desktop:=2043.rc=20=E2=86=92=2043?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/43.rc...43 Changelog-Reviewed-By: Jan Tojnar --- 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 ec1caeda98df..6b58b171f7d3 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 = "43.rc"; + version = "43"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KiA9duBPDruj3Re/M0dKwZ/EdotuhPyRdxMu1M7KbO0="; + sha256 = "sha256-PW4VMxdIYVdZaqOAL4dnZBTFcHOPRQqUoEH+iDVCCmk="; }; patches = lib.optionals stdenv.isLinux [ From 0795935574025a1d83a3f468f8d97ad2d84fc539 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 21 Sep 2022 02:27:26 +0200 Subject: [PATCH 299/505] =?UTF-8?q?d-spy:=201.2.1=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/d-spy/-/compare/1.2.1...1.4.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/tools/misc/d-spy/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/development/tools/misc/d-spy/default.nix index a4a49172c234..43be248244d7 100644 --- a/pkgs/development/tools/misc/d-spy/default.nix +++ b/pkgs/development/tools/misc/d-spy/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "d-spy"; - version = "1.2.1"; + version = "1.4.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/dspy/${lib.versions.majorMinor version}/dspy-${version}.tar.xz"; - sha256 = "TjnA1to687eJASJd0VEjOFe+Ihtfs62CwdsVhyNrZlI="; + url = "mirror://gnome/sources/d-spy/${lib.versions.majorMinor version}/d-spy-${version}.tar.xz"; + sha256 = "6uh0jOpiTFxMdeAhwt8dc3bk+fj76JrEQ0kR7PeIZ3I="; }; nativeBuildInputs = [ @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = "dspy"; - attrPath = "d-spy"; + packageName = "d-spy"; }; }; From d7cc4d5c8be0e71e64b9aea744ddc55e4ad3aa81 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:37:37 +0000 Subject: [PATCH 300/505] =?UTF-8?q?gnome-builder:=2043.alpha1=20=E2=86=92?= =?UTF-8?q?=2043.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/43.alpha1...43.rc Changelog-Reviewed-By: Jan Tojnar --- .../applications/editors/gnome-builder/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 65f9c3932d7d..d24b198fa65a 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,6 +5,7 @@ , desktop-file-utils , editorconfig-core-c , fetchurl +, fetchpatch , flatpak , gnome , libgit2-glib @@ -40,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.alpha1"; + version = "43.rc"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "gzf93kAfLM5ehYYbby79XWdTyuReAiqH80V5kPp8JDY="; + sha256 = "cwz588t4cZxQxnTldzXwf8mHYmctxU211nVfR75VKqI="; }; patches = [ @@ -65,7 +66,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gi-docgen + (gi-docgen.overrideAttrs (attrs: { + patches = attrs.patches ++ [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/f4ff4787cce962b705fb2588b31f2988c5063c13.patch"; + sha256 = "11VGFFb2PLVxnX/qUQdLPLfhGQWx4sf4apBP7R2JWjA="; + }) + ]; + })) gobject-introspection meson ninja From e143301d505350ee1d2e1c4189b287683fbad81b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:37:40 +0000 Subject: [PATCH 301/505] =?UTF-8?q?gnome-text-editor:=2043.alpha1=20?= =?UTF-8?q?=E2=86=92=2043.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/43.alpha1...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 ff931f28ef87..9bde14eefb56 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "43.alpha1"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-rWBUhLeuI6bGiisRjc4bSDSEhoE7ND/xaVjAtw+1sGU="; + sha256 = "sha256-sPu/yxfGq8Zd+x71/y+xytwaqVNs1ehYmBS4fngSqmE="; }; nativeBuildInputs = [ From b695629f66ff703d7c96ccfdc08fbf915f988994 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:37:50 +0000 Subject: [PATCH 302/505] =?UTF-8?q?gnome-user-docs:=2042.0=20=E2=86=92=204?= =?UTF-8?q?3.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/42.0...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 db177006a3dd..378f33be2526 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 = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "srJ9oEEAu90vTw5bw48tBW2V+jZWcgFj9kNqMWfV6QU="; + sha256 = "NgcWDv/W+R4lqHmLV977IJndcLj+5Ofi8g8mN6woyu4="; }; nativeBuildInputs = [ From 828c0ec427fa19f98e2b3687d21a28aba4b97bc6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:37:56 +0000 Subject: [PATCH 303/505] =?UTF-8?q?gsettings-desktop-schemas:=2043.rc.1=20?= =?UTF-8?q?=E2=86=92=2043.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/43.rc.1...43.0 Changelog-Reviewed-By: Jan Tojnar --- .../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 104f7c7015e3..7431ca1f82a3 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 = "43.rc.1"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "5mf1XALmovyRtYamDAJ/ws64NR0XpBRo5ENncVB9tws="; + sha256 = "XVVoKCqzi5V1nUJUAfdHblb4y/JimIVYdDn0O9C4S74="; }; strictDeps = true; From 5ca8ced557bc77f10215a5d2db8221a505cd01a9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:38:45 +0000 Subject: [PATCH 304/505] =?UTF-8?q?libshumate:=201.0.0.beta=20=E2=86=92=20?= =?UTF-8?q?1.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.0.0.beta...1.0.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libshumate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index 2c0b37a5122b..5911e199bcb2 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.0.beta"; + version = "1.0.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "Rnsxu4Vu4yzx3U5fdIUYaeh16cp7svoA0MSUX3etsyc="; + sha256 = "fpHMfxnPnGJSfJe4kJ28+704QjjRwYddOZAB17QxXno="; }; nativeBuildInputs = [ From ec62268cea97f460c0544155b6b08ec9ce9a2d02 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:38:57 +0000 Subject: [PATCH 305/505] =?UTF-8?q?networkmanager-sstp:=201.3.0=20?= =?UTF-8?q?=E2=86=92=201.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/network-manager-sstp/-/compare/release-1.3.0...release-1.3.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/tools/networking/networkmanager/sstp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index 93fd87b005b5..6b05dcdcd854 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -6,7 +6,7 @@ , gnome , gtk3 , gtk4 -, intltool +, gettext , libnma , libnma-gtk4 , libsecret @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { pname = "NetworkManager-sstp"; - version = "1.3.0"; + version = "1.3.1"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+IJw3jvOYs/+NDS9HvCrSQ6wxh1x1yqwiFij7UZb+rU="; + sha256 = "fQMSawiaCk/2ZeMHVVcM7PaFEKbP7bUS9Lh+htrGHX0="; }; nativeBuildInputs = [ file - intltool + gettext pkg-config ]; From de0d50243ca998e70f27238df3fd45385606d434 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:39:19 +0000 Subject: [PATCH 306/505] =?UTF-8?q?tracker:=203.4.0.rc=20=E2=86=92=203.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.4.0.rc...3.4.0 Changelog-Reviewed-By: Jan Tojnar --- 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 44996604d6af..2c4422d7a1f9 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.4.0.rc"; + version = "3.4.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "JNLh7Un213v1CJmjZULoYSmTPviY4hG5kWGdNahWM4E="; + sha256 = "s7OAyVcdfHQjtfQB5KLy143kcUOwNessEoHiQjxZIYs="; }; postPatch = '' From ea3d666cc3574b14e5351c53ef15feafd8fed5ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:39:19 +0000 Subject: [PATCH 307/505] =?UTF-8?q?tracker-miners:=203.4.0.rc=20=E2=86=92?= =?UTF-8?q?=203.4.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.4.0.rc...3.4.0 Changelog-Reviewed-By: Jan Tojnar --- 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 738ad017a2dc..f5fc97f4ef41 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.0.rc"; + version = "3.4.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "SWjC2YHQ7SKtR42DP9tzocejQkiIbFOFrY49azYyxWU="; + sha256 = "ouA2XjCBG7YelcghSzP0eCo6BODGJGoG7NnAFBfNhOY="; }; nativeBuildInputs = [ From 1cf114b84699e9579c54bb6e06a7083a569b70e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 11:39:21 +0000 Subject: [PATCH 308/505] =?UTF-8?q?vte:=200.69.99=20=E2=86=92=200.70.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.69.99...0.70.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index aeafff544e93..6ec3acebd6e1 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.69.99"; + version = "0.70.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6bHBStg856qtExNgTATCNYGDhx5jvKC3RYRBmT0acew="; + sha256 = "sha256-k+DdShvCp6GmLaZBYKJ0zORWl26hVn2YWR2pbi0mWuY="; }; patches = [ From 286e3329fab4bac18652a5c49cb55e26f2d14c2c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 14:38:58 +0200 Subject: [PATCH 309/505] gnome.gnome-todo: Use GTK 4 variants of dependencies It does not really matter for e-d-s since todo/endeavour does not use libedataserverui but we are aiming for not using gtk3 variant of e-d-s on the NixOS ISO. --- pkgs/desktops/gnome/apps/gnome-todo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index 582a0772a680..1f905dcc7c1f 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -6,7 +6,7 @@ , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook4 , gettext , gnome , glib @@ -17,7 +17,7 @@ , gnome-online-accounts , gsettings-desktop-schemas , libportal-gtk4 -, evolution-data-server +, evolution-data-server-gtk4 , libical , librest , json-glib @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { pkg-config gettext python3 - wrapGAppsHook + wrapGAppsHook4 itstool ]; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # Plug-ins libportal-gtk4 # background - evolution-data-server # eds + evolution-data-server-gtk4 # eds libical librest # todoist json-glib # todoist From 766a245dbcda372e9231d643cb5466dee6299473 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 14:43:38 +0200 Subject: [PATCH 310/505] gnome.gnome-contacts: Use GTK 4 variants of dependencies It does not really matter for e-d-s since contacts have libedataserverui usage commented out but we are aiming for not using gtk3 variant of e-d-s on the NixOS ISO. Also remove propagatedUserEnvPkgs since they are an anti-pattern. --- pkgs/desktops/gnome/core/gnome-contacts/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index fb3677f84829..4a1847126090 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -2,7 +2,7 @@ , stdenv , gettext , fetchurl -, evolution-data-server +, evolution-data-server-gtk4 , pkg-config , libxslt , docbook-xsl-nons @@ -13,7 +13,7 @@ , libportal-gtk4 , gnome-desktop , gnome-online-accounts -, wrapGAppsHook +, wrapGAppsHook4 , folks , libxml2 , gnome @@ -33,10 +33,6 @@ stdenv.mkDerivation rec { sha256 = "Hoyo2nF429WpIQJVBkokvdwz35WFx1hOExBxTJprjco="; }; - propagatedUserEnvPkgs = [ - evolution-data-server - ]; - nativeBuildInputs = [ meson ninja @@ -47,14 +43,14 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_42 desktop-file-utils - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ gtk4 glib libportal-gtk4 - evolution-data-server + evolution-data-server-gtk4 gsettings-desktop-schemas folks gnome-desktop From 765d0f4e5f589b7e6cbb789d8da9a3b4e6c0a3ec Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 14:48:21 +0200 Subject: [PATCH 311/505] gnome.gnome-shell: Use GTK 4 variant of e-d-s It does not really matter since Shell does not use libedataserverui but we are aiming for not using gtk3 variant of e-d-s on the NixOS ISO. The shell still links gtk3 internally so continuing to use wrapGAppsHook. --- 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 4354576c79df..ccc34ecca019 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -43,7 +43,7 @@ , glib , gjs , mutter -, evolution-data-server +, evolution-data-server-gtk4 , gtk3 , gtk4 , libadwaita @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { gjs mutter libpulseaudio - evolution-data-server + evolution-data-server-gtk4 libical gtk3 gtk4 From 6ff9e88b82350da2f73f9b93959d4f5a2031eba0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 15:02:12 +0200 Subject: [PATCH 312/505] tracker-miners: Clean up dependencies Evolution miner was removed in 1.99.0 with remaining dependencies (including GTK 3 and libsoup) dropped in 2.0.0. --- pkgs/development/libraries/tracker-miners/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index f5fc97f4ef41..fa0e30f1abc4 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -13,10 +13,9 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsNoGuiHook , bzip2 , dbus -, evolution-data-server , exempi , giflib , glib @@ -33,7 +32,6 @@ , libosinfo , libpng , libseccomp -, libsoup , libtiff , libuuid , libxml2 @@ -66,7 +64,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsNoGuiHook ]; # TODO: add libenca, libosinfo @@ -95,14 +93,12 @@ stdenv.mkDerivation rec { libjpeg libosinfo libpng - libsoup libtiff libuuid libxml2 poppler taglib ] ++ lib.optionals stdenv.isLinux [ - evolution-data-server libseccomp networkmanager systemd From 194315fc2e4e9784fc194ca9cc97f624145938f2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 15:10:55 +0200 Subject: [PATCH 313/505] gnomeExtensions.gsconnect: Use GTK 4 variant of e-d-s It does not really matter since gsconnect does not use libedataserverui, only EBookContacts and EDataServer typelibs but we are aiming for not using gtk3 variant of e-d-s in GNOME closure. --- pkgs/desktops/gnome/extensions/gsconnect/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 5f915a4b5af8..7afa4d9859bc 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -13,6 +13,7 @@ , gtk3 , openssh , gnome +, evolution-data-server-gtk4 , gjs , nixosTests }: @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { gtk3 gsound gjs # for running daemon - gnome.evolution-data-server # for libebook-contacts typelib + evolution-data-server-gtk4 # for libebook-contacts typelib ]; mesonFlags = [ From a1baaa57da9d0c31a6073fcf7f2c3a173d77ce27 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 15:14:28 +0200 Subject: [PATCH 314/505] almanah: Use GTK 4 variant of e-d-s It does not really matter since almanah does not use libedataserverui, only libedataserver but we are aiming for not using gtk3 variant of e-d-s in GNOME closure. --- pkgs/applications/misc/almanah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index d2822bd122a9..3b27f5b96e30 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -5,7 +5,7 @@ , atk , cairo , desktop-file-utils -, evolution-data-server +, evolution-data-server-gtk4 , evolution , gcr_4 , gettext @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { buildInputs = [ atk cairo - evolution-data-server + evolution-data-server-gtk4 gcr_4 glib evolution From 3c1965e5b9f80b7e26b238fd4087b8f479ee7026 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 15:37:51 +0200 Subject: [PATCH 315/505] folks: Use GTK 4 variant of e-d-s It does not really matter since folks does not use libedataserverui, but we are aiming for not using gtk3 variant of e-d-s in GNOME ISO. --- 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 5a0596975bcb..41ede8b85a84 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -17,7 +17,7 @@ , nss , dbus , libgee -, evolution-data-server +, evolution-data-server-gtk4 , libsecret , db , python3 @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { buildInputs = [ db dbus-glib - evolution-data-server + evolution-data-server-gtk4 libsecret libsoup libxml2 From fed9f9420e6d4e99ba1365cb7553f75795179206 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 15:41:55 +0200 Subject: [PATCH 316/505] release-notes: Mention GNOME 43 --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 3 +++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 9e5d4bfd20d9..ef913cc95436 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -11,6 +11,13 @@ has the following highlights: + + + GNOME has been upgraded to 43. Please take a look at their + Release + Notes for details. + + During cross-compilation, tests are now executed if the test diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 47f3da3a435a..33065c90dd21 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -6,6 +6,9 @@ Support is planned until the end of June 2023, handing over to 23.05. In addition to numerous new and upgraded packages, this release has the following highlights: +- GNOME has been upgraded to 43. Please take a look at their [Release + Notes](https://release.gnome.org/43/) for details. + - During cross-compilation, tests are now executed if the test suite can be executed by the build platform. This is the case when doing “native” cross-compilation where the build and host platforms are largely the same, but the nixpkgs' cross From 10568866e050d1c0d517b9169349b17ee17f5327 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 31 Aug 2022 06:15:35 +0200 Subject: [PATCH 317/505] =?UTF-8?q?malcontent:=200.10.5=20=E2=86=92=200.11?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/pwithnall/malcontent/-/tags/0.11.0 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/malcontent/default.nix | 8 ++++---- pkgs/development/libraries/malcontent/ui.nix | 20 +++++++++++++------ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 4154f0315cd2..92ec23542883 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , gobject-introspection -, wrapGAppsHook +, wrapGAppsNoGuiHook , glib , coreutils , accountsservice @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.10.5"; + version = "0.11.0"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "sha256-UPKAStB6wTd3qbbISHMgNw1bJjIRgn89tHnsw4ZptvQ="; + sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA="; }; patches = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ninja pkg-config gobject-introspection - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix index e306267154ae..8969d1e13428 100644 --- a/pkgs/development/libraries/malcontent/ui.nix +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -4,14 +4,15 @@ , pkg-config , gobject-introspection , itstool -, wrapGAppsHook +, wrapGAppsHook4 , glib , accountsservice , dbus , flatpak , malcontent -, gtk3 -, appstream-glib +, gtk4 +, libadwaita +, appstream , desktop-file-utils , polkit , glib-testing @@ -39,11 +40,11 @@ stdenv.mkDerivation rec { gobject-introspection itstool desktop-file-utils - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - appstream-glib + appstream dbus polkit glib-testing @@ -54,7 +55,8 @@ stdenv.mkDerivation rec { accountsservice malcontent glib - gtk3 + gtk4 + libadwaita ]; mesonFlags = [ @@ -64,6 +66,12 @@ stdenv.mkDerivation rec { "-Dui=enabled" ]; + postPatch = '' + # https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148 + substituteInPlace build-aux/meson_post_install.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache + ''; + meta = with lib; { description = "UI components for parental controls library"; homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; From 3eff2a7606c397d6639d633c147be8b30fcc2761 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 16:05:51 +0200 Subject: [PATCH 318/505] gnome.epiphany: remove unused libnotify dependency It has not been needed since 3.37.1. Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/epiphany/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 68c86a5c32ea..2a7c0323e091 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -20,7 +20,6 @@ , glib-networking , libsecret , gnome-desktop -, libnotify , libarchive , p11-kit , sqlite @@ -90,7 +89,6 @@ stdenv.mkDerivation rec { libdazzle libhandy libportal-gtk3 - libnotify libarchive libsecret libsoup_3 From 977b55577d93703d55e3dfb4be865677131a1fce Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 16:07:54 +0200 Subject: [PATCH 319/505] =?UTF-8?q?appstream-glib:=200.7.18=20=E2=86=92=20?= =?UTF-8?q?0.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/hughsie/appstream-glib/compare/appstream_glib_0_7_18...appstream_glib_0_8_1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/appstream-glib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 5882805fdfc6..2e3a67af5ad8 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -14,7 +14,7 @@ , gtk3 , json-glib , libarchive -, libsoup +, curl , libuuid , libxslt , meson @@ -24,7 +24,7 @@ }: stdenv.mkDerivation rec { pname = "appstream-glib"; - version = "0.7.18"; + version = "0.8.1"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = "${lib.replaceStrings ["-"] ["_"] pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx"; + sha256 = "Qf0z9YTfjTiEr9OlK2BgOpVDtM2ozsiyjzO04O81zas="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { gtk3 json-glib libarchive - libsoup + curl libuuid ]; From ece83c3dc5ee400ebd3ccd6c22e171ccc9d3d477 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 21:31:25 +0000 Subject: [PATCH 320/505] =?UTF-8?q?gnome.devhelp:=2043.rc=20=E2=86=92=2043?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/devhelp/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/devtools/devhelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index 61be465c7304..55330921e267 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "43.rc"; + version = "43.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6RirnKpTBwZnxquzkgT6CJxOpVsnjL9lQWGptoykmQ0="; + sha256 = "Y87u/QU5LgIESIHvHs1yQpNVPaVzW378CCstE/6F3QQ="; }; nativeBuildInputs = [ From cd0c77e017ab09a641fa7bc46e2141b9e48f3e49 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 21:31:27 +0000 Subject: [PATCH 321/505] =?UTF-8?q?gnome.adwaita-icon-theme:=2043.beta.1?= =?UTF-8?q?=20=E2=86=92=2043?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/compare/43.beta.1...43 Changelog-Reviewed-By: Jan Tojnar --- 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 709be066231d..069d1d6040c4 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "43.beta.1"; + version = "43"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "b5x/Qd6ayqQqYtkFgvaCquJNuTR/jEnywM7F+ytRA8I="; + sha256 = "LjrHfTKmqlVUFV3zfo8KDdVPxaZf1yHojVBflw2jLsY="; }; nativeBuildInputs = [ From 0530435ac0ef6403edb0f1fdb0bf56c92bd5ed34 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 21:31:32 +0000 Subject: [PATCH 322/505] =?UTF-8?q?gnome.gdm:=2042.0=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdm/-/compare/42.0...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index 4eba9e959eeb..f1fbe7e49d30 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "42.0"; + version = "43.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "oyisl2k3vsF5lx/weCmhJGuYznJBgcEorjKguketOFU="; + sha256 = "lNcNbtffWfp/3k/QL+0RaFk6itzhD87hE8FI1Ss5IpQ="; }; mesonFlags = [ From 7ee1e7a0e7dd2f23bf33ba54c7840a442d01f6ca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 21:31:43 +0000 Subject: [PATCH 323/505] =?UTF-8?q?gnome.gnome-clocks:=2043.beta=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/compare/43.beta...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 17db7815bf06..488922f29100 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 = "43.beta"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+jVBJK4EaRNcegl8t3OGhU6Uz5UMieLPIM7k0V/jxXA="; + sha256 = "sHQ7cNAIgKo7zcx/fzTIwihiV7XIFzfU+YG8jE9PmB0="; }; nativeBuildInputs = [ From 0ae8b4bf5ee0685168807be95edc8366873c738b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 21:31:54 +0000 Subject: [PATCH 324/505] =?UTF-8?q?gnome.gnome-backgrounds:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/43.rc...43 Changelog-Reviewed-By: Jan Tojnar --- 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 cdd911dec266..61a367222b68 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "43.rc"; + version = "43"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0wjgCLh5FKh2EinEPdhgemRqBewMSXNmOG5cfvUxCG0="; + sha256 = "GfdJ2MN/hy8VW7aaK756yjgRdeaSnxmYBH13XLxjckQ="; }; patches = [ From 1ee6243826182ef8cf43803c5de9533a3d3f646e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 21:32:08 +0000 Subject: [PATCH 325/505] =?UTF-8?q?gnome.gnome-session:=2042.0=20=E2=86=92?= =?UTF-8?q?=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-session/-/compare/42.0...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 e595ac8481b4..dee4857325f6 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 = "42.0"; + version = "43.0"; outputs = [ "out" "sessions" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PMoGBTq2gpJpIJUafalfjMbXLadMaCxG0KBlMzKWnKo="; + sha256 = "P7mUlQE4XIwUYY548XjZUt+YrYyRCA9MXhVoxzk64fI="; }; patches = [ From f68f15a95c1864345560341c1f90d672a74cc817 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 21:38:46 +0000 Subject: [PATCH 326/505] =?UTF-8?q?gnome-photos:=2043.beta=20=E2=86=92=204?= =?UTF-8?q?3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-photos/-/compare/43.beta...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/graphics/gnome-photos/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index b1502320888b..ef731caf1a20 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -15,8 +15,6 @@ , gnome-online-accounts , gnome , gobject-introspection -, grilo -, grilo-plugins , gsettings-desktop-schemas , gtk3 , itstool @@ -36,13 +34,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "43.beta"; + version = "43.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6Qmo0sloFI/XFq9C0ub9neWVElmC9z2MR1xq4lshPt8="; + sha256 = "x6x0WNUz8p2VUBHHS3YiTXnqMbzBLp1tDOe2w3BNCOE="; }; patches = [ @@ -77,8 +75,6 @@ stdenv.mkDerivation rec { gexiv2 glib gnome-online-accounts - grilo - grilo-plugins gsettings-desktop-schemas gtk3 libdazzle From 609d4f315d7276de0b290700e3b6da3164482b9f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 Sep 2022 21:38:53 +0000 Subject: [PATCH 327/505] =?UTF-8?q?gnome-tour:=2043.beta=20=E2=86=92=2043.?= =?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/43.beta...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 3b3586b981d3..c7edd87d122d 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "43.beta"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-JCrfKeM2U+DycZdzhaBVubrvAxQNHu2rqA2CLbZGY3k="; + hash = "sha256-E1HkGWJ/vXx3GTKm7xrYDAvy5oKMSUigYgaJhN2zzIg="; }; cargoVendorDir = "vendor"; From 09cfb4f7a49cf0697367a4b93f0c9abcb025abdd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 10:14:21 +0000 Subject: [PATCH 328/505] =?UTF-8?q?evolution-data-server:=203.45.3=20?= =?UTF-8?q?=E2=86=92=203.46.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.45.3...3.46.0 Changelog-Reviewed-By: Jan Tojnar --- 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 a21a4bbcf2f7..73890d27a002 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.45.3"; + version = "3.46.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6uANOdV01l0EnJat8e4wMIeLLzMKZxNqstFVfM5KT/4="; + sha256 = "5fooCVoYP3q1qSjjWoKDebSB3e+D7Ux7UaLjxK71zas="; }; patches = [ From cfcfa9386ca98bbed2cedcdc8ea67bc2e795c772 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 21 Sep 2022 14:55:57 +0000 Subject: [PATCH 329/505] =?UTF-8?q?gjs:=201.73.2=20=E2=86=92=201.74.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.73.2...1.74.0 Changelog-Reviewed-By: Jan Tojnar --- 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 dacf50127fb9..6a24be2adbbb 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -32,13 +32,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.73.2"; + version = "1.74.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zyuEsXSgSckRpp7GGfTFymuW1gm+UgDKPbUTHJi+2nU="; + sha256 = "sha256-fWQYr2LMc1VqssJbSt9n9FI4q4kliI96VyUTWdTr7R4="; }; patches = [ From 89226091055445627b7fc22b62dd9a14dbbaa681 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 21 Sep 2022 14:56:58 +0000 Subject: [PATCH 330/505] =?UTF-8?q?gnome.simple-scan:=2042.1=20=E2=86=92?= =?UTF-8?q?=2042.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/simple-scan/-/compare/42.1...42.5 Changelog-Reviewed-By: Jan Tojnar --- 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 e656624c5c04..07910cd8c768 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 = "42.1"; + version = "42.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hZvAYRwXabW9q6ljne7TWfUEdMLuz1i7v9fOIZEbIiY="; + sha256 = "sha256-BfXfpOniBu+p1ATJhh3XxEIJF5PnNMQXGXOZFyUOQFA="; }; nativeBuildInputs = [ From 688e4ba749c12bdf569fdc573af4b82ee0c982b8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 21 Sep 2022 16:00:37 +0000 Subject: [PATCH 331/505] =?UTF-8?q?pangomm:=202.46.2=20=E2=86=92=202.46.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pangomm/-/compare/2.46.2...2.46.3 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/pangomm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 1fc5cea01de5..ccabdfdcfe8a 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.46.2"; + version= "2.46.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-V0QqtNwEOHe/44OZFXMastaT/GY0pxYUQi+1MMnqpvQ="; + sha256 = "sha256-QQ/gTUcaYI8/AnPToX2EAkHZEe0P8sdYqYWcZsbyQ3k="; }; outputs = [ "out" "dev" ]; From b85342857e68e706ffadb8a761a025b728bd4b44 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 21 Sep 2022 16:00:39 +0000 Subject: [PATCH 332/505] =?UTF-8?q?pango:=201.50.8=20=E2=86=92=201.50.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pango/-/compare/1.50.8...1.50.10 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/pango/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 6ce22a8c1c68..3b5af9d5ca99 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.8"; + version = "1.50.10"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "z2JvWd0UbAIxdMQDSSDpZn8dJawsFWlRbWMTbDESVfo="; + sha256 = "fl0vHkCFTSSposTQk7r+ddzb7M3x3kPkQ3My6r7WSWY="; }; depsBuildBuild = [ @@ -97,6 +97,8 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + # 1.90 is alpha for API 2. + freeze = true; }; }; From 6c51009e85c3ad90306571d24329edcb93e5ed91 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 21 Sep 2022 16:00:43 +0000 Subject: [PATCH 333/505] =?UTF-8?q?pangomm=5F2=5F48:=202.50.0=20=E2=86=92?= =?UTF-8?q?=202.50.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pangomm/-/compare/2.50.0...2.50.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/pangomm/2.48.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index cdc644ec9cd9..478378f64c27 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.50.0"; + version= "2.50.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-onqnfgF7mvzp51HYW9HPiQq7s6WL9Z0PrJF+74LbO1s="; + sha256 = "sha256-zMmSNBPkCMK/9jffZjJIMn1ygi8R45S0I+HFZSt9khQ="; }; nativeBuildInputs = [ From 1598bc05161786326a997f2586e885ca5a905b93 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 21 Sep 2022 16:00:46 +0000 Subject: [PATCH 334/505] =?UTF-8?q?python3.pkgs.pyatspi:=202.45.90=20?= =?UTF-8?q?=E2=86=92=202.46.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pyatspi2/-/compare/PYATSPI_2_45_90...PYATSPI_2_46_0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/python-modules/pyatspi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index b75da6de5263..7169a4022f63 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.45.90"; + version = "2.46.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "MOv4/BzWEyhzSlyzG2T2W5ozcVSZTfk6UJHXTh6M77k="; + sha256 = "1FSJzz1HqhULGjXolJs7MQNfjCB15YjSa278Yllwxi4="; }; nativeBuildInputs = [ pkg-config ]; From f85cf5297ad871387774f1c5df481f1c7da6aac2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 21 Sep 2022 20:58:55 +0200 Subject: [PATCH 335/505] =?UTF-8?q?libwpe:=201.12.3=20=E2=86=92=201.14.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://wpewebkit.org/release/libwpe-1.14.0.html https://github.com/WebPlatformForEmbedded/libwpe/compare/1.12.3...1.14.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libwpe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index d895574d527d..7f7b202576f6 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.12.3"; + version = "1.14.0"; src = fetchurl { - url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-uE/b+8hJzk/fCEuyi1jlRjsbS2zI8gDcd7QfhUXVMp0="; + url = "https://wpewebkit.org/releases/libwpe-${version}.tar.xz"; + sha256 = "wHMwW7rF9EAswcikdTv6PWOkCJAfhhggUeqlp13YnAA="; }; nativeBuildInputs = [ From b5a34147bf71883e154dd7df3a51f4cf05a68b97 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 21 Sep 2022 21:02:12 +0200 Subject: [PATCH 336/505] =?UTF-8?q?libwpe-fdo:=201.12.1=20=E2=86=92=201.14?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://wpewebkit.org/release/wpebackend-fdo-1.14.0.html https://github.com/Igalia/WPEBackend-fdo/compare/1.12.1...1.14.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libwpe/fdo.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index 736b408323dd..ce385f24c208 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.12.1"; + version = "1.14.0"; src = fetchurl { - url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-RaqDPETsKS8x+pQ7AbjMdeVOtiOte6amb8LxGP5p5ik="; + url = "https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz"; + sha256 = "51sMsscUVEhBboaWAT2Ig/Z1xmwR7XUOBoZe/sWAkVU="; }; depsBuildBuild = [ From bf4805d52375fe4f87f0e792d56cd3e4a86d0b84 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 22 Sep 2022 01:23:25 +0200 Subject: [PATCH 337/505] =?UTF-8?q?eiciel:=200.9.13.1=20=E2=86=92=200.10.0?= =?UTF-8?q?-rc2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/rofirrim/eiciel/releases/tag/0.10.0-rc1 https://github.com/rofirrim/eiciel/releases/tag/0.10.0-rc2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/tools/filesystems/eiciel/default.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix index 1e676dea77c7..bfec1dcf0993 100644 --- a/pkgs/tools/filesystems/eiciel/default.nix +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -3,16 +3,19 @@ , stdenv , acl , gnome -, gtkmm3 +, glibmm_2_68 +, gtkmm4 , meson , ninja , pkg-config -, wrapGAppsHook +, itstool +, wrapGAppsHook4 +, gtk4 }: stdenv.mkDerivation rec { pname = "eiciel"; - version = "0.9.13.1"; + version = "0.10.0-rc2"; outputs = [ "out" "nautilusExtension" ]; @@ -20,30 +23,32 @@ stdenv.mkDerivation rec { owner = "rofirrim"; repo = "eiciel"; rev = version; - sha256 = "0rhhw0h1hyg5kvxhjxkdz03vylgax6912mg8j4lvcz6wlsa4wkvj"; + sha256 = "+MXoT6J4tKuFaSvUTcM15cKWLUnS0kYgBfqH+5lz6KY="; }; nativeBuildInputs = [ meson ninja pkg-config - wrapGAppsHook + itstool + wrapGAppsHook4 + gtk4 ]; buildInputs = [ acl - gtkmm3 + glibmm_2_68 + gtkmm4 gnome.nautilus ]; mesonFlags = [ - "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0" + "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-4" ]; postPatch = '' + # https://github.com/rofirrim/eiciel/pull/9 substituteInPlace meson.build --replace "compiler.find_library('libacl')" "compiler.find_library('acl')" - chmod +x img/install_icons.sh - patchShebangs img/install_icons.sh ''; meta = with lib; { From 641f005bc5ae1a0dedc7ee68a893be8e8b67be4c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 22 Sep 2022 21:02:17 +0000 Subject: [PATCH 338/505] =?UTF-8?q?gnome.ghex:=2043.alpha=20=E2=86=92=2043?= =?UTF-8?q?.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/43.alpha...43.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/ghex/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 3c3925c0aef0..44e529abc7c3 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -16,18 +16,19 @@ , glib , atk , gobject-introspection +, vala , wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "ghex"; - version = "43.alpha"; + version = "43.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "tJttVHJ8Jmo22JQj0r+1OFB/aVU3Q2IoL8UiLMIxC48="; + sha256 = "yGQ+fwmzNkEqj39swLZU2NmysL5cA2W+jYkTHBU9M/M="; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { pkg-config gi-docgen gobject-introspection + vala wrapGAppsHook4 ]; @@ -56,6 +58,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + "-Dvapi=true" ] ++ lib.optionals stdenv.isDarwin [ # mremap does not exist on darwin "-Dmmap-buffer-backend=false" From a69e7fd7f42b969d26889f368568eb4a869d692f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 02:08:38 +0200 Subject: [PATCH 339/505] flatpak: clean up icon validation Merge the two patches and prevent symlinking `/usr` subdirs and binding `/run/current-system` paths. The `wrapGAppsHook` already sets the `GDK_PIXBUF_MODULE_FILE` environment variable pointing to a hermetic store path. When we re-exec the wrapped program (obtained from `/proc/self/exe`) in a sandbox, we need to pass the environment variable through. Also introduce a test for the icon validator to prevent future breakage. Expose the patch in passthru so that we can re-use it in xdg-desktop-portal. --- .../libraries/flatpak/bubblewrap-paths.patch | 15 --------- .../development/libraries/flatpak/default.nix | 28 ++++++++++------- .../flatpak/fix-icon-validation.patch | 31 +++++++++++++++++++ .../flatpak/validate-icon-pixbuf.patch | 13 -------- 4 files changed, 48 insertions(+), 39 deletions(-) delete mode 100644 pkgs/development/libraries/flatpak/bubblewrap-paths.patch create mode 100644 pkgs/development/libraries/flatpak/fix-icon-validation.patch delete mode 100644 pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch deleted file mode 100644 index e0b6df195893..000000000000 --- a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 9e885070..d02eeb8c 100644 ---- a/icon-validator/validate-icon.c -+++ b/icon-validator/validate-icon.c -@@ -156,8 +156,8 @@ rerun_in_sandbox (const char *arg_width, - "--unshare-ipc", - "--unshare-net", - "--unshare-pid", -- "--ro-bind", "/usr", "/usr", -- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", -+ "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind", "/run/current-system", "/run/current-system", - "--ro-bind", validate_icon, validate_icon, - NULL); - diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index c992a6b0dfa2..909cd7d6b42a 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -13,6 +13,7 @@ , xmlto , appstream-glib , substituteAll +, runCommand , bison , xdg-dbus-proxy , p11-kit @@ -51,7 +52,7 @@ , makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; version = "1.12.7"; @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { - url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; + url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; sha256 = "sha256-bbUqUxzieCgqx+v7mfZqC7PsyvROhkhEwslcHuW6kxY="; # Taken from https://github.com/flatpak/flatpak/releases/ }; @@ -80,12 +81,6 @@ stdenv.mkDerivation rec { p11kit = "${p11-kit.bin}/bin/p11-kit"; }) - # Adapt paths exposed to sandbox for NixOS. - (substituteAll { - src = ./bubblewrap-paths.patch; - inherit (builtins) storeDir; - }) - # Allow gtk-doc to find schemas using XML_CATALOG_FILES environment variable. # Patch taken from gtk-doc expression. ./respect-xml-catalog-files-var.patch @@ -94,8 +89,9 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch - # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. - ./validate-icon-pixbuf.patch + # The icon validator needs to access the gdk-pixbuf loaders in the Nix store + # and cannot bind FHS paths since those are not available on NixOS. + finalAttrs.passthru.icon-validator-patch ]; nativeBuildInputs = [ @@ -187,8 +183,18 @@ stdenv.mkDerivation rec { ''; passthru = { + icon-validator-patch = substituteAll { + src = ./fix-icon-validation.patch; + inherit (builtins) storeDir; + }; + tests = { installedTests = nixosTests.installed-tests.flatpak; + + validate-icon = runCommand "test-icon-validation" { } '' + ${finalAttrs.finalPackage}/libexec/flatpak-validate-icon --sandbox 512 512 ${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" + grep format=svg "$out" + ''; }; }; @@ -199,4 +205,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/flatpak/fix-icon-validation.patch b/pkgs/development/libraries/flatpak/fix-icon-validation.patch new file mode 100644 index 000000000000..0e4db2b162f1 --- /dev/null +++ b/pkgs/development/libraries/flatpak/fix-icon-validation.patch @@ -0,0 +1,31 @@ +--- a/icon-validator/validate-icon.c ++++ b/icon-validator/validate-icon.c +@@ -163,7 +163,7 @@ rerun_in_sandbox (const char *arg_width, + const char *arg_height, + const char *filename) + { +- const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" }; ++ const char * const usrmerged_dirs[] = { }; + int i; + g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free); + char validate_icon[PATH_MAX + 1]; +@@ -183,8 +183,7 @@ rerun_in_sandbox (const char *arg_width, + "--unshare-ipc", + "--unshare-net", + "--unshare-pid", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", validate_icon, validate_icon, + NULL); + +@@ -227,6 +226,9 @@ rerun_in_sandbox (const char *arg_width, + add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); + if (g_getenv ("G_MESSAGES_PREFIXED")) + add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); ++ if (g_getenv ("GDK_PIXBUF_MODULE_FILE")) ++ add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL); ++ + + add_args (args, validate_icon, arg_width, arg_height, filename, NULL); + g_ptr_array_add (args, NULL); diff --git a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch deleted file mode 100644 index 086114e11c30..000000000000 --- a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 9e885070..44fea035 100644 ---- a/icon-validator/validate-icon.c -+++ b/icon-validator/validate-icon.c -@@ -200,6 +200,8 @@ rerun_in_sandbox (const char *arg_width, - add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); - if (g_getenv ("G_MESSAGES_PREFIXED")) - add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); -+ if (g_getenv ("GDK_PIXBUF_MODULE_FILE")) -+ add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL); - - add_args (args, validate_icon, arg_width, arg_height, filename, NULL); - g_ptr_array_add (args, NULL); From 9121a522fdc31fb108e1e98ab66688eccc74cb53 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 03:26:17 +0200 Subject: [PATCH 340/505] xdg-desktop-portal: fix icon validation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Validation requires bubblewrap, but the current build system does not enforce it being present. Additionally, the validation itself needs to have thumbnailer Nix store paths available in sandbox. Let’s add a patch from Flatpak and introduce a test verifying it still works. This was probably broken since https://github.com/NixOS/nixpkgs/commit/c3b07a052fadf19bfa6b7a26e1c12125da4ef71d --- .../libraries/xdg-desktop-portal/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 05b0f5534481..438940f3bac6 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -3,9 +3,9 @@ , autoreconfHook , dbus , fetchFromGitHub -, fetchpatch , flatpak , fuse3 +, bubblewrap , systemdMinimal , geoclue2 , glib @@ -20,12 +20,12 @@ , python3 , pkg-config , stdenv -, substituteAll +, runCommand , wrapGAppsHook , enableGeoLocation ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal"; version = "1.15.0"; @@ -33,11 +33,21 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "flatpak"; - repo = pname; - rev = version; + repo = "xdg-desktop-portal"; + rev = finalAttrs.version; sha256 = "sha256-Kw3zJeGwPfw1fDo8HsgYmrpgCk/PUvWZPRloKJNAJVc="; }; + patches = [ + # The icon validator copied from Flatpak needs to access the gdk-pixbuf loaders + # in the Nix store and cannot bind FHS paths since those are not available on NixOS. + (runCommand "icon-validator.patch" { } '' + # Flatpak uses a different path + substitute "${flatpak.icon-validator-patch}" "$out" \ + --replace "/icon-validator/validate-icon.c" "/src/validate-icon.c" + '') + ]; + nativeBuildInputs = [ autoreconfHook libxml2 @@ -50,6 +60,7 @@ stdenv.mkDerivation rec { dbus flatpak fuse3 + bubblewrap systemdMinimal # libsystemd glib gsettings-desktop-schemas @@ -83,6 +94,11 @@ stdenv.mkDerivation rec { passthru = { tests = { installedTests = nixosTests.installed-tests.xdg-desktop-portal; + + validate-icon = runCommand "test-icon-validation" { } '' + ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --sandbox 512 512 ${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" + grep format=svg "$out" + ''; }; }; @@ -92,4 +108,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; -} +}) From d80a32db1e4d3b0b5e7646e84da30cb0343777d4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 12:28:25 +0800 Subject: [PATCH 341/505] =?UTF-8?q?flatpak:=201.12.7=20=E2=86=92=201.14.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/flatpak/compare/1.12.7...1.14.0 Co-Authored-By: Jan Tojnar --- .../development/libraries/flatpak/default.nix | 21 +++-- .../libraries/flatpak/fix-test-paths.patch | 89 +++++++++---------- .../libraries/flatpak/no-breaking-fish.patch | 11 +++ 3 files changed, 68 insertions(+), 53 deletions(-) create mode 100644 pkgs/development/libraries/flatpak/no-breaking-fish.patch diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 909cd7d6b42a..d79923c0f81a 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -11,14 +11,15 @@ , libxslt , pkg-config , xmlto -, appstream-glib , substituteAll , runCommand , bison , xdg-dbus-proxy , p11-kit +, appstream , bubblewrap , bzip2 +, curl , dbus , glib , gpgme @@ -33,9 +34,8 @@ , shared-mime-info , desktop-file-utils , gtk3 -, fuse +, fuse3 , nixosTests -, libsoup , xz , zstd , ostree @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.12.7"; + version = "1.14.0"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-bbUqUxzieCgqx+v7mfZqC7PsyvROhkhEwslcHuW6kxY="; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-jidpc3cOok3fJZetSuzTa5g5PmvekeSOF0OqymfyeBU="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ @@ -89,6 +89,10 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch + # Do not clear XDG_DATA_DIRS in fish shell + # https://github.com/flatpak/flatpak/pull/5123 + ./no-breaking-fish.patch + # The icon validator needs to access the gdk-pixbuf loaders in the Nix store # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch @@ -106,14 +110,15 @@ stdenv.mkDerivation (finalAttrs: { libxslt pkg-config xmlto - appstream-glib bison wrapGAppsNoGuiHook ]; buildInputs = [ + appstream bubblewrap bzip2 + curl dbus dconf gpgme @@ -121,14 +126,13 @@ stdenv.mkDerivation (finalAttrs: { libarchive libcap libseccomp - libsoup xz zstd polkit python3 systemd xorg.libXau - fuse + fuse3 gsettings-desktop-schemas glib-networking librsvg # for flatpak-validate-icon @@ -152,6 +156,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; configureFlags = [ + "--with-curl" "--with-system-bubblewrap=${bubblewrap}/bin/bwrap" "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy" "--with-dbus-config-dir=${placeholder "out"}/share/dbus-1/system.d" diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index dcba66681858..683cdbcaf18c 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,8 +1,8 @@ diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c -index 43fd0563..4067bd36 100644 +index 3f5d8a1f..79493e61 100644 --- a/app/flatpak-builtins-build-export.c +++ b/app/flatpak-builtins-build-export.c -@@ -458,7 +458,7 @@ validate_desktop_file (GFile *desktop_file, +@@ -464,7 +464,7 @@ validate_desktop_file (GFile *desktop_file, subprocess = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE | G_SUBPROCESS_FLAGS_STDERR_PIPE | G_SUBPROCESS_FLAGS_STDERR_MERGE, @@ -12,10 +12,10 @@ index 43fd0563..4067bd36 100644 { if (!g_error_matches (local_error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT)) diff --git a/tests/libtest.sh b/tests/libtest.sh -index acb2095b..b361da16 100644 +index 36d39ac4..3ad2c7a6 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -431,7 +431,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then +@@ -511,7 +511,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then # running installed-tests: assume we know what we're doing _flatpak_bwrap_works=true elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -24,7 +24,7 @@ index acb2095b..b361da16 100644 _flatpak_bwrap_works=false else _flatpak_bwrap_works=true -@@ -504,7 +504,7 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ +@@ -591,7 +591,7 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -33,20 +33,20 @@ index acb2095b..b361da16 100644 assert_not_reached "Failed to start dbus-daemon" fi -@@ -519,7 +519,7 @@ commit_to_path () { +@@ -606,7 +606,7 @@ commit_to_path () { } cleanup () { - /bin/kill -9 $DBUS_SESSION_BUS_PID + @coreutils@/bin/kill -9 $DBUS_SESSION_BUS_PID - gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true - fusermount -u $XDG_RUNTIME_DIR/doc || : + gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye >&2 || true + fusermount -u $XDG_RUNTIME_DIR/doc >&2 || : kill $(jobs -p) &> /dev/null || true diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh -index 612f914f..4b890da2 100755 +index afa11a6b..5b12055f 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh -@@ -151,13 +151,13 @@ msgid "Hello world" +@@ -190,13 +190,13 @@ msgid "Hello world" msgstr "Hallo Welt" EOF mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES @@ -60,10 +60,10 @@ index 612f914f..4b890da2 100755 -msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po +@gettext@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po - flatpak build-finish ${DIR} + flatpak build-finish ${DIR} >&2 mkdir -p repos diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh -index af289625..7db51c17 100755 +index 4ba950df..fd50fab3 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh @@ -28,9 +28,10 @@ EOF @@ -80,7 +80,7 @@ index af289625..7db51c17 100755 ln -s ../lib ${DIR}/usr/lib64 @@ -40,40 +41,17 @@ if test -f /sbin/ldconfig.real; then else - cp `which ldconfig` ${DIR}/usr/bin + cp "$(type -P ldconfig)" "${DIR}/usr/bin" fi -LIBS=`mktemp` -BINS=`mktemp` @@ -106,8 +106,8 @@ index af289625..7db51c17 100755 -} - for i in $@ bash ls cat echo readlink socat; do -- I=`which $i` -- add_bin $I +- I=$(type -P "$i") +- add_bin "$I" -done -for i in `cat $BINS`; do - #echo Adding binary $i 1>&2 @@ -116,16 +116,16 @@ index af289625..7db51c17 100755 -for i in `cat $LIBS`; do - #echo Adding library $i 1>&2 - cp "$i" ${DIR}/usr/lib/ -+ I=$(readlink -f $(which $i)) -+ [ -e ${DIR}/usr/bin/$i ] && continue ++ I=$(readlink -f "$(type -P "$i")") ++ [ -e "${DIR}/usr/bin/$i" ] && continue + requisites=$(nix-store --query --requisites "$I") + for r in $requisites; do + # a single store item can be needed by multiple paths, no need to copy it again -+ if [ ! -e ${DIR}/$r ]; then -+ cp -r $r ${DIR}/$r ++ if [ ! -e "${DIR}/$r" ]; then ++ cp -r "$r" "${DIR}/$r" + fi + done -+ ln -s $I ${DIR}/usr/bin/$i ++ ln -s "$I" "${DIR}/usr/bin/$i" done ln -s bash ${DIR}/usr/bin/sh @@ -141,18 +141,18 @@ index af289625..7db51c17 100755 +# We do not copy C.UTF8 locale because it is in locale archive and +# that is already copied with glibc. + -+mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store -+chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed -+find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths -+find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets ++mv "${DIR}/nix/store" "${DIR}/usr/store" # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store ++chmod -R u+w "${DIR}" # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed ++find "${DIR}" -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths ++find "${DIR}" -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets if [ x$COLLECTION_ID != x ]; then collection_args=--collection-id=${COLLECTION_ID} diff --git a/tests/testlibrary.c b/tests/testlibrary.c -index 509ce6cc..6a333c9c 100644 +index 831d85c1..ae4f03d0 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -1399,7 +1399,7 @@ check_bwrap_support (void) +@@ -1601,7 +1601,7 @@ check_bwrap_support (void) { gint exit_code = 0; char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", @@ -162,44 +162,43 @@ index 509ce6cc..6a333c9c 100644 g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); diff --git a/triggers/desktop-database.trigger b/triggers/desktop-database.trigger -index 2188f535..d8283061 100755 +index 1037466d..c4c7ed6d 100755 --- a/triggers/desktop-database.trigger +++ b/triggers/desktop-database.trigger @@ -1,5 +1,5 @@ #!/bin/sh --if test \( -x "$(which update-desktop-database 2>/dev/null)" \) -a \( -d $1/exports/share/applications \); then -- exec update-desktop-database -q $1/exports/share/applications -+if test \( -d $1/exports/share/applications \); then -+ exec @dfu@/bin/update-desktop-database -q $1/exports/share/applications +-if command -v update-desktop-database >/dev/null && test -d "$1/exports/share/applications"; then +- exec update-desktop-database -q "$1/exports/share/applications" ++if test -d "$1/exports/share/applications"; then ++ exec @dfu@/bin/update-desktop-database -q "$1/exports/share/applications" fi diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger -index 711cfab2..07baa2ac 100755 +index d9fc8251..d8ddb96e 100755 --- a/triggers/gtk-icon-cache.trigger +++ b/triggers/gtk-icon-cache.trigger @@ -1,10 +1,10 @@ #!/bin/sh --if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d $1/exports/share/icons/hicolor \); then -- cp /usr/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/ -+if test \( -d $1/exports/share/icons/hicolor \); then -+ cp @hicolorIconTheme@/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/ - for dir in $1/exports/share/icons/*; do - if test -f $dir/index.theme; then -- if ! gtk-update-icon-cache --quiet $dir; then -+ if ! @gtk3@/bin/gtk-update-icon-cache --quiet $dir; then + if command -v gtk-update-icon-cache >/dev/null && test -d "$1/exports/share/icons/hicolor"; then +- cp /usr/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" ++ cp @hicolorIconTheme@/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" + for dir in "$1"/exports/share/icons/*; do + if test -f "$dir/index.theme"; then +- if ! gtk-update-icon-cache --quiet "$dir"; then ++ if ! @gtk3@/bin/gtk-update-icon-cache --quiet "$dir"; then echo "Failed to run gtk-update-icon-cache for $dir" exit 1 fi diff --git a/triggers/mime-database.trigger b/triggers/mime-database.trigger -index 2067d8ec..a49a8777 100755 +index 10ddbbb3..c270998a 100755 --- a/triggers/mime-database.trigger +++ b/triggers/mime-database.trigger @@ -1,5 +1,5 @@ #!/bin/sh --if test \( -x "$(which update-mime-database 2>/dev/null)" \) -a \( -d $1/exports/share/mime/packages \); then -- exec update-mime-database $1/exports/share/mime -+if test \( -d $1/exports/share/mime/packages \); then -+ exec @smi@/bin/update-mime-database $1/exports/share/mime +-if command -v update-mime-database >/dev/null && test -d "$1/exports/share/mime/packages"; then +- exec update-mime-database "$1/exports/share/mime" ++if test -d "$1/exports/share/mime/packages"; then ++ exec @smi@/bin/update-mime-database "$1/exports/share/mime" fi diff --git a/pkgs/development/libraries/flatpak/no-breaking-fish.patch b/pkgs/development/libraries/flatpak/no-breaking-fish.patch new file mode 100644 index 000000000000..2a67aead1201 --- /dev/null +++ b/pkgs/development/libraries/flatpak/no-breaking-fish.patch @@ -0,0 +1,11 @@ +--- a/profile/flatpak.fish ++++ b/profile/flatpak.fish +@@ -1,7 +1,7 @@ + if type -q flatpak + # Set XDG_DATA_DIRS to include Flatpak installations + +- set -x --path XDG_DATA_DIRS ++ set -x --path XDG_DATA_DIRS $XDG_DATA_DIRS + + set -q XDG_DATA_DIRS[1]; or set XDG_DATA_DIRS /usr/local/share /usr/share + set -q XDG_DATA_HOME; or set -l XDG_DATA_HOME $HOME/.local/share From 58ed9b3b2a387f1bfcfc9c1525e0c4c76fcc33aa Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 14:08:20 +0800 Subject: [PATCH 342/505] ostree: Build with libcurl http backend instead of libsoup https://salsa.debian.org/debian/ostree/-/commit/53261afd32e3772e9ee1484432f6bbb16c38500f --- pkgs/tools/misc/ostree/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 06176efb01e7..42f44c356e8e 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -8,6 +8,7 @@ , gobject-introspection , gjs , nixosTests +, curl , glib , systemd , xz @@ -85,6 +86,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ + curl glib systemd e2fsprogs @@ -108,6 +110,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--with-curl" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators" "--enable-installed-tests" From 8499247e8cef808d70b79360bf3264f9ac997173 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 10:05:13 +0800 Subject: [PATCH 343/505] libchamplain: Format with nixpkgs-fmt --- .../libraries/libchamplain/default.nix | 48 ++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 20609509b66d..119e7ec5ecca 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,5 +1,22 @@ -{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome -, clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: +{ fetchurl +, lib +, stdenv +, meson +, ninja +, vala +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, pkg-config +, glib +, gtk3 +, cairo +, sqlite +, gnome +, clutter-gtk +, libsoup +, gobject-introspection /*, libmemphis */ +}: stdenv.mkDerivation rec { pname = "libchamplain"; @@ -12,11 +29,28 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; - buildInputs = [ sqlite libsoup ]; + buildInputs = [ + sqlite + libsoup + ]; - propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk ]; + propagatedBuildInputs = [ + glib + gtk3 + cairo + clutter-gtk + ]; mesonFlags = [ "-Dgtk_doc=true" @@ -44,7 +78,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - maintainers = teams.gnome.members; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + maintainers = teams.gnome.members; + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } From 5364f7c7ec04285ec95f3fa9b547c4f8b3395f29 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 10:11:23 +0800 Subject: [PATCH 344/505] libchamplain_libsoup3: init --- .../libraries/libchamplain/default.nix | 17 +++++++++++++++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 119e7ec5ecca..34440d67818d 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , lib , stdenv , meson @@ -15,7 +16,9 @@ , gnome , clutter-gtk , libsoup +, libsoup_3 , gobject-introspection /*, libmemphis */ +, withLibsoup3 ? false }: stdenv.mkDerivation rec { @@ -27,6 +30,16 @@ stdenv.mkDerivation rec { sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"; }; + patches = lib.optionals withLibsoup3 [ + # Port to libsoup3 + # https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch"; + excludes = [ ".gitlab-ci.yml" ]; + sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk="; + }) + ]; + outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ @@ -42,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite - libsoup + (if withLibsoup3 then libsoup_3 else libsoup) ]; propagatedBuildInputs = [ @@ -78,7 +91,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - maintainers = teams.gnome.members; + maintainers = teams.gnome.members ++ teams.pantheon.members; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f06a91b7e05..12e2296f3869 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19615,6 +19615,8 @@ with pkgs; libchamplain = callPackage ../development/libraries/libchamplain { }; + libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; }; + libchardet = callPackage ../development/libraries/libchardet { }; libchewing = callPackage ../development/libraries/libchewing { }; From 0cce06c632bcf5c10abaf93db7db31dbaedfba1e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 10:14:25 +0800 Subject: [PATCH 345/505] pantheon.switchboard-plug-onlineaccounts: Fix build with evolution-data-server 3.46 --- .../switchboard-plugs/onlineaccounts/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index a3d8d049e3b1..7b9fb8bf6989 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -10,9 +11,7 @@ , glib , granite , gtk3 -, libgdata , libhandy -, sqlite , switchboard }: @@ -27,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-Q/vvXKyeedn5o7HnL9F5ixSjJS3OWrvvHbzvx2fW2qY="; }; + patches = [ + # build: support evolution-data-server 3.45 + # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch"; + sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -39,9 +47,7 @@ stdenv.mkDerivation rec { glib granite gtk3 - libgdata libhandy - sqlite # needed for camel-1.2 switchboard ]; From c4c899062a4516af3c54373e674c60679a0044f8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 10:16:16 +0800 Subject: [PATCH 346/505] pantheon.elementary-mail: Fix build with evolution-data-server 3.46 --- .../pantheon/apps/elementary-mail/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 1dc000f66adf..879f1f8bd919 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -10,10 +11,8 @@ , gtk3 , libxml2 , libhandy -, webkitgtk +, webkitgtk_4_1 , folks -, libgdata -, sqlite , glib-networking , granite , evolution-data-server @@ -32,6 +31,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4="; }; + patches = [ + # build: fix documentation build + # https://github.com/elementary/mail/pull/795 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/52a422cb1c5f061d8a683005e44da0a1c2195096.patch"; + sha256 = "sha256-ndcIZXvmQbM/31Wtm6OSCnXdMYx+OlJrqV+baq6m+KY="; + }) + # build: support webkit2gtk-4.1 + # https://github.com/elementary/mail/pull/794 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch"; + sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk="; + }) + ]; + nativeBuildInputs = [ libxml2 meson @@ -48,11 +62,9 @@ stdenv.mkDerivation rec { glib-networking granite gtk3 - libgdata libgee libhandy - sqlite - webkitgtk + webkitgtk_4_1 ]; postPatch = '' From bb97eab688d2469d5d1df67f9483575ead3c06ce Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 10:26:05 +0800 Subject: [PATCH 347/505] pantheon.elementary-calendar: Fix build with evolution-data-server 3.46 --- .../apps/elementary-calendar/default.nix | 22 +++++-- .../partly-revert-pr-301.patch | 57 +++++++++++++++++++ 2 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 1984a6ebbe24..9f5613fcd22e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -12,10 +13,10 @@ , evolution-data-server , folks , geoclue2 -, geocode-glib +, geocode-glib_2 , granite , gtk3 -, libchamplain +, libchamplain_libsoup3 , libgee , libhandy , libical @@ -32,6 +33,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-c2c8QNifBDzb0CelB72AIL4G694l6KCSXBjWIHrzZJo="; }; + patches = [ + # build: support evolution-data-server 3.46 + # https://github.com/elementary/calendar/pull/758 + (fetchpatch { + url = "https://github.com/elementary/calendar/commit/62c20e5786accd68b96c423b04e32c043e726cac.patch"; + sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio="; + }) + + # Workaround for showing date numbers (TODO: should try to fix upstream) + # https://github.com/elementary/calendar/issues/756#issuecomment-1252400047 + ./partly-revert-pr-301.patch + ]; + nativeBuildInputs = [ meson ninja @@ -46,10 +60,10 @@ stdenv.mkDerivation rec { evolution-data-server folks geoclue2 - geocode-glib + geocode-glib_2 granite gtk3 - libchamplain + libchamplain_libsoup3 libgee libhandy libical diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch b/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch new file mode 100644 index 000000000000..0de31ee6365d --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch @@ -0,0 +1,57 @@ +diff --git a/src/Grid/Grid.vala b/src/Grid/Grid.vala +index 61706fc8..9b69fc14 100644 +--- a/src/Grid/Grid.vala ++++ b/src/Grid/Grid.vala +@@ -215,7 +215,7 @@ public class Grid : Gtk.Grid { + + day.in_current_month = new_date.get_month () == month_start.get_month (); + +- day.date = new_date; ++ day.update_date (new_date); + return day; + } + +diff --git a/src/Grid/GridDay.vala b/src/Grid/GridDay.vala +index 3e59cb7b..df04fe6f 100644 +--- a/src/Grid/GridDay.vala ++++ b/src/Grid/GridDay.vala +@@ -35,6 +35,7 @@ public class Maya.View.GridDay : Gtk.EventBox { + public bool draw_left_border = true; + private VAutoHider event_box; + private GLib.HashTable event_buttons; ++ Gtk.Label label; + + public bool in_current_month { + set { +@@ -79,7 +80,7 @@ public class Maya.View.GridDay : Gtk.EventBox { + style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + style_context.add_class ("cell"); + +- var label = new Gtk.Label (""); ++ label = new Gtk.Label (""); + label.halign = Gtk.Align.END; + label.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + label.margin = EVENT_MARGIN; +@@ -100,10 +101,6 @@ public class Maya.View.GridDay : Gtk.EventBox { + + Gtk.TargetEntry dnd = {"binary/calendar", 0, 0}; + Gtk.drag_dest_set (this, Gtk.DestDefaults.MOTION, {dnd}, Gdk.DragAction.MOVE); +- +- this.notify["date"].connect (() => { +- label.label = date.get_day_of_month ().to_string (); +- }); + } + + public override bool drag_drop (Gdk.DragContext context, int x, int y, uint time_) { +@@ -174,6 +171,11 @@ public class Maya.View.GridDay : Gtk.EventBox { + event_buttons.remove_all (); + } + ++ public void update_date (DateTime date) { ++ this.date = date; ++ label.label = date.get_day_of_month ().to_string (); ++ } ++ + public void set_selected (bool selected) { + if (selected) { + set_state_flags (Gtk.StateFlags.SELECTED, true); From c2f3c315abd0317a4a1787157b2702fd08bc45a9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 13:39:42 +0800 Subject: [PATCH 348/505] pantheon.wingpanel-indicator-datetime: Workaround for showing date numbers --- .../wingpanel-indicators/datetime/default.nix | 4 ++ .../datetime/partly-revert-pr-150.patch | 40 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 3f7408d9dff3..c884dd2d247d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; elementary_calendar = elementary-calendar; }) + + # Workaround for showing date numbers (TODO: should try to fix upstream) + # https://github.com/elementary/calendar/issues/756#issuecomment-1252400047 + ./partly-revert-pr-150.patch ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch new file mode 100644 index 000000000000..766c1dda29f7 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch @@ -0,0 +1,40 @@ +diff --git a/src/Widgets/calendar/Grid.vala b/src/Widgets/calendar/Grid.vala +index e440306..21a631a 100644 +--- a/src/Widgets/calendar/Grid.vala ++++ b/src/Widgets/calendar/Grid.vala +@@ -229,7 +229,7 @@ namespace DateTime.Widgets { + day.sensitive_container (false); + } + +- day.date = new_date; ++ day.update_date (new_date); + + return day; + } +diff --git a/src/Widgets/calendar/GridDay.vala b/src/Widgets/calendar/GridDay.vala +index 8602875..7bd6140 100644 +--- a/src/Widgets/calendar/GridDay.vala ++++ b/src/Widgets/calendar/GridDay.vala +@@ -79,10 +79,6 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox { + button_press_event.connect (on_button_press); + key_press_event.connect (on_key_press); + +- notify["date"].connect (() => { +- label.label = date.get_day_of_month ().to_string (); +- }); +- + component_dots = new Gee.HashMap (); + } + +@@ -124,6 +120,11 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox { + } + } + ++ public void update_date (GLib.DateTime date) { ++ this.date = date; ++ label.label = date.get_day_of_month ().to_string (); ++ } ++ + public void set_selected (bool selected) { + if (selected) { + set_state_flags (Gtk.StateFlags.SELECTED, true); From 35dffb9f9362de07619bc6a560d0c391e3be54f1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 10:27:09 +0800 Subject: [PATCH 349/505] pantheon.elementary-tasks: Mark as broken Does not build with e-d-s 3.45+ / libsoup 3 and porting is likely not easy. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-tasks/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 90a8787ed227..5c0203224e13 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -285,7 +285,7 @@ in elementary-music elementary-photos elementary-screenshot - elementary-tasks + # elementary-tasks elementary-terminal elementary-videos epiphany diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index 7efd7e99da28..cd82dba99bfe 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.tasks"; + broken = true; # https://github.com/elementary/tasks/issues/340 }; } From 97fb1648562a3c295926a85a1a17a66a0e5e0a44 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Sep 2022 20:47:39 +0800 Subject: [PATCH 350/505] elementary-planner: Mark as broken Does not build with e-d-s 3.45+ / libsoup 3 and porting is likely not easy. --- pkgs/applications/office/elementary-planner/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 54ad0753c72e..1d0b06db248f 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "com.github.alainm23.planner"; + broken = true; # https://github.com/alainm23/planner/issues/928 }; } From 25875d75bcce22fb1a615d4bb8e09e5505bc5a96 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 15:41:58 +0200 Subject: [PATCH 351/505] =?UTF-8?q?gnome-console:=2043.rc=20=E2=86=92=2042?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is a regression in VTE for GTK 4, let’s downgrade to a version using GTK 3. https://gitlab.gnome.org/GNOME/vte/-/issues/2584 This reverts commit 71439b7977ec205fa9e2d1dec8e0a768d8d88b94. This reverts commit 36c49c22cfc22cde5003f91496f7c982abedbf68. Also disable Nautilus extension since it is now part of Nautilus itself. --- .../gnome-console/default.nix | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 98a2c44a26bc..85ee654a989a 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -1,49 +1,67 @@ { lib , stdenv , fetchurl +, fetchpatch , gettext , gnome , libgtop -, gtk4 -, libadwaita +, gtk3 +, libhandy , pcre2 -, vte-gtk4 +, vte , appstream-glib , desktop-file-utils +, git , meson , ninja , pkg-config , python3 -, wrapGAppsHook4 +, sassc +, wrapGAppsHook , nixosTests }: stdenv.mkDerivation rec { pname = "gnome-console"; - version = "43.rc"; + # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved! + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "DCLFqoO+3qxYxYGCBBSrBPuzeOUmKzDKT0+Qqg4SLiw="; + sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk="; }; + patches = [ + (fetchpatch { + name = "fix-clang-build-issues.patch"; + url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch"; + sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs="; + }) + ]; + buildInputs = [ gettext libgtop - gtk4 - libadwaita + gtk3 + libhandy pcre2 - vte-gtk4 + vte ]; nativeBuildInputs = [ appstream-glib desktop-file-utils + git meson ninja pkg-config python3 - wrapGAppsHook4 + sassc + wrapGAppsHook + ]; + + mesonFlags = [ + "-Dnautilus=disabled" ]; passthru = { From 924f16384a84a7a9da48f5fca9fcc9a9efe57fb5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 15:00:55 +0000 Subject: [PATCH 352/505] =?UTF-8?q?gnome.gnome-contacts:=2043.rc=20?= =?UTF-8?q?=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 4a1847126090..760af24880c4 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "43.rc"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Hoyo2nF429WpIQJVBkokvdwz35WFx1hOExBxTJprjco="; + sha256 = "VbYd9+k/Cr4f+kZeGOPF3k9JqQ8mjqnRHtyGrwbQceE="; }; nativeBuildInputs = [ From f2f9a443d181666b904159b05ca09029847a282d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 15:04:08 +0000 Subject: [PATCH 353/505] =?UTF-8?q?gnome-builder:=2043.rc=20=E2=86=92=2043?= =?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-builder/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- 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 d24b198fa65a..260ad39db42c 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.rc"; + version = "43.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cwz588t4cZxQxnTldzXwf8mHYmctxU211nVfR75VKqI="; + sha256 = "YVhRGdgPtw2juBcCSdMiODnzBRpsqNnO+hmPALR0pY8="; }; patches = [ From 74673eb4646294cde89e7849d8c2e2c8713776bf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 15:04:30 +0000 Subject: [PATCH 354/505] =?UTF-8?q?gtksourceview5:=205.6.0=20=E2=86=92=205?= =?UTF-8?q?.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.6.0...5.6.1 Changelog-Reviewed-By: Jan Tojnar --- 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 94e87db5b25d..25bd8127a546 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.6.0"; + version = "5.6.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DKPfHSr2G942CNDT8jPkpB+Vjirlm5/CCcPfYQLor90="; + sha256 = "ZZ2cydA0oRTwfn4TTugNd97ASXyxUWrlNpEZwvy52hY="; }; patches = [ From 322a1bd247ba0931ce99843d3ad54d437764d3be Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 15:05:23 +0000 Subject: [PATCH 355/505] =?UTF-8?q?orca:=2043.beta=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_43_BETA...ORCA_43_0 Changelog-Reviewed-By: Jan Tojnar --- 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 078a0c45eac8..29cdac6b8d16 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "43.beta"; + version = "43.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "7Mks/WaZ7nvaS1+SVmrzzx1UJjAO9K/nG/yMMa6LbPU="; + sha256 = "HKdaAMSoUSoJ5KJuszn615RNHtQayjL3D2lickQhglA="; }; patches = [ From 449eb2e0b5265bfb2a9c954a88cf1cbfc0be6599 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 20:43:35 +0200 Subject: [PATCH 356/505] =?UTF-8?q?gnome.geary:=20fix=20libsoup2=20=C3=97?= =?UTF-8?q?=20libsoup3=20conflict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/misc/geary/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index db79db65cb1f..0398ecf36222 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -26,7 +26,7 @@ , itstool , libgee , gnome -, webkitgtk +, webkitgtk_4_1 , python3 , gnutls , cacert @@ -68,6 +68,21 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644.patch"; sha256 = "sha256-1ADQqKm3DxtjDGPSThq3c7s5S+q/3u/qr9JQEsLaFMI="; }) + + # Remove libsoup2 dependency. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/geary/-/commit/1c1912d0061bb59525b870767d08b16c09acc8da.patch"; + sha256 = "TIL7scp4LGAKJ3kmWEHHwIABQTHpOFSmtPom4MkMKtk="; + }) + + # Prevent libsoup2 × libsoup3 conflict. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/geary/-/commit/796845aaa7148076132af0ff074e9218d0c3f8b8.patch"; + sha256 = "6ZLa8A75RpsXEVMb9bNUiXJSnOvBI1EOok4xzt5m9HU="; + excludes = [ + "org.gnome.Geary.json" + ]; + }) ]; nativeBuildInputs = [ @@ -108,7 +123,7 @@ stdenv.mkDerivation rec { libstemmer libytnef sqlite - webkitgtk + webkitgtk_4_1 ]; checkInputs = [ From ff6ea28a40c0e7a041b94d79f1b87540c24000a4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 22:48:21 +0200 Subject: [PATCH 357/505] gnomeExtensions.gsconnect: Update Nautilus extension for 43 --- pkgs/desktops/gnome/extensions/gsconnect/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 7afa4d9859bc..b86b295afbcd 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , substituteAll , openssl , gsound @@ -40,6 +42,12 @@ stdenv.mkDerivation rec { # Allow installing installed tests to a separate output ./installed-tests-path.patch + + # Update extension for Nautilus 43. + (fetchpatch { + url = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/commit/9723ea9102f07c2c60fa065184cc58c2bc260abf.patch"; + sha256 = "9afy/70AwW+OYML5J5IyBBiNKWkZ+wZZryZbi4uRfs4="; + }) ]; nativeBuildInputs = [ From b472389892cc533403ea5cc913ac03286c69cee9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 23:37:46 +0200 Subject: [PATCH 358/505] tootle: mark broken Broken with recent vala and unmaintained. --- pkgs/applications/misc/tootle/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 48b1b2d57e05..422cf8ea7623 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bleakgrey/tootle"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; + broken = true; }; } From 1702f37b39e8747389a8a80c7ad307f75130aedc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 23:40:23 +0200 Subject: [PATCH 359/505] valum: mark as broken --- pkgs/development/web/valum/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index a11e0f4cb975..caf29a2cc027 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -21,5 +21,8 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ ]; + # Likely broken by GLib 2.74 switch to PCRE 2. + # https://github.com/valum-framework/valum/issues/238 + broken = true; }; } From 39ae9caf09887de6260e96f568ebac9bc2d7ee3d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 23:45:30 +0200 Subject: [PATCH 360/505] vala-language-server: mark broken --- pkgs/development/tools/vala-language-server/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix index 87f7ce588f8e..b033581b75f2 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/vala-language-server/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/vala-lang/vala-language-server"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ andreasfelix ]; + # Likely broken by GLib 2.74 switch to PCRE 2. + # https://github.com/vala-lang/vala-language-server/issues/263 + broken = true; platforms = platforms.linux; }; } From ee2cbd86a0d78fda4dad81863cad6de17bcede9f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Sep 2022 00:40:36 +0200 Subject: [PATCH 361/505] dropbox-cli: update extension for Nautilus 43 --- pkgs/applications/networking/dropbox/cli.nix | 6 + .../networking/dropbox/nautilus-43.patch | 195 ++++++++++++++++++ 2 files changed, 201 insertions(+) create mode 100644 pkgs/applications/networking/dropbox/nautilus-43.patch diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index ffbf42715f53..c6b0baa9d3f6 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,5 +1,6 @@ { lib, stdenv , substituteAll +, autoreconfHook , pkg-config , fetchurl , python3 @@ -28,6 +29,10 @@ stdenv.mkDerivation { strictDeps = true; patches = [ + # Fix extension for Nautilus 43 + # https://github.com/dropbox/nautilus-dropbox/pull/105 + ./nautilus-43.patch + (substituteAll { src = ./fix-cli-paths.patch; inherit dropboxd; @@ -35,6 +40,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ + autoreconfHook pkg-config gobject-introspection gdk-pixbuf diff --git a/pkgs/applications/networking/dropbox/nautilus-43.patch b/pkgs/applications/networking/dropbox/nautilus-43.patch new file mode 100644 index 000000000000..b4b557843197 --- /dev/null +++ b/pkgs/applications/networking/dropbox/nautilus-43.patch @@ -0,0 +1,195 @@ +diff --git a/configure.ac b/configure.ac +index 025289c..42b49fa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h) + #AC_PROG_INTLTOOL([0.29]) + + # Dependency checks +-NAUTILUS_REQUIRED=2.16.0 ++NAUTILUS_REQUIRED=43.rc + GLIB_REQUIRED=2.14.0 + + # Used programs +@@ -26,8 +26,11 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then + AC_MSG_ERROR(you need to have pkgconfig installed !) + fi + +-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED) ++PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension-4 >= $NAUTILUS_REQUIRED) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) ++PKG_CHECK_MODULES(GTK, gtk4 >= 4.6.0) ++ ++AC_SUBST(GTK_CFLAGS) + + AC_PATH_PROG([PYTHON3], [python3]) + +@@ -84,10 +87,10 @@ AC_MSG_CHECKING([for nautilus extension directory]) + if test -n "$with_nautilus_extension_dir"; then + NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir + else +- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` ++ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension-4` + fi + if test -z "$NAUTILUS_EXTENSION_DIR"; then +- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0' ++ NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-4' + fi + + AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 15d6687..c521ec5 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,6 +13,7 @@ libnautilus_dropbox_la_CFLAGS = \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(NAUTILUS_CFLAGS) \ ++ $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) + + if DEBUG +diff --git a/src/dropbox.c b/src/dropbox.c +index 0d59559..8162aa9 100644 +--- a/src/dropbox.c ++++ b/src/dropbox.c +@@ -27,9 +27,6 @@ + + #include + +-#include +-#include +- + #include "nautilus-dropbox.h" + + static GType type_list[1]; +@@ -41,9 +38,6 @@ nautilus_module_initialize (GTypeModule *module) { + nautilus_dropbox_register_type (module); + type_list[0] = NAUTILUS_TYPE_DROPBOX; + +- dropbox_use_nautilus_submenu_workaround +- = (NAUTILUS_VERSION_MAJOR < 2 || +- (NAUTILUS_VERSION_MAJOR == 2 && NAUTILUS_VERSION_MINOR <= 22)); + dropbox_use_operation_in_progress_workaround = TRUE; + } + +diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c +index c75ccbf..b9c10b4 100644 +--- a/src/nautilus-dropbox.c ++++ b/src/nautilus-dropbox.c +@@ -37,9 +37,7 @@ + #include + #include + +-#include +-#include +-#include ++#include + + #include "g-util.h" + #include "dropbox-command-client.h" +@@ -49,7 +47,7 @@ + static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable"}; + gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL }; + +-gboolean dropbox_use_nautilus_submenu_workaround; ++ + gboolean dropbox_use_operation_in_progress_workaround; + + static GType dropbox_type = 0; +@@ -630,13 +628,6 @@ nautilus_dropbox_parse_menu(gchar **options, + g_object_set_property (G_OBJECT(item), "sensitive", &sensitive); + } + +- /* taken from nautilus-file-repairer (http://repairer.kldp.net/): +- * this code is a workaround for a bug of nautilus +- * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */ +- if (dropbox_use_nautilus_submenu_workaround) { +- toret = g_list_append(toret, item); +- } +- + g_object_unref(item); + g_string_free(new_action_string, TRUE); + ret++; +@@ -661,7 +652,6 @@ get_file_items_callback(GHashTable *response, gpointer ud) + + static GList * + nautilus_dropbox_get_file_items(NautilusMenuProvider *provider, +- GtkWidget *window, + GList *files) + { + /* +@@ -778,14 +768,13 @@ add_emblem_paths(GHashTable* emblem_paths_response) + + gchar **emblem_paths_list; + int i; +- +- GtkIconTheme *theme = gtk_icon_theme_get_default(); ++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); + + if (emblem_paths_response && + (emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path"))) { + for (i = 0; emblem_paths_list[i] != NULL; i++) { + if (emblem_paths_list[i][0]) +- gtk_icon_theme_append_search_path(theme, emblem_paths_list[i]); ++ gtk_icon_theme_add_search_path(theme, emblem_paths_list[i]); + } + } + g_hash_table_unref(emblem_paths_response); +@@ -804,15 +793,14 @@ remove_emblem_paths(GHashTable* emblem_paths_response) + goto exit; + + // We need to remove the old paths. +- GtkIconTheme * icon_theme = gtk_icon_theme_get_default(); + gchar ** paths; +- gint path_count; ++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); + +- gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count); ++ paths = gtk_icon_theme_get_search_path(theme); + + gint i, j, out = 0; + gboolean found = FALSE; +- for (i = 0; i < path_count; i++) { ++ for (i = 0; paths[i] != NULL; i++) { + gboolean keep = TRUE; + for (j = 0; emblem_paths_list[j] != NULL; j++) { + if (emblem_paths_list[j][0]) { +@@ -834,7 +822,7 @@ remove_emblem_paths(GHashTable* emblem_paths_response) + accomodate the changes */ + if (found) { + paths[out] = NULL; /* Clear the last one */ +- gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out); ++ gtk_icon_theme_set_search_path(theme, (const gchar **)paths); + } + + g_strfreev(paths); +@@ -888,13 +876,13 @@ on_disconnect(NautilusDropbox *cvs) { + + + static void +-nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderIface *iface) { ++nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderInterface *iface) { + iface->get_file_items = nautilus_dropbox_get_file_items; + return; + } + + static void +-nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderIface *iface) { ++nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderInterface *iface) { + iface->update_file_info = nautilus_dropbox_update_file_info; + iface->cancel_update = nautilus_dropbox_cancel_update; + return; +diff --git a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h +index 65734be..44faa27 100644 +--- a/src/nautilus-dropbox.h ++++ b/src/nautilus-dropbox.h +@@ -27,7 +27,7 @@ + #include + #include + +-#include ++#include + + #include "dropbox-command-client.h" + #include "nautilus-dropbox-hooks.h" From c3e4064b74813ccf07ab45824fca94e028bb31dd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 26 Jun 2022 03:37:12 +0000 Subject: [PATCH 362/505] endeavour: rename from gnome.gnome-todo --- .../misc/endeavour}/default.nix | 10 +++++----- pkgs/desktops/gnome/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-todo => applications/misc/endeavour}/default.nix (90%) diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/applications/misc/endeavour/default.nix similarity index 90% rename from pkgs/desktops/gnome/apps/gnome-todo/default.nix rename to pkgs/applications/misc/endeavour/default.nix index 1f905dcc7c1f..18ff848fbcd7 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/applications/misc/endeavour/default.nix @@ -26,13 +26,13 @@ }: stdenv.mkDerivation rec { - pname = "gnome-todo"; + pname = "endeavour"; version = "unstable-2022-06-12"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "gnome-todo"; + owner = "World"; + repo = "Endeavour"; rev = "ad4e15f0b58860caf8c6d497795b83b594a9c3e5"; sha256 = "HRufLoZou9ssQ/qoDG8anhOAtl8IYvFpyjq/XJlsotQ="; }; @@ -82,13 +82,13 @@ stdenv.mkDerivation rec { passthru = { updateScript = unstableGitUpdater { - url = "https://gitlab.gnome.org/GNOME/gnome-todo.git"; + url = "https://gitlab.gnome.org/World/Endeavour.git"; }; }; meta = with lib; { description = "Personal task manager for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Todo"; + homepage = "https://gitlab.gnome.org/World/Endeavour"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 1169bae6d67e..b8d48cf12fd5 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -178,8 +178,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; - gnome-todo = callPackage ./apps/gnome-todo {}; - gnome-weather = callPackage ./apps/gnome-weather { }; polari = callPackage ./apps/polari { }; @@ -269,6 +267,7 @@ lib.makeScope pkgs.newScope (self: with self; { #### 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 + gnome-todo = pkgs.endeavour; # added 2022-07-30 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12e2296f3869..5f1553367ae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27758,6 +27758,8 @@ with pkgs; inherit (gnome) empathy; + endeavour = callPackage ../applications/misc/endeavour { }; + enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; entangle = callPackage ../applications/video/entangle { From 31094866d6e637dcab24e8c0f9b530944ca2e226 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 30 Jul 2022 12:11:32 +0800 Subject: [PATCH 363/505] =?UTF-8?q?endeavour:=20unstable-2022-06-12=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/World/Endeavour/-/compare/f50c981b4d6875d5...v42.0 --- pkgs/applications/misc/endeavour/default.nix | 34 ++++++++++++-------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/endeavour/default.nix b/pkgs/applications/misc/endeavour/default.nix index 18ff848fbcd7..3c48efe66c47 100644 --- a/pkgs/applications/misc/endeavour/default.nix +++ b/pkgs/applications/misc/endeavour/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , wrapGAppsHook4 , gettext , gnome @@ -22,19 +21,19 @@ , librest , json-glib , itstool -, unstableGitUpdater +, gitUpdater }: stdenv.mkDerivation rec { pname = "endeavour"; - version = "unstable-2022-06-12"; + version = "42.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Endeavour"; - rev = "ad4e15f0b58860caf8c6d497795b83b594a9c3e5"; - sha256 = "HRufLoZou9ssQ/qoDG8anhOAtl8IYvFpyjq/XJlsotQ="; + rev = "v${version}"; + sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ="; }; patches = [ @@ -45,6 +44,20 @@ stdenv.mkDerivation rec { extraPrefix = ""; name = "gnome-todo_meson-build.patch"; }) + + # build: Fix building with -Werror=format-security + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch"; + sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo="; + }) + + # build: Use GNOME module post_install() + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/135 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/a8daa1d8acd0a5da7aef54d6e16d8a585c71e555.patch"; + sha256 = "sha256-zUTQ36eUMOY9ODAgwSKUhSlB9Cj0Yu/60KjFFW5fx2I="; + }) ]; nativeBuildInputs = [ @@ -52,7 +65,6 @@ stdenv.mkDerivation rec { ninja pkg-config gettext - python3 wrapGAppsHook4 itstool ]; @@ -75,14 +87,10 @@ stdenv.mkDerivation rec { json-glib # todoist ]; - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py - patchShebangs build-aux/meson/meson_post_install.py - ''; - passthru = { - updateScript = unstableGitUpdater { - url = "https://gitlab.gnome.org/World/Endeavour.git"; + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; }; }; From 134814a8d47b655b1b3b7a92b776a99bdb30ba71 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Sep 2022 00:46:59 +0200 Subject: [PATCH 364/505] chatty: mark as broken --- .../networking/instant-messengers/chatty/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index fc9c4c10b218..9728ea65c361 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -87,5 +87,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; + # Requires upgrade to libsoup3 + broken = true; }; } From 8ce317d389928daf0588ec011555dad4e067634c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Sep 2022 14:01:56 +0200 Subject: [PATCH 365/505] =?UTF-8?q?gnomeExtensions.dash-to-dock:=2073=20?= =?UTF-8?q?=E2=86=92=2074?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/micheleg/dash-to-dock/compare/extensions.gnome.org-v73...extensions.gnome.org-v74 --- pkgs/desktops/gnome/extensions/dash-to-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index f6d21c246530..5f3a2943f812 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "73"; + version = "74"; # Temporarily switched to commit hash because stable version is buggy. src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-v${version}"; - sha256 = "/NOJWjotfYPujS5G7/zv1OLzfSW0MB+oIRsx9/LSEdA="; + sha256 = "3WNm9kX76+qmn9KWLSKwxmHHpc21kWHrBW9266TOKZ0="; }; nativeBuildInputs = [ From e88b0155b6899fa70f42124930428dacb0e2cf56 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Sep 2022 12:29:53 +0000 Subject: [PATCH 366/505] =?UTF-8?q?gnome.gnome-logs:=2043.beta=20=E2=86=92?= =?UTF-8?q?=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-logs/-/compare/gnome-logs-43.beta...gnome-logs-43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-logs/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index 2d2ec94dcc08..61cc39d61dfe 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -23,19 +23,22 @@ stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "43.beta"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "naBuiFhl7dG/vPILLU6HwVAGUXKdZW//E77pNlCTldQ="; + sha256 = "M6k7l17CfISHglBIqnuK99XCNWWrz3t0yQKrez7CCGE="; }; patches = [ # Remove GTK 3 depndency # https://gitlab.gnome.org/GNOME/gnome-logs/-/merge_requests/46 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/f7fe4b6ff9f5ab70919b6747f95e38d0d48685b8.patch"; - sha256 = "yZY7qYWkJrArqeu1E2xxbJnPggaxOG3sk7212PqMcpo="; + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/32193a1385b95012bc8e7007ada89566bd63697d.patch"; + sha256 = "5WsTnfVpWZquU65pSLnk2M6VnY+qQPUi7A0cqMmzfrU="; + postFetch = '' + substituteInPlace "$out" --replace "43.1" "43.0" + ''; }) ]; From 69297187cf3a65ccd74a273b5fdc4ae72a36aff8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Sep 2022 15:01:40 +0200 Subject: [PATCH 367/505] =?UTF-8?q?libgweather:=204.1.0=20=E2=86=92=204.2.?= =?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/-/compare/4.1.0...4.2.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libgweather/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index bf2b6beac3de..0dfa6b91a79f 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , libxml2 +, json-glib , glib , gettext , libsoup_3 @@ -19,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "4.1.0"; + version = "4.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ALuJmOO5qQXzqNMpX8wVZS1rCc2l76Ik5nRN7Xq9plo="; + sha256 = "r4qBLaDYl2oADh1iVywlYIaoFzI/vzWwZtv92NLKYgM="; }; patches = [ @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { glib libsoup_3 libxml2 + json-glib geocode-glib_2 ]; @@ -64,7 +66,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs build-aux/meson/meson_post_install.py patchShebangs build-aux/meson/gen_locations_variant.py # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) From 1a5ed6aef347263bf1a0890b39b938834ebc61f0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Sep 2022 17:44:29 +0200 Subject: [PATCH 368/505] =?UTF-8?q?gnome.gpaste:=2042.1=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.imagination-land.org/posts/2022-09-27-gpaste-43.0-released.html https://github.com/Keruspe/GPaste/compare/v42.1...v43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/misc/gpaste/default.nix | 24 +++++---------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index 058499bf8245..bc54591ebd65 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -22,40 +22,26 @@ }: stdenv.mkDerivation rec { - version = "42.1"; + version = "43.0"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-A5NZ4NiPVZUr7vPdDuNywLsLrejZ4SCg7+3//ZNRmLY="; + sha256 = "sha256-F+AWTYVK145RzJ1Zldh4Q4R/hN/D7aXO3SIJ1t6ClWs="; }; patches = [ ./fix-paths.patch - # Fix GNOME 43 compatibility. - (fetchpatch { - url = "https://github.com/Keruspe/GPaste/commit/eece9c374a823234bc20e58bf95bb10ace9590f4.patch"; - sha256 = "+GoiNsge+ki2X3OIoFA+r3K8WLN00nExYj8gDuCSNiA="; - }) - (fetchpatch { - url = "https://github.com/Keruspe/GPaste/commit/614bbe65e7d8f2ddca447daaada86156334bb71a.patch"; - sha256 = "q6fjBTVRx6/5xf5ZhQJpvnwvroLiNxF73P7vTFTmNqI="; - }) - (fetchpatch { - url = "https://github.com/Keruspe/GPaste/commit/971e690a74b4de6b78bdaf1300507a6190ffb474.patch"; - sha256 = "bCLnuLqLgq7BlZN49NFrQjbCJBneVHl1t+WnAAIofkY="; - }) + # Build against GCR 4. + # Patch was temporarily reverted. + # https://github.com/Keruspe/GPaste/pull/409 (fetchpatch { url = "https://github.com/Keruspe/GPaste/commit/0378cb4a657042ce5321f1d9728cff31e55bede6.patch"; sha256 = "0Ngr+/fS5/wICR84GEiE0pXEXQ/f/3G59lDivH167m8="; }) - (fetchpatch { - url = "https://github.com/Keruspe/GPaste/commit/6d29385f8c935b1def28340bc165ca6a7756f29b.patch"; - sha256 = "crkkIrLwogRzr1JfJEt5TPK65Y4zY1H5Gt+s0z3A8Dg="; - }) ]; # TODO: switch to substituteAll with placeholder From 05a70bf0a9ccbf0ccb7c65f90771f3d7628a99b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Sep 2022 15:53:08 +0000 Subject: [PATCH 369/505] =?UTF-8?q?gnome-builder:=2043.0=20=E2=86=92=2043.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/43.0...43.1 Changelog-Reviewed-By: Jan Tojnar --- 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 260ad39db42c..16305438448e 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.0"; + version = "43.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "YVhRGdgPtw2juBcCSdMiODnzBRpsqNnO+hmPALR0pY8="; + sha256 = "ID07bSgwroj7dBMNzzvr1dtvh7BsvNE5M/CG5DkCI7Y="; }; patches = [ From c737f113067b5f5bd118c027d5b4a0b9db5e2068 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 25 Sep 2022 07:33:26 +1000 Subject: [PATCH 370/505] gnome.mutter: fixup color-device: Don't create profiles from obvious garbage data --- pkgs/desktops/gnome/core/mutter/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 6e1c254a49b2..4c2aded0492a 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -65,6 +65,15 @@ let self = stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; }) + + # color-device: Don't create profiles from obvious garbage data + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2627 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2627.patch"; + sha256 = "SafC29+gjcj6JswHY6yuwcOS16LPYvFwYW1TEpNNSHc="; + }) + + ]; mesonFlags = [ From 226d9e02d198d4bf4d1e5124bbc304c454eed7d3 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Tue, 27 Sep 2022 12:37:07 +0800 Subject: [PATCH 371/505] blackbox-terminal: init at 0.12.0 --- .../blackbox-terminal/default.nix | 72 +++++++++++++++++++ .../blackbox-terminal/marble.nix | 45 ++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 119 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/blackbox-terminal/default.nix create mode 100644 pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix new file mode 100644 index 000000000000..67a719d01170 --- /dev/null +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchurl +, meson +, ninja +, pkg-config +, vala +, gtk4 +, vte-gtk4 +, json-glib +, sassc +, libadwaita +, pcre2 +, libxml2 +, librsvg +, callPackage +, python3 +, gtk3 +, desktop-file-utils +, wrapGAppsHook +}: + +let + marble = callPackage ./marble.nix { }; +in +stdenv.mkDerivation rec { + pname = "blackbox"; + version = "0.12.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "raggesilver"; + repo = "blackbox"; + rev = "v${version}"; + sha256 = "sha256-8u4qHC8+3rKDFNdg5kI48dBgAm3d6ESXN5H9aT/nIBY="; + }; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + sassc + wrapGAppsHook + python3 + gtk3 # For gtk-update-icon-cache + desktop-file-utils # For update-desktop-database + ]; + buildInputs = [ + gtk4 + vte-gtk4 + json-glib + marble + libadwaita + pcre2 + libxml2 + librsvg + ]; + + meta = with lib; { + description = "Beautiful GTK 4 terminal"; + homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix new file mode 100644 index 000000000000..6d100c0894e4 --- /dev/null +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, gtk4 +, gtk3 +, desktop-file-utils +}: + +stdenv.mkDerivation { + pname = "marble"; + version = "unstable-2022-04-20"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "raggesilver"; + repo = "marble"; + # Latest commit from the 'wip/gtk4' branch + rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8"; + sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gtk3 # For gtk-update-icon-cache + desktop-file-utils # For update-desktop-database + gobject-introspection # For g-ir-compiler + ]; + buildInputs = [ gtk4 ]; + + meta = with lib; { + description = "Raggesilver's GTK library"; + homepage = "https://gitlab.gnome.org/raggesilver/marble"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f1553367ae1..0e385912683b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1819,6 +1819,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; + blackbox-terminal = callPackage ../applications/terminal-emulators/blackbox-terminal { }; + contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { fmt = fmt_8; }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; From df76d94d4af0ffe46af3d307e80fbbd2d0a89d2b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 30 Sep 2022 16:31:42 +0000 Subject: [PATCH 372/505] =?UTF-8?q?gnome.geary:=2040.0=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/geary/-/compare/40.0...43.0 gnome.geary: 40.0 → 43.0 https://gitlab.gnome.org/GNOME/geary/-/compare/gnome-40.0...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/misc/geary/default.nix | 42 +++------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index 0398ecf36222..cb7726d59069 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , gtk3 , vala @@ -48,43 +47,13 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "40.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik"; + sha256 = "SJFm+H3Z0pAR9eW3lpTyWItHP34ZHFnOkBPIyODjY+c="; }; - patches = [ - # Fix accessibility issues with initializer of constants (Fix build with vala 0.56) - # https://gitlab.gnome.org/GNOME/geary/-/merge_requests/720 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.patch"; - sha256 = "sha256-mSms0MOfw8xHxOrEQwrIv+d4h01xLPgyvX2oWmmFQVw="; - }) - # Util.Cache.Lru: Workaround missing generic type argument (Fix build with vala 0.56) - # https://gitlab.gnome.org/GNOME/geary/-/merge_requests/721 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644.patch"; - sha256 = "sha256-1ADQqKm3DxtjDGPSThq3c7s5S+q/3u/qr9JQEsLaFMI="; - }) - - # Remove libsoup2 dependency. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geary/-/commit/1c1912d0061bb59525b870767d08b16c09acc8da.patch"; - sha256 = "TIL7scp4LGAKJ3kmWEHHwIABQTHpOFSmtPom4MkMKtk="; - }) - - # Prevent libsoup2 × libsoup3 conflict. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geary/-/commit/796845aaa7148076132af0ff074e9218d0c3f8b8.patch"; - sha256 = "6ZLa8A75RpsXEVMb9bNUiXJSnOvBI1EOok4xzt5m9HU="; - excludes = [ - "org.gnome.Geary.json" - ]; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -142,12 +111,9 @@ stdenv.mkDerivation rec { # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa postPatch = '' - chmod +x build-aux/post_install.py build-aux/git_version.py + chmod +x build-aux/git_version.py - patchShebangs build-aux/post_install.py build-aux/git_version.py - - chmod +x build-aux/yaml_to_json.py - patchShebangs build-aux/yaml_to_json.py + patchShebangs build-aux/git_version.py chmod +x desktop/geary-attach ''; From e623569e6a00e945069eb609f3e509b235b3de71 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 30 Sep 2022 16:32:52 +0000 Subject: [PATCH 373/505] =?UTF-8?q?gspell:=201.11.1=20=E2=86=92=201.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gspell/-/compare/1.11.1...1.12.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 9592fd116766..f27e0e7be60a 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "gspell"; - version = "1.11.1"; + version = "1.12.0"; outputs = [ "out" "dev" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "72qk4/cRd1FYp+JBpfgJzyQmvA4Cwjp9K1xx/D3gApI="; + sha256 = "QNKFDxu26HdSRvoeOUOLNsqvvbraHSihn6HKB+H/gq0="; }; patches = [ From dcd9db4408ae0c2cbdd265f7f35ca718865f5fb4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Oct 2022 20:06:41 +0000 Subject: [PATCH 374/505] =?UTF-8?q?gnome.gnome-applets:=203.44.0=20?= =?UTF-8?q?=E2=86=92=203.46.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.44.0...3.46.0 Changelog-Reviewed-By: Jan Tojnar --- 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 a03b356c21f3..5620310e8a51 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.44.0"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "MDlifKknGeSAWH1yT0aXEJw9Em7BUPFPOy4Gkk2576c="; + sha256 = "TwRjyoDzCUA4WzCcHmkCWIxx2XFQxlQOg083Tk0nrPc="; }; nativeBuildInputs = [ From ff5713f2f93dfce22cff8077fdc90462f70a2f44 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Oct 2022 20:07:03 +0000 Subject: [PATCH 375/505] =?UTF-8?q?gnome.gnome-panel:=203.44.0=20=E2=86=92?= =?UTF-8?q?=203.46.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.44.0...3.46.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/misc/gnome-panel/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index 0b107f23d78d..503fc34bae87 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -1,12 +1,11 @@ { stdenv , lib , fetchurl -, fetchpatch , autoreconfHook , dconf , evolution-data-server , gdm -, geocode-glib +, geocode-glib_2 , gettext , glib , gnome-desktop @@ -26,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.44.0"; + version = "3.46.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-mWVfddAxh2wTDtI8TaIsCZ57zEBIsCVaPDo7vHh7Mao="; + hash = "sha256-zsehG3DFJLXo121Nfk2DXuYHq9outC9N92GeYusGrrE="; }; patches = [ @@ -40,13 +39,6 @@ stdenv.mkDerivation rec { # instead of gnome-panel’s libdir so that the NixOS module can make gnome-panel # load modules from other packages as well. ./modulesdir-env-var.patch - - # Add missing geocode-glib-1.0 dependency - # https://gitlab.gnome.org/GNOME/gnome-panel/-/merge_requests/49 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-panel/-/commit/f58a43ec4649a25f1a762b36e1401b81cd2b214b.patch"; - sha256 = "sha256-DFqaNUjkLh4xd81qgQpl+568eUZeWyF8LxdZoTgMfCQ="; - }) ]; # make .desktop Exec absolute @@ -79,7 +71,7 @@ stdenv.mkDerivation rec { dconf evolution-data-server gdm - geocode-glib + geocode-glib_2 glib gnome-desktop gnome-menus From aa616364b9375c619c002442aceaa0a2ba849c5b Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 3 Oct 2022 22:13:45 +0200 Subject: [PATCH 376/505] libsoup_3: fix gnome-maps crashes --- pkgs/development/libraries/libsoup/3.x.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index efc960f21793..af7d640b6de1 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , glib , meson , ninja @@ -31,6 +32,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-KDI3BpjKj5+/F0w0W3PYm2BWEQOmJsLfcHJrBwf3m9M="; }; + # https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/310 + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libsoup/-/commit/0fae143dc8b0e668b7a35a9c1364009e7cf06d0f.patch"; + sha256 = "sha256-yAKC7WGk0aQxMkT4At6Qfx1QO2InNotITrl/Lim41Jk="; + }) + ]; + nativeBuildInputs = [ meson ninja From d86b3713f15f62bba9f9f31cc71b7462f8090e70 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 3 Oct 2022 22:15:21 +0200 Subject: [PATCH 377/505] glib: fix gimp text editing crashes --- pkgs/development/libraries/glib/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f288bdf03ea6..45d8ee69a022 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -107,6 +107,12 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2867 ./tests-skip-shared-libs-if-default_library-static.patch + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2921 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/f0dd96c28751f15d0703b384bfc7c314af01caa8.patch"; + sha256 = "sha256-8ucHS6ZnJuP6ajGb4/L8QfhC49FTQG1kAGHVdww/YYE="; + }) + ./skip-timer-test.patch ]; From 571d8e44bf78251cadbc394e65faec75eecc8460 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Oct 2022 03:46:18 +0200 Subject: [PATCH 378/505] tdesktop: switch to webkitgtk_4_1 To reduce the number of WebKits in closure. webkitgtk_4_1 should be the most common one in GNOME now. webkitgtk_5_0 is still unstable. --- .../instant-messengers/telegram/tdesktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 530e9377828b..a820e4e01505 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -28,7 +28,7 @@ , tl-expected , hunspell , glibmm -, webkitgtk +, webkitgtk_4_1 , jemalloc , rnnoise , abseil-cpp @@ -93,7 +93,7 @@ env.mkDerivation rec { substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ - --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"' + --replace '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' ''; # We want to run wrapProgram manually (with additional parameters) @@ -131,7 +131,7 @@ env.mkDerivation rec { tl-expected hunspell glibmm - webkitgtk + webkitgtk_4_1 jemalloc rnnoise tg_owt From 919fc66e9d4d5b9698bb095fc515734941cc3d8b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Oct 2022 03:46:19 +0200 Subject: [PATCH 379/505] gnome.yelp: switch to webkitgtk_4_1 To reduce the number of WebKits in closure. webkitgtk_4_1 should be the most common one in GNOME now. --- pkgs/desktops/gnome/core/yelp/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index a6020dbafaa6..ee76194433c3 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -2,7 +2,7 @@ , stdenv , gettext , fetchurl -, webkitgtk +, webkitgtk_4_1 , pkg-config , gtk3 , libhandy @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gtk3 libhandy glib - webkitgtk + webkitgtk_4_1 sqlite libxml2 libxslt @@ -46,10 +46,6 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good ]; - # To reduce the GNOME ISO closure size. Remove when other packages - # are using webkit2gtk_4_1. - configureFlags = ["--with-webkit2gtk-4-0"]; - passthru = { updateScript = gnome.updateScript { packageName = "yelp"; From 29d570122bdcac89854426fbb671d93f432838e8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Oct 2022 03:46:19 +0200 Subject: [PATCH 380/505] glade: switch to webkitgtk_4_1 To reduce the number of WebKits in closure. webkitgtk_4_1 should be the most common one in GNOME now. --- pkgs/development/tools/glade/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 48a66cbad4d2..b7803843c345 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -9,7 +9,7 @@ , gtk3 , glib , gjs -, webkitgtk +, webkitgtk_4_1 , gobject-introspection , wrapGAppsHook , itstool @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gtk3 glib gjs - webkitgtk + webkitgtk_4_1 libxml2 python3 python3.pkgs.pygobject3 @@ -58,6 +58,11 @@ stdenv.mkDerivation rec { gnome.adwaita-icon-theme ]; + postPatch = '' + substituteInPlace meson.build \ + --replace 'webkit2gtk-4.0' 'webkit2gtk-4.1' + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 64c94e66ac422828fdb6c9e95fa7c2b626eba471 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Oct 2022 21:38:21 +0000 Subject: [PATCH 381/505] =?UTF-8?q?gnome.ghex:=2043.rc=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/43.rc...43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/ghex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 44e529abc7c3..f1072dde8db3 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "43.rc"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "yGQ+fwmzNkEqj39swLZU2NmysL5cA2W+jYkTHBU9M/M="; + sha256 = "hmwGIsZv21rSpHXpz8zLIZocZDHwCayyKR1D8hQLFH4="; }; nativeBuildInputs = [ From d258f6fef875580bbd745c112e69b306e31c46ef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Oct 2022 21:38:35 +0000 Subject: [PATCH 382/505] =?UTF-8?q?gnome.gnome-flashback:=203.45.1=20?= =?UTF-8?q?=E2=86=92=203.46.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.45.1...3.46.0 Changelog-Reviewed-By: Jan Tojnar --- .../desktops/gnome/misc/gnome-flashback/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 292418b5e7fd..cdebb3628bac 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -4,7 +4,7 @@ , fetchurl , gettext , glib -, gnome-bluetooth_1_0 +, gnome-bluetooth , gnome-desktop , gnome-panel , gnome-session @@ -31,7 +31,7 @@ }: let pname = "gnome-flashback"; - version = "3.45.1"; + version = "3.46.0"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: @@ -62,7 +62,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "sha256-flUlRhAtuqH9f2t/JEYx53N+MSX1OkcBnRog+Jh0++U="; + sha256 = "sha256-eo1cAzEOTfrdGKZeAKN3QQMq/upUGN1oBKl1xLCYAEU="; }; # make .desktop Execs absolute @@ -73,11 +73,6 @@ let -Exec=gnome-flashback +Exec=$out/bin/gnome-flashback END_PATCH - - # The stable release has version 43, which compares lower than 43.alpha. - # https://gitlab.gnome.org/GNOME/gnome-flashback/-/issues/83 - substituteInPlace configure configure.ac \ - --replace "gnome-desktop-3.0 >= 43.alpha" "gnome-desktop-3.0 >= 43" ''; postInstall = '' @@ -100,7 +95,7 @@ let buildInputs = [ glib - gnome-bluetooth_1_0 + gnome-bluetooth gnome-desktop gsettings-desktop-schemas gtk3 From 5e5d9256e784d43afce44ac55894f2eff4ea869e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Oct 2022 21:39:00 +0000 Subject: [PATCH 383/505] =?UTF-8?q?gnome.metacity:=203.44.0=20=E2=86=92=20?= =?UTF-8?q?3.46.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/metacity/-/compare/3.44.0...3.46.0 Changelog-Reviewed-By: Jan Tojnar --- 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 ef3e31f1032f..460dbfdb38bf 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.44.0"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "GcPF150hcfRbqg9jLMiZX4YHvxIxoWAUQ5usm6Flp8A="; + sha256 = "S6d36ThUe/zL+azKCWdXTEZkMCLgVMk6AzQZyzzHwew="; }; patches = [ From 6d5da1d8bcd8dde42ba41f7d5034bc8299a67bb2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Oct 2022 21:39:18 +0000 Subject: [PATCH 384/505] =?UTF-8?q?gnome-builder:=2043.1=20=E2=86=92=2043.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/43.1...43.2 Changelog-Reviewed-By: Jan Tojnar --- 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 16305438448e..54625d75e5c5 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.1"; + version = "43.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ID07bSgwroj7dBMNzzvr1dtvh7BsvNE5M/CG5DkCI7Y="; + sha256 = "dzIhF6ERsnR7zOitYFeKZ5wgIeSGkRz29OY0FjKKuzM="; }; patches = [ From 357536bf580ca8298269d972c51ed0717eba3814 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Oct 2022 21:39:24 +0000 Subject: [PATCH 385/505] =?UTF-8?q?gnome-text-editor:=2043.0=20=E2=86=92?= =?UTF-8?q?=2043.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/43.0...43.1 Changelog-Reviewed-By: Jan Tojnar --- 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 9bde14eefb56..2e813fc10de7 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sPu/yxfGq8Zd+x71/y+xytwaqVNs1ehYmBS4fngSqmE="; + sha256 = "sha256-lzpLDeto+fkaVKTdQVtq/em1rj7mhLx2FHH5QpD59ss="; }; nativeBuildInputs = [ From bc8b66c2af5aa1ae4decdc9241805289e895ba87 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Oct 2022 21:40:22 +0000 Subject: [PATCH 386/505] =?UTF-8?q?pango:=201.50.10=20=E2=86=92=201.50.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pango/-/compare/1.50.10...1.50.11 Changelog-Reviewed-By: Jan Tojnar --- 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 3b5af9d5ca99..3beeaa67321e 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.10"; + version = "1.50.11"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "fl0vHkCFTSSposTQk7r+ddzb7M3x3kPkQ3My6r7WSWY="; + sha256 = "iAD4Etie5hOIGIcDID86eHiWPCL4aVqvH6ChoUKNF64="; }; depsBuildBuild = [ From 72ecf256663bb90032d8388dd0e939409cdd1a58 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 10 Oct 2022 09:25:24 +0800 Subject: [PATCH 387/505] greetd.gtkgreet: Fix build with GLib 2.74 --- pkgs/os-specific/linux/gtkgreet/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/gtkgreet/default.nix b/pkgs/os-specific/linux/gtkgreet/default.nix index 7ab7c01475bd..e0ebbb3bc4c2 100644 --- a/pkgs/os-specific/linux/gtkgreet/default.nix +++ b/pkgs/os-specific/linux/gtkgreet/default.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation rec { "-Dlayershell=enabled" ]; + # G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+. + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + meta = with lib; { description = "GTK based greeter for greetd, to be run under cage or similar"; homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet"; From 375445aead13312938bcb2565dc22aea452a8a01 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 10 Oct 2022 09:56:44 +0800 Subject: [PATCH 388/505] entangle: Add workaround for old libselinux Actually we should bump libselinux to 3.4, which should use pcre2 as default. --- pkgs/applications/video/entangle/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index 761a3849c315..b163fc2aa60b 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -33,6 +33,7 @@ , libxkbcommon , orc , pcre +, pcre2 , udev , util-linux , xorg @@ -94,7 +95,8 @@ stdenv.mkDerivation rec { libunwind libxkbcommon orc - pcre + pcre # required by libselinux before we USE_PCRE2 + pcre2 # required by glib-2.0 udev util-linux zstd From 336d270b744ef3a4508685ad3f180dc5da1d17ff Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 10 Oct 2022 10:18:03 +0800 Subject: [PATCH 389/505] vala-language-server: Fix build with GLib 2.74 --- .../tools/vala-language-server/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix index b033581b75f2..52e33fee6b60 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/vala-language-server/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -24,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-gntGnz8uqGz2EGwWWyty/N1ImaUKAPtXVZcjgp73SQM="; }; + patches = [ + # Fix regex for links in comments + # https://github.com/vala-lang/vala-language-server/pull/268 + (fetchpatch { + url = "https://github.com/vala-lang/vala-language-server/commit/b6193265d68b90755d57938c2ba1895841cf4b36.patch"; + sha256 = "sha256-nWG+xQAPDVBXamuKQymvn/FBHEP7Ta9p/vhYjxxBGzI="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = pname; @@ -52,9 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/vala-lang/vala-language-server"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ andreasfelix ]; - # Likely broken by GLib 2.74 switch to PCRE 2. - # https://github.com/vala-lang/vala-language-server/issues/263 - broken = true; platforms = platforms.linux; }; } From 4d703382f35bee9f69b573eca131362d9a9bcf3a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 10 Oct 2022 23:41:45 +0000 Subject: [PATCH 390/505] =?UTF-8?q?gnome.polari:=2042.1=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/polari/-/compare/42.1...43.0 Also switch to libsoup 3. Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/polari/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix index 84ec0e0d2a84..c81068477e36 100644 --- a/pkgs/desktops/gnome/apps/polari/default.nix +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -17,8 +17,8 @@ , gtk3 , glib , libsecret -, libsoup -, webkitgtk +, libsoup_3 +, webkitgtk_4_1 , gobject-introspection , appstream-glib , gnome @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "polari"; - version = "42.1"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "r5DPCEjsvkB+sjBkBINpdP048xww1HT0bRspIYqWaz0="; + sha256 = "F6GS3uYfWOPNRHJQC+cBGUa5n75SvFrBJPqurC8zQUc="; }; patches = [ @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { gspell gdk-pixbuf libsecret - libsoup - webkitgtk # for thumbnailer + libsoup_3 + webkitgtk_4_1 # for thumbnailer ]; postFixup = '' From bfed63047d0ec304c61a3f44197494aad23cb6c2 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 11 Oct 2022 19:00:49 +0200 Subject: [PATCH 391/505] release-notes: mention breaking changes w/r/t `systemd-networkd` 250 --- .../from_md/release-notes/rl-2211.section.xml | 41 +++++++++++++++++++ .../manual/release-notes/rl-2211.section.md | 6 +++ 2 files changed, 47 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 78bd6c6a22d8..aa79083d1065 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -578,6 +578,47 @@ instead. + + + systemd-networkd v250 deprecated, renamed, + and moved some sections and settings which leads to the + following breaking module changes: + + + + + systemd.network.networks.<name>.dhcpV6PrefixDelegationConfig + is renamed to + systemd.network.networks.<name>.dhcpPrefixDelegationConfig. + + + + + systemd.network.networks.<name>.dhcpV6Config + no longer accepts the + ForceDHCPv6PDOtherInformation= setting. + Please use the WithoutRA= and + UseDelegatedPrefix= settings in your + systemd.network.networks.<name>.dhcpV6Config + and the DHCPv6Client= setting in your + systemd.network.networks.<name>.ipv6AcceptRAConfig + to control when the DHCPv6 client is started and how the + delegated prefixes are handled by the DHCPv6 client. + + + + + systemd.network.networks.<name>.networkConfig + no longer accepts the IPv6Token= + setting. Use the Token= setting in your + systemd.network.networks.<name>.ipv6AcceptRAConfig + instead. The + systemd.network.networks.<name>.ipv6Prefixes.*.ipv6PrefixConfig + now also accepts the Token= setting. + + + + The meta.mainProgram attribute of packages diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 37b0db8a8ce1..3c2560df713f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -194,6 +194,12 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead. +- `systemd-networkd` v250 deprecated, renamed, and moved some sections and settings which leads to the following breaking module changes: + + * `systemd.network.networks..dhcpV6PrefixDelegationConfig` is renamed to `systemd.network.networks..dhcpPrefixDelegationConfig`. + * `systemd.network.networks..dhcpV6Config` no longer accepts the `ForceDHCPv6PDOtherInformation=` setting. Please use the `WithoutRA=` and `UseDelegatedPrefix=` settings in your `systemd.network.networks..dhcpV6Config` and the `DHCPv6Client=` setting in your `systemd.network.networks..ipv6AcceptRAConfig` to control when the DHCPv6 client is started and how the delegated prefixes are handled by the DHCPv6 client. + * `systemd.network.networks..networkConfig` no longer accepts the `IPv6Token=` setting. Use the `Token=` setting in your `systemd.network.networks..ipv6AcceptRAConfig` instead. The `systemd.network.networks..ipv6Prefixes.*.ipv6PrefixConfig` now also accepts the `Token=` setting. + - The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`. - The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone. From 85fa4ac03e9b26420a90512d5bf6e5c2b9a5d423 Mon Sep 17 00:00:00 2001 From: BattleCh1cken Date: Mon, 10 Oct 2022 11:05:37 -0400 Subject: [PATCH 392/505] arduino-language-server: init at 0.7.1 --- .../arduino-language-server/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/embedded/arduino/arduino-language-server/default.nix diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix new file mode 100644 index 000000000000..cba2e595cf78 --- /dev/null +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "arduino-language-server"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "arduino"; + repo = "arduino-language-server"; + rev = version; + hash = "sha256-FnkXtjktj22LCkmFPxzQ72qiVBC1WR/ZiwMsmZPL578="; + }; + + subPackages = [ "." ]; + + vendorHash = "sha256-Xa26ilo95sQ/6dGvl4gB2bb0vzWXr+WPKLezAnZPeqM="; + + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X github.com/arduino/arduino-language-server/version.versionString=${version}" + "-X github.com/arduino/arduino-language-server/version.commit=unknown" + ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "An Arduino Language Server based on Clangd to Arduino code autocompletion"; + license = licenses.asl20; + maintainers = with maintainers; [ BattleCh1cken ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a09bb50c797..37ae8477ef02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2063,6 +2063,8 @@ with pkgs; arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; + arduino-language-server = callPackage ../development/embedded/arduino/arduino-language-server { }; + arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {}; apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; From 990575a3bb04d7b593b1ea92cda8262209d4dc4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 21:36:49 +0000 Subject: [PATCH 393/505] kubemq-community: 2.3.0 -> 2.3.1 --- pkgs/servers/kubemq-community/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix index 6524fe6fcd19..3e739b09a25f 100644 --- a/pkgs/servers/kubemq-community/default.nix +++ b/pkgs/servers/kubemq-community/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "kubemq-community"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "kubemq-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E4X8srrfbOHV2XmjaXV25WilIjBGPjEGD6BqK7HreoQ="; + sha256 = "sha256-d5ZhQFVh7yzZsozlMaxkLMGdLraCFAvuQvQiSdF56wY="; }; CGO_ENABLED=0; @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; # grpc tests are flaky - vendorSha256 = "sha256-kvQ5sPMudI75fVIWJkkwXpmVrJysvWcIgpgjyQh19W0="; + vendorSha256 = "sha256-mie+Akfsn+vjoxYnI23Zxk0OTFbMf51BDbJk2c0U7iU="; meta = { homepage = "https://github.com/kubemq-io/kubemq-community"; From 17659a0cf647916ff748695c1599254042b4dc9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 21:52:07 +0000 Subject: [PATCH 394/505] python310Packages.pysimplegui: 4.60.3 -> 4.60.4 --- pkgs/development/python-modules/pysimplegui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix index 4b6f61b8114d..3028f0cac9b7 100644 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysimplegui"; - version = "4.60.3"; + version = "4.60.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - sha256 = "sha256-dexGaU3JdcDka+jFendOA4QztTCVgh1nvjsiGso/1o0="; + sha256 = "sha256-+IyCwwGlGuo1vmBdwGC8zrDctmguFigFRIhHAatLI7o="; }; propagatedBuildInputs = [ From b2ccc249397ae87545d24154d44f1fe22bac1d80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 22:00:08 +0000 Subject: [PATCH 395/505] python310Packages.azure-mgmt-resource: 21.1.0 -> 21.2.0 --- .../python-modules/azure-mgmt-resource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 8ac4330b45a8..4988406ac968 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "21.1.0"; + version = "21.2.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-UpZa3jHNBZ/qKxUT1l/mFgRuQz3g5YPc9cnJvr8+vWk="; + sha256 = "sha256-v4pd5sTate/H8NGND1cWXe5SMepS0j0Q2C5Ee4wqGlQ="; }; propagatedBuildInputs = [ From 1329ea0d578b890a69e9af652336c52e60992ee5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 23:09:09 +0000 Subject: [PATCH 396/505] multus-cni: 3.9.1 -> 3.9.2 --- pkgs/applications/networking/cluster/multus-cni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix index 2cfbcaa6bd11..2d01d470c871 100644 --- a/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "multus-cni"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "k8snetworkplumbingwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U5Ji+f7ckynBVMb4xsmoRZzYJx8obMO+bO9TU6GqcW0="; + sha256 = "sha256-AYSUJEoNYt4DYNcPynRBal5c5QAzRVltkjwoEM66VcY="; }; ldflags = [ From 45f2a5eea089ffdf8cc96fd10a81de81387f3317 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 11 Oct 2022 19:56:31 -0400 Subject: [PATCH 397/505] toml2nix: switch to rustPlatform.buildRustPackage --- pkgs/development/tools/toml2nix/Cargo.lock | 25 +++++++++++++++++++++ pkgs/development/tools/toml2nix/default.nix | 24 ++++++++++++++++++++ pkgs/tools/toml2nix/default.nix | 18 --------------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 50 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/tools/toml2nix/Cargo.lock create mode 100644 pkgs/development/tools/toml2nix/default.nix delete mode 100644 pkgs/tools/toml2nix/default.nix diff --git a/pkgs/development/tools/toml2nix/Cargo.lock b/pkgs/development/tools/toml2nix/Cargo.lock new file mode 100644 index 000000000000..f6b37fbc189d --- /dev/null +++ b/pkgs/development/tools/toml2nix/Cargo.lock @@ -0,0 +1,25 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "serde" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" + +[[package]] +name = "toml" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +dependencies = [ + "serde", +] + +[[package]] +name = "toml2nix" +version = "0.1.1" +dependencies = [ + "toml", +] diff --git a/pkgs/development/tools/toml2nix/default.nix b/pkgs/development/tools/toml2nix/default.nix new file mode 100644 index 000000000000..6987619dbcb5 --- /dev/null +++ b/pkgs/development/tools/toml2nix/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "toml2nix"; + version = "0.1.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-YhluLS4tFMibFrDzgIvNtfjM5dAqJQvygeZocKn3+Jg="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + meta = with lib; { + description = "A tool to convert TOML files to Nix expressions"; + homepage = "https://crates.io/crates/toml2nix"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/toml2nix/default.nix b/pkgs/tools/toml2nix/default.nix deleted file mode 100644 index ac4de4eee144..000000000000 --- a/pkgs/tools/toml2nix/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by carnix 0.9.7: carnix generate-nix -{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: -with buildRustCrateHelpers; -let inherit (lib.lists) fold; - inherit (lib.attrsets) recursiveUpdate; -in -let crates = cratesIO; in -rec { - toml2nix = crates.crates.toml2nix."0.1.1" deps; - __all = [ (toml2nix {}) ]; - deps.serde."1.0.84" = {}; - deps.toml."0.4.10" = { - serde = "1.0.84"; - }; - deps.toml2nix."0.1.1" = { - toml = "0.4.10"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 987f3341dc00..4a83bf434b3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11890,7 +11890,7 @@ with pkgs; toml2json = callPackage ../development/tools/toml2json { }; - toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; + toml2nix = callPackage ../development/tools/toml2nix { }; topgrade = callPackage ../tools/misc/topgrade { inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; From 538299fed412117d502c18bba09a7a3940e11df3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 11 Oct 2022 19:18:15 -0400 Subject: [PATCH 398/505] cargo-clone: init at 1.1.0 --- .../tools/rust/cargo-clone/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-clone/default.nix diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix new file mode 100644 index 000000000000..68af8c0a2d39 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, Security +, SystemConfiguration +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-clone"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "janlikar"; + repo = pname; + rev = "v${version}"; + sha256 = "1lfg47kw07k4r795n0iixl5cnrb13g74hqlbp8jzbypr255bc16q"; + }; + + cargoSha256 = "sha256-rJcTl5fe3vkNNyLRvm7q5KmzyJXchh1/JuzK0GFhHLk="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + ]; + + # requires internet access + doCheck = false; + + meta = with lib; { + description = "A cargo subcommand to fetch the source code of a Rust crate"; + homepage = "https://github.com/janlikar/cargo-clone"; + changelog = "https://github.com/janlikar/cargo-clone/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 987f3341dc00..7ff0a4956d2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14744,6 +14744,9 @@ with pkgs; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + cargo-clone = callPackage ../development/tools/rust/cargo-clone { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { inherit (darwin.apple_sdk.frameworks) Security; From 2cd55b31f5d4eca64d8c24128ca643e4c0b2a71b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 12 Oct 2022 02:19:05 +0200 Subject: [PATCH 399/505] hci: Fix cross eval --- pkgs/development/tools/continuous-integration/hci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index 0919a6ec58b1..5060d0aeda01 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,6 +1,6 @@ { haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: let - inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; + inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; bundledBins = lib.optional stdenv.isLinux runc; @@ -15,7 +15,7 @@ let makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); + (addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); in pkg // { meta = pkg.meta // { position = toString ./default.nix + ":1"; From 186294a934cfc0ab266c48b98a6c18b4c184850b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 12 Oct 2022 02:19:24 +0200 Subject: [PATCH 400/505] hercules-ci-agent: Fix cross eval --- .../continuous-integration/hercules-ci-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index ec1e6fb93b2e..b4a783765df9 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,6 +1,6 @@ { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }: let - inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; + inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc; @@ -15,7 +15,7 @@ let makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); + (addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); in pkg.overrideAttrs (o: { meta = o.meta // { position = toString ./default.nix + ":1"; From 756169bde74edbeafc086ab4b588af6584b3b36b Mon Sep 17 00:00:00 2001 From: laalsaas Date: Tue, 11 Oct 2022 23:00:35 +0200 Subject: [PATCH 401/505] maintainers: add laalsaas --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3d5c0f2067c9..f99856bbd188 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7466,6 +7466,10 @@ githubId = 72546287; name = "L3af"; }; + laalsaas = { + email = "laalsaas@systemli.org"; + name = "laalsaas"; + }; lach = { email = "iam@lach.pw"; github = "CertainLach"; From 4a22f4be4ed2619b905701b02539528805741b91 Mon Sep 17 00:00:00 2001 From: laalsaas Date: Wed, 12 Oct 2022 02:08:14 +0200 Subject: [PATCH 402/505] bfcal: init at 1.0 --- pkgs/applications/misc/bfcal/default.nix | 41 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/bfcal/default.nix diff --git a/pkgs/applications/misc/bfcal/default.nix b/pkgs/applications/misc/bfcal/default.nix new file mode 100644 index 000000000000..9b77d1ebe3c1 --- /dev/null +++ b/pkgs/applications/misc/bfcal/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromSourcehut +, meson +, ninja +, pkg-config +, wrapQtAppsHook +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "bfcal"; + version = "1.0"; + + src = fetchFromSourcehut { + owner = "~bitfehler"; + repo = "bfcal"; + rev = "v${version}"; + sha256 = "sha256-2z5ICVEZ55omwcoVWpac/HPwyKF9jDCYO78S9p21VMU="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + ]; + + postInstall = '' + mkdir -p $out/bin + install bfcal $out/bin + ''; + + meta = with lib; { + description = "Quickly display a calendar"; + homepage = "https://git.sr.ht/~bitfehler/bfcal"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e7546d684a7..876da10188ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27083,6 +27083,8 @@ with pkgs; bevelbar = callPackage ../applications/window-managers/bevelbar { }; + bfcal = libsForQt5.callPackage ../applications/misc/bfcal { }; + bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { From 3fe9fb887772bf84c4167a6e07046c1eb06ae622 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 04:45:55 +0000 Subject: [PATCH 403/505] freeradius: 3.2.0 -> 3.2.1 --- pkgs/servers/freeradius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index fb557bb73fb8..f5e504bb02c2 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -24,11 +24,11 @@ assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - hash = "sha256-QtGgoC7CrxRyjcdoySHUeAC8gwP0FyIetvMvBCNbBDE="; + hash = "sha256-Xw7seQike8dSV6SIAsrK1Sc/HBOyaA8fhHzwrISKyBA="; }; nativeBuildInputs = [ autoreconfHook ]; From 656846781c5c8969b06d62cc0870123310e50169 Mon Sep 17 00:00:00 2001 From: Skyler Grey Date: Wed, 12 Oct 2022 06:13:36 +0100 Subject: [PATCH 404/505] pridefetch: 1.0.0 -> 1.1.0 --- pkgs/tools/misc/pridefetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/tools/misc/pridefetch/default.nix index 9a93c6770e81..80fd1b0e9bc2 100644 --- a/pkgs/tools/misc/pridefetch/default.nix +++ b/pkgs/tools/misc/pridefetch/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, python3, zip }: let - version = "1.0.0"; - sha256 = "sha256-/o4er8bO/3HUFXzP+sC+5DYv9EwmxW05o1RT5fEulEg="; + version = "1.1.0"; + sha256 = "sha256-563xOz63vto19yuaHtReV1dSw6BgNf+CLtS3lrPnaoc="; pname = "pridefetch"; src = fetchFromGitHub { From 290707f8410f7c64322f22485a18074840208b9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 05:15:49 +0000 Subject: [PATCH 405/505] treesheets: unstable-2022-09-26 -> unstable-2022-10-11 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 7b1fd1ae73a8..6a0bb48c7ded 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-09-26"; + version = "unstable-2022-10-11"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "4778c343ac78a3b3ccdaf079187b53d8cd64e235"; - sha256 = "UyltzT9B+7/hME7famQa/XgrDPaNw3apwchKgxwscOo="; + rev = "be79e537c148d961d40137a7f83d7bdcc4119dd6"; + sha256 = "GKRxb6W9PDY7nzgPTPRPmA9GBvD4zLaZwnalZan3+m0="; }; nativeBuildInputs = [ From d560440cfbdde99f7df60a07d1b122e21bcfda3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 05:38:08 +0000 Subject: [PATCH 406/505] python310Packages.tgcrypto: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/tgcrypto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix index 728676b53b38..a1188e8f0104 100644 --- a/pkgs/development/python-modules/tgcrypto/default.nix +++ b/pkgs/development/python-modules/tgcrypto/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "tgcrypto"; - version = "1.2.3"; + version = "1.2.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pyrogram"; repo = "tgcrypto"; - rev = "v${version}"; - sha256 = "06g1kv3skq2948h0sjf64s1cr2p1rhxnx5pf9nmvhxkmri1xmfzs"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-hifRWVEvNZVFyIJPwYY+CDR04F1I9GyAi3dt2kx+81c="; }; checkInputs = [ From 31fa7802506dbb3fe23f43742767acafe016d647 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 05:55:45 +0000 Subject: [PATCH 407/505] python310Packages.trimesh: 3.15.3 -> 3.15.4 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 5bd24653f30d..9fd7048166c4 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.15.3"; + version = "3.15.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wvoxZXSlPWEifwP4Gdgg4wsVjDGm5NzhaZjAUZ886ZI="; + sha256 = "sha256-D9hgnaX9YdYvYApIc5IB2hHyJSJFm9Tgia5KlwM56Rw="; }; propagatedBuildInputs = [ numpy ]; From 16085338c099f5882101c4ed8160c6a4ab97f001 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 12 Oct 2022 08:22:32 +0000 Subject: [PATCH 408/505] bingo: 0.6.0 -> 0.7.0 --- .../tools/bingo/bingo_version.patch | 13 ------------ pkgs/development/tools/bingo/default.nix | 21 ++++--------------- pkgs/development/tools/bingo/version_go.patch | 17 --------------- 3 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 pkgs/development/tools/bingo/bingo_version.patch delete mode 100644 pkgs/development/tools/bingo/version_go.patch diff --git a/pkgs/development/tools/bingo/bingo_version.patch b/pkgs/development/tools/bingo/bingo_version.patch deleted file mode 100644 index a3d85df6a9ce..000000000000 --- a/pkgs/development/tools/bingo/bingo_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pkg/version/version.go b/pkg/version/version.go -index 30f8f30..11c12a0 100644 ---- a/pkg/version/version.go -+++ b/pkg/version/version.go -@@ -6,7 +6,7 @@ package version - import "github.com/Masterminds/semver" - - // Version returns 'bingo' version. --const Version = "v0.6" -+const Version = "v0.6.0" - - var ( - Go114 = semver.MustParse("1.14") diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix index 1b4ddd41c0e3..0c0d90bb9fc9 100644 --- a/pkgs/development/tools/bingo/default.nix +++ b/pkgs/development/tools/bingo/default.nix @@ -1,24 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, bingo }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bingo"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "bwplotka"; repo = "bingo"; rev = "v${version}"; - sha256 = "sha256-t2nkY+mwek2NcbCwCkI3Mc1ULEJIjatBjChBdnKFAg8="; + sha256 = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A="; }; - vendorSha256 = "sha256-TCbwIHDg2YaLIscCoGPRBv5G3YSJ+qn/koOjPh+KKRY="; - - patches = [ - # Do not execute `go` command when invoking `bingo version`. - ./version_go.patch - # Specific to v0.6.0. `v0.6` -> `v0.6.0` - ./bingo_version.patch - ]; + vendorSha256 = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM="; postPatch = '' rm get_e2e_test.go get_e2e_utils_test.go @@ -28,12 +21,6 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - passthru.tests.version = testers.testVersion { - package = bingo; - command = "bingo version"; - version = "v${version}"; - }; - meta = with lib; { description = "Like `go get` but for Go tools! CI Automating versioning of Go binaries in a nested, isolated Go modules."; homepage = "https://github.com/bwplotka/bingo"; diff --git a/pkgs/development/tools/bingo/version_go.patch b/pkgs/development/tools/bingo/version_go.patch deleted file mode 100644 index 2898326a0547..000000000000 --- a/pkgs/development/tools/bingo/version_go.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/main.go b/main.go -index 5600f7e..662ed1b 100644 ---- a/main.go -+++ b/main.go -@@ -201,10 +201,8 @@ func main() { - return pkgs.PrintTab(target, os.Stdout) - } - case "version": -- cmdFunc = func(ctx context.Context, r *runner.Runner) error { -- _, err := fmt.Fprintln(os.Stdout, version.Version) -- return err -- } -+ _, _ = fmt.Fprintln(os.Stdout, version.Version) -+ return - default: - exitOnUsageError(flags.Usage, "No such command", flags.Arg(0)) - } From 73e93f456c9ec5c7e15d0bf33462ce6b0a4bae03 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 12 Oct 2022 11:26:50 +0300 Subject: [PATCH 409/505] kubedog: init at 0.9.6 --- .../networking/cluster/kubedog/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubedog/default.nix diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix new file mode 100644 index 000000000000..9c1b14e6dd20 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, testers +, kubedog +}: + +buildGoModule rec { + pname = "kubedog"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "werf"; + repo = "kubedog"; + rev = "v${version}"; + hash = "sha256-mwITvv2MuqzH1aB4iTVaFfZljyqOAu7vl4cORHT/OXQ="; + }; + + vendorHash = "sha256-HBo26cPiWJPDpsjPYUEBraHB2SZsUttrlBKpB9/SS6o="; + + subPackages = [ "cmd/kubedog" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/werf/kubedog.Version=${src.rev}" + ]; + + # There are no tests. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = kubedog; + command = "kubedog version"; + version = src.rev; + }; + + meta = with lib; { + description = '' + A tool to watch and follow Kubernetes resources in CI/CD deployment + pipelines + ''; + homepage = "https://github.com/werf/kubedog"; + changelog = "https://github.com/werf/kubedog/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 673f42bd5df8..09a33800986c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29409,6 +29409,8 @@ with pkgs; kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; + kubedog = callPackage ../applications/networking/cluster/kubedog { }; + kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; kube-score = callPackage ../applications/networking/cluster/kube-score { }; From 710808a82b8b8c955e7d808c69f2584424350170 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 12 Oct 2022 13:28:32 +0800 Subject: [PATCH 410/505] pantheon.elementary-terminal: Fix terminal freeze when closing in GLib 2.73.2+ --- .../pantheon/apps/elementary-terminal/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 4ec5518da21e..5f4e61ec5c0b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -29,6 +30,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-qxjHrlpdJcfXEUan/JgU7HqBRdB36gxAb5xmd/ySsj0="; }; + patches = [ + # TerminalWidget: Fix terminal freeze when closing in GLib 2.73.2+ + # https://github.com/elementary/terminal/pull/691 + (fetchpatch { + url = "https://github.com/elementary/terminal/commit/3cabe328abb839f12cd21f4d3d474d1d1e42b907.patch"; + sha256 = "sha256-wd36vOKqqPHCFPOok+Id9KqxbqjF0ohqsoxAU+jo4+Y="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils meson From 57dd8624991d73de0473513a282333b565db4501 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 11:12:27 +0000 Subject: [PATCH 411/505] copilot-cli: 1.22.0 -> 1.22.1 --- pkgs/tools/admin/copilot-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index 0031004a0fa3..bac1cbd375f2 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ApIEMUit0iVwVGq48qPhQG+i4+HCCwPmiH/QQOdZNjs="; + sha256 = "sha256-Jm4UTwWuqbtckIoXD7YVQk2MQlvzdfRbLW7YA+CmhDE="; }; - vendorSha256 = "sha256-GKGMM5oFfEuXS1utbmIcH/5COqfNrSUzthLQSUxSkbo="; + vendorSha256 = "sha256-MOFPuxn6LwPUw0A14OXhZefAgvtm+9qcDTR3kfwCtjQ="; nativeBuildInputs = [ installShellFiles ]; From af4a69ffffddacf8e5b58ca666b6cb9ec6786ef6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 12 Oct 2022 20:08:25 +0800 Subject: [PATCH 412/505] lxqt.lxqt-build-tools: Fix build failure of libqtxdg with GLib 2.73.1+ --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 670cdc44e551..6da001a554c2 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -30,6 +30,12 @@ mkDerivation rec { url = "https://github.com/lxqt/lxqt-build-tools/pull/76/commits/fa9672b671ede3f46b004f81580f9afb50fedf00.patch"; sha256 = "0dl7n1afcc6ky9vd9lpc65p9grpszpql7lfjq2vlzlilixnv8xv1"; }) + # Fix build failure of libqtxdg with GLib 2.73.1+ + # https://github.com/lxqt/lxqt-build-tools/pull/79 + (fetchpatch { + url = "https://github.com/lxqt/lxqt-build-tools/commit/4991811d9212ec1176af6d1cbe88aa37efad4836.patch"; + sha256 = "sha256-PsYJKonMG6A9O4Li+RC1qBjFUzYgxVAwzSqHq/phmPc="; + }) ]; postPatch = '' From 61a13e2dc7a12a6b2a75c994f0f331103da31bf2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Oct 2022 00:35:04 +0200 Subject: [PATCH 413/505] =?UTF-8?q?selfoss:=202.18=20=E2=86=92=202.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/fossar/selfoss/releases/tag/2.19 --- pkgs/servers/web-apps/selfoss/default.nix | 29 +++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index 383c57ee9382..b0b888012f46 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenvNoCC, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "selfoss"; - version = "2.18"; + version = "2.19"; src = fetchurl { - url = "https://github.com/SSilence/selfoss/releases/download/${version}/${pname}-${version}.zip"; - sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b"; + url = "https://github.com/SSilence/selfoss/releases/download/${version}/selfoss-${version}.zip"; + sha256 = "5JxHUOlyMneWPKaZtgLwn5FI4rnyWPzmsUQpSYrw5Pw="; }; - sourceRoot = "."; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ + unzip + ]; installPhase = '' - mkdir $out - cp -ra * $out/ + runHook preInstall + + mkdir "$out" + cp -ra \ + .htaccess \ + .nginx.conf \ + * \ + "$out/" + + runHook postInstall ''; meta = with lib; { description = "Web-based news feed (RSS/Atom) aggregator"; homepage = "https://selfoss.aditu.de"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ jtojnar regnat ]; platforms = platforms.all; }; From fca1f7508b6d4c1077124fa3c51c67e84b1a4078 Mon Sep 17 00:00:00 2001 From: laalsaas Date: Tue, 11 Oct 2022 23:00:35 +0200 Subject: [PATCH 414/505] maintainers: add laalsaas --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6030ae15c982..cf9dfaf507cc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7475,6 +7475,10 @@ githubId = 72546287; name = "L3af"; }; + laalsaas = { + email = "laalsaas@systemli.org"; + name = "laalsaas"; + }; lach = { email = "iam@lach.pw"; github = "CertainLach"; From 790c45e29ced477c88f6a37078a00b994ba77099 Mon Sep 17 00:00:00 2001 From: laalsaas Date: Wed, 12 Oct 2022 13:57:45 +0200 Subject: [PATCH 415/505] wwcd: init at unstable-2022-02-05 --- pkgs/tools/misc/wwcd/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/wwcd/default.nix diff --git a/pkgs/tools/misc/wwcd/default.nix b/pkgs/tools/misc/wwcd/default.nix new file mode 100644 index 000000000000..d18c72a25eeb --- /dev/null +++ b/pkgs/tools/misc/wwcd/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromSourcehut +, autoreconfHook +, pkg-config +, check +}: + +stdenv.mkDerivation rec { + pname = "wwcd"; + version = "unstable-2022-02-05"; + + src = fetchFromSourcehut { + owner = "~bitfehler"; + repo = pname; + rev = "cdf70bb18dc60c66c074d4810cb37b9e697811e5"; + sha256 = "sha256-laf1DEtdEs7q+rtp5Y5rb+7AGsKUv5T413CFWJiURWw="; + }; + + autoreconfFlags = "-if"; + nativeBuildInputs = [ + autoreconfHook pkg-config check + ]; + + meta = with lib; { + description = "What would cron do? Read crontab entries from stdin and print time of next execution(s)"; + homepage = "https://git.sr.ht/~bitfehler/wwcd"; + license = licenses.mit; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f75ae2d08e8..3a0605841598 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1430,6 +1430,8 @@ with pkgs; use64 = true; }; + wwcd = callPackage ../tools/misc/wwcd { }; + writedisk = callPackage ../tools/misc/writedisk { }; xcd = callPackage ../tools/misc/xcd { }; From 7e99c2ed5bf1bbb5752a6ebabeed65bd05e7cb71 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 15 Sep 2022 19:23:51 +0300 Subject: [PATCH 416/505] plasma5Packages: 5.25.5 -> 5.26.0 --- pkgs/desktops/plasma-5/aura-browser.nix | 18 + pkgs/desktops/plasma-5/bluedevil.nix | 6 +- pkgs/desktops/plasma-5/default.nix | 5 + pkgs/desktops/plasma-5/discover.nix | 4 + pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/kpipewire.nix | 15 + pkgs/desktops/plasma-5/kscreen.nix | 4 +- pkgs/desktops/plasma-5/libkscreen/default.nix | 4 +- pkgs/desktops/plasma-5/plank-player.nix | 18 + pkgs/desktops/plasma-5/plasma-bigscreen.nix | 48 ++ .../plasma-5/plasma-desktop/default.nix | 8 +- .../plasma-5/plasma-mobile/default.nix | 4 +- pkgs/desktops/plasma-5/plasma-nm/default.nix | 4 +- pkgs/desktops/plasma-5/plasma-pa.nix | 4 +- .../plasma-5/plasma-remotecontrollers.nix | 41 ++ .../0002-absolute-wallpaper-install-dir.patch | 22 +- .../plasma-5/plasma-workspace/default.nix | 15 +- pkgs/desktops/plasma-5/srcs.nix | 466 ++++++++++-------- 18 files changed, 435 insertions(+), 253 deletions(-) create mode 100644 pkgs/desktops/plasma-5/aura-browser.nix create mode 100644 pkgs/desktops/plasma-5/kpipewire.nix create mode 100644 pkgs/desktops/plasma-5/plank-player.nix create mode 100644 pkgs/desktops/plasma-5/plasma-bigscreen.nix create mode 100644 pkgs/desktops/plasma-5/plasma-remotecontrollers.nix diff --git a/pkgs/desktops/plasma-5/aura-browser.nix b/pkgs/desktops/plasma-5/aura-browser.nix new file mode 100644 index 000000000000..b012417a6bc7 --- /dev/null +++ b/pkgs/desktops/plasma-5/aura-browser.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, + extra-cmake-modules, + qtwebengine, + qtquickcontrols2, + kirigami2, + ki18n, +}: +mkDerivation { + pname = "aura-browser"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtwebengine + qtquickcontrols2 + kirigami2 + ki18n + ]; +} diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 0474d875997f..389746f17af9 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,8 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, shared-mime-info, qtbase, qtdeclarative, bluez-qt, - kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, - kwidgetsaddons, kwindowsystem, plasma-framework + kcoreaddons, kcmutils, kdbusaddons, kded, ki18n, kiconthemes, kio, + knotifications, kwidgetsaddons, kwindowsystem, plasma-framework }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { buildInputs = [ qtbase qtdeclarative bluez-qt ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded - kiconthemes knotifications kwidgetsaddons + kiconthemes knotifications kwidgetsaddons kcmutils ]; } diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 09027d368083..581bd25027fd 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -103,6 +103,7 @@ let }; in { + aura-browser = callPackage ./aura-browser.nix {}; bluedevil = callPackage ./bluedevil.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {}; breeze-qt5 = callPackage ./breeze-qt5.nix {}; @@ -118,6 +119,7 @@ let khotkeys = callPackage ./khotkeys.nix {}; kinfocenter = callPackage ./kinfocenter.nix {}; kmenuedit = callPackage ./kmenuedit.nix {}; + kpipewire = callPackage ./kpipewire.nix {}; kscreen = callPackage ./kscreen.nix {}; kscreenlocker = callPackage ./kscreenlocker.nix {}; ksshaskpass = callPackage ./ksshaskpass.nix {}; @@ -132,6 +134,8 @@ let milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; oxygen-sounds = callPackage ./oxygen-sounds.nix {}; + plank-player = callPackage ./plank-player.nix {}; + plasma-bigscreen = callPackage ./plasma-bigscreen.nix {}; plasma-browser-integration = callPackage ./plasma-browser-integration.nix {}; plasma-desktop = callPackage ./plasma-desktop {}; plasma-disks = callPackage ./plasma-disks.nix {}; @@ -140,6 +144,7 @@ let plasma-nano = callPackage ./plasma-nano {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix {}; plasma-sdk = callPackage ./plasma-sdk.nix {}; plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index dd6c7a3008ca..82c636bf7a51 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -14,6 +14,7 @@ , util-linux , qtbase , qtquickcontrols2 +, qtwebview , qtx11extras , karchive , kcmutils @@ -26,6 +27,7 @@ , kirigami2 , kitemmodels , knewstuff +, kpurpose , kwindowsystem , kxmlgui , plasma-framework @@ -45,6 +47,7 @@ mkDerivation { pcre util-linux qtquickcontrols2 + qtwebview qtx11extras karchive kcmutils @@ -57,6 +60,7 @@ mkDerivation { kirigami2 kitemmodels knewstuff + kpurpose kwindowsystem kxmlgui plasma-framework diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 95361c1173e2..8464646a592b 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.26.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix new file mode 100644 index 000000000000..41191e6f4c6a --- /dev/null +++ b/pkgs/desktops/plasma-5/kpipewire.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, + extra-cmake-modules, + kwayland, ki18n, kcoreaddons, plasma-wayland-protocols, + libepoxy, ffmpeg, mesa, pipewire, wayland +}: + +mkDerivation { + pname = "kpipewire"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kwayland ki18n kcoreaddons plasma-wayland-protocols + libepoxy ffmpeg mesa pipewire wayland + ]; +} diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 49f77fc5ff8c..0d67c702dd5c 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors, - kwindowsystem, kdeclarative, plasma-framework, qtx11extras + kwindowsystem, kdeclarative, plasma-framework, qtx11extras, layer-shell-qt }: mkDerivation { @@ -12,6 +12,6 @@ mkDerivation { buildInputs = [ kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors - kwindowsystem kdeclarative plasma-framework qtx11extras + kwindowsystem kdeclarative plasma-framework qtx11extras layer-shell-qt ]; } diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index 6798a2cdcb0e..cebe1ad4451e 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -2,7 +2,7 @@ mkDerivation, lib, propagate, extra-cmake-modules, qtbase, - wayland-scanner, kwayland, + wayland-scanner, kconfig, kwayland, plasma-wayland-protocols, wayland, libXrandr, qtx11extras }: @@ -10,7 +10,7 @@ mkDerivation { pname = "libkscreen"; nativeBuildInputs = [ extra-cmake-modules wayland-scanner ]; - buildInputs = [ kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ]; + buildInputs = [ kconfig kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ]; outputs = [ "out" "dev" ]; patches = [ ./libkscreen-backends-path.patch diff --git a/pkgs/desktops/plasma-5/plank-player.nix b/pkgs/desktops/plasma-5/plank-player.nix new file mode 100644 index 000000000000..536db96ef3c3 --- /dev/null +++ b/pkgs/desktops/plasma-5/plank-player.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, + extra-cmake-modules, + qtquickcontrols2, + qtmultimedia, + kirigami2, + ki18n, +}: +mkDerivation { + pname = "plank-player"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtquickcontrols2 + qtmultimedia + kirigami2 + ki18n + ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-bigscreen.nix b/pkgs/desktops/plasma-5/plasma-bigscreen.nix new file mode 100644 index 000000000000..96b7b148fa08 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-bigscreen.nix @@ -0,0 +1,48 @@ +{ + mkDerivation, + extra-cmake-modules, + kactivities, + kactivities-stats, + plasma-framework, + ki18n, + kirigami2, + kdeclarative, + kcmutils, + knotifications, + kio, + kwayland, + kwindowsystem, + plasma-workspace, + qtmultimedia, +}: +mkDerivation { + pname = "plasma-bigscreen"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kactivities + kactivities-stats + plasma-framework + ki18n + kirigami2 + kdeclarative + kcmutils + knotifications + kio + kwayland + kwindowsystem + plasma-workspace + qtmultimedia + ]; + + postPatch = '' + substituteInPlace bin/plasma-bigscreen-wayland.in \ + --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" + ''; + + preFixup = '' + wrapQtApp $out/bin/plasma-bigscreen-x11 + wrapQtApp $out/bin/plasma-bigscreen-wayland + ''; + + passthru.providedSessions = [ "plasma-bigscreen-x11" "plasma-bigscreen-wayland" ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 6c8d8a3bc4b6..6ab13f0c7261 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,10 +1,10 @@ { mkDerivation, lib, - extra-cmake-modules, kdoctools, + extra-cmake-modules, kdoctools, wayland-scanner, boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, - xorgserver, util-linux, + xorgserver, util-linux, wayland, wayland-protocols, accounts-qt, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtx11extras, @@ -18,11 +18,11 @@ mkDerivation { pname = "plasma-desktop"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ]; buildInputs = [ boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput - xkeyboard_config + xkeyboard_config wayland wayland-protocols accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index 3625376f6c2b..41324d53b6a7 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -27,7 +27,7 @@ mkDerivation { ]; postPatch = '' - substituteInPlace bin/kwinwrapper.in \ + substituteInPlace bin/startplasmamobile.in \ --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" substituteInPlace bin/plasma-mobile.desktop.cmake \ @@ -36,7 +36,7 @@ mkDerivation { # Ensures dependencies like libqofono (at the very least) are present for the shell. preFixup = '' - wrapQtApp "$out/bin/kwinwrapper" + wrapQtApp "$out/bin/startplasmamobile" ''; passthru.providedSessions = [ "plasma-mobile" ]; diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 54c8079cf5f4..28331fc70738 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, substituteAll, extra-cmake-modules, kdoctools, - kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, + kcmutils, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, prison, solid, @@ -15,7 +15,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion - kconfigwidgets kcoreaddons kdbusaddons kiconthemes + kcmutils kconfigwidgets kcoreaddons kdbusaddons kiconthemes kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui prison solid diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 9e47356579e3..b0a4e614bf32 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework, + kcmutils, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework, qtbase, qtdeclarative, gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop }: @@ -12,7 +12,7 @@ mkDerivation { buildInputs = [ gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop - kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework + kcmutils kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework kwindowsystem qtbase qtdeclarative diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix new file mode 100644 index 000000000000..a1688e939c7b --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix @@ -0,0 +1,41 @@ +{ + mkDerivation, + extra-cmake-modules, + kconfig, + knotifications, + ki18n, + solid, + kcoreaddons, + kdeclarative, + kcmutils, + kpackage, + kwindowsystem, + wayland, + pkg-config, + libcec, + libcec_platform, + libevdev, + plasma-workspace, + plasma-wayland-protocols, +}: +mkDerivation { + pname = "plasma-remotecontrollers"; + nativeBuildInputs = [ extra-cmake-modules pkg-config ]; + buildInputs = [ + kconfig + knotifications + ki18n + solid + kcoreaddons + kdeclarative + kcmutils + kpackage + kwindowsystem + wayland + libcec + libcec_platform + libevdev + plasma-workspace + plasma-wayland-protocols + ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch index 211316e24736..45c9f695b452 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch @@ -1,23 +1,9 @@ -From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 5 Feb 2020 05:03:11 -0600 -Subject: [PATCH] absolute-wallpaper-install-dir - ---- - sddm-theme/theme.conf.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index a560da3..f723c1e 100644 ---- a/sddm-theme/theme.conf.cmake -+++ b/sddm-theme/theme.conf.cmake +--- a/lookandfeel/sddm-theme/theme.conf.cmake ++++ b/lookandfeel/sddm-theme/theme.conf.cmake @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg type=image color=#1d99f3 fontSize=10 --background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg -+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png needsFullUserModel=false --- -2.30.0 - diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index ce17561d73fc..27fb2b0c594e 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -12,10 +12,10 @@ kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays, kquickcharts, - appstream-qt, plasma-wayland-protocols, + appstream-qt, plasma-wayland-protocols, kpipewire, libkexiv2, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, - qtwayland, qtx11extras, qqc2-desktop-style, + qtwayland, qtx11extras, qqc2-desktop-style, polkit-qt, pipewire, libdrm }: @@ -35,10 +35,11 @@ mkDerivation { knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays kquickcharts appstream-qt plasma-wayland-protocols + kholidays kquickcharts appstream-qt plasma-wayland-protocols kpipewire + libkexiv2 qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland - qtx11extras qqc2-desktop-style + qtx11extras qqc2-desktop-style polkit-qt pipewire libdrm ]; @@ -60,6 +61,12 @@ mkDerivation { --replace 'ecm_query_qt(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")' ''; + # work around wrapQtAppsHook double-wrapping kcminit_startup, + # which is a symlink to kcminit + postFixup = '' + ln -sf $out/bin/kcminit $out/bin/kcminit_startup + ''; + NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 7db192740255..c600d8039924 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,428 +3,468 @@ { fetchurl, mirror }: { - bluedevil = { - version = "5.25.5"; + aura-browser = { + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/bluedevil-5.25.5.tar.xz"; - sha256 = "1dsah7rcx2brcd1d5x7bvhrixx5nvwp1fwq9b8k2zc038xzpx6ys"; - name = "bluedevil-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/aura-browser-5.26.0.tar.xz"; + sha256 = "1r43p7jjmsjhav6b3zdk9lx8cg56dapxd6sh2c6cwc1xy8pmvpm9"; + name = "aura-browser-5.26.0.tar.xz"; + }; + }; + bluedevil = { + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/bluedevil-5.26.0.tar.xz"; + sha256 = "1br3vj7xxgzzc82fw1qq1zqk9gcpl5dpmlz61lqq87wnjhqb6xdj"; + name = "bluedevil-5.26.0.tar.xz"; }; }; breeze = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/breeze-5.25.5.tar.xz"; - sha256 = "0m3ggv5znzfcp25afgl7v5w7m27v5hdvv6jw9vrvwbqj8lzq1hlx"; - name = "breeze-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/breeze-5.26.0.tar.xz"; + sha256 = "0z2371bwv7m1zhlgby8vjvx5qblpf94281p5l3qa22ws0k4jgv8i"; + name = "breeze-5.26.0.tar.xz"; }; }; breeze-grub = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/breeze-grub-5.25.5.tar.xz"; - sha256 = "1w5lrnfhnzd9mjs93r1y8f9mlpqd7jlrjwzfryy919alqsxfpyyl"; - name = "breeze-grub-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/breeze-grub-5.26.0.tar.xz"; + sha256 = "12fpxnddcvig9zgj3knjkarl4y2kywgqg60cdjj3shsk2q6q2lh0"; + name = "breeze-grub-5.26.0.tar.xz"; }; }; breeze-gtk = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/breeze-gtk-5.25.5.tar.xz"; - sha256 = "0wj8qzy2104ggczxagxm45zwsvvpwd6jjnbv1893mhlr6f2zrbmh"; - name = "breeze-gtk-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/breeze-gtk-5.26.0.tar.xz"; + sha256 = "1q3lf5sj9f0fx4ahdffd16m0ak4q742b6zpw6crvz4cymh3n9fy8"; + name = "breeze-gtk-5.26.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/breeze-plymouth-5.25.5.tar.xz"; - sha256 = "1p9xgcxx543dddpz7sahk1ky6inzl9lyaf0z506vh91xs5rn0srv"; - name = "breeze-plymouth-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/breeze-plymouth-5.26.0.tar.xz"; + sha256 = "04xhdy89p83p8dhhs40hkp2xlpj20j4l2dwiry9qaqd1yk331gz8"; + name = "breeze-plymouth-5.26.0.tar.xz"; }; }; discover = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/discover-5.25.5.tar.xz"; - sha256 = "01vdi66c7v60db25p0qi0q73wgqw6dy2kirbk34bvhld41gpxhhv"; - name = "discover-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/discover-5.26.0.tar.xz"; + sha256 = "0w7i9w5y1ybd1qzzx1psgf97960bdjkbdr1p90jymqwflcr5yjyz"; + name = "discover-5.26.0.tar.xz"; }; }; drkonqi = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/drkonqi-5.25.5.tar.xz"; - sha256 = "0vw4bfld2jdiwm4g3008x8s1lq1ydf87ckb0fvyzsp11hq9nnnk7"; - name = "drkonqi-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/drkonqi-5.26.0.tar.xz"; + sha256 = "01zsyy4v6ss3iflman0p3m3cq3ckbwjd6928frdvdlvc5w35zrj1"; + name = "drkonqi-5.26.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kactivitymanagerd-5.25.5.tar.xz"; - sha256 = "0hsllhqi46n25sr27crnad053ghk3hni2w496g6d2qfmi20l3g4n"; - name = "kactivitymanagerd-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kactivitymanagerd-5.26.0.tar.xz"; + sha256 = "1l8dncc2ijwg5vxd0l05fd2x3ssbvnhk5m4hhy6k84xaxjvinqnj"; + name = "kactivitymanagerd-5.26.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kde-cli-tools-5.25.5.tar.xz"; - sha256 = "0i1lnkyb2bdvbhnr2wsgjy2sjichzxxqkvn30ca85rj21cavk2z3"; - name = "kde-cli-tools-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kde-cli-tools-5.26.0.tar.xz"; + sha256 = "0w4nx2zdwaaqhm7xrqh0s5p2yp0wjwj0svyr396z8lapimgjn80l"; + name = "kde-cli-tools-5.26.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kde-gtk-config-5.25.5.tar.xz"; - sha256 = "0zr4626fmx5adg65qa0npc222kjxmhml1i014gsrmjmsp0s5w8pw"; - name = "kde-gtk-config-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kde-gtk-config-5.26.0.tar.xz"; + sha256 = "0yffhbrkh204ma8pv11256hn290gml4pmhgplygpwbn7ir9ir72p"; + name = "kde-gtk-config-5.26.0.tar.xz"; }; }; kdecoration = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kdecoration-5.25.5.tar.xz"; - sha256 = "1x3scszz5nfwqciwc3bv0r04wgqlxs0c9j1090zvn6mjjg2nsyb7"; - name = "kdecoration-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kdecoration-5.26.0.tar.xz"; + sha256 = "0cd67mmqriqcx1xvkx7s1zz01y6gc614g0qv6i2ybd6p5r2f3qcb"; + name = "kdecoration-5.26.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kdeplasma-addons-5.25.5.tar.xz"; - sha256 = "1a5cq0jz69hlcr22wxi2p5mzxv5xcp88220irxmq0dhpk85kywlx"; - name = "kdeplasma-addons-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kdeplasma-addons-5.26.0.tar.xz"; + sha256 = "1nfnvbm27rb2sljg01m4s61yqz7pw4h7z5zjp2n1x6l1gmbsbh1h"; + name = "kdeplasma-addons-5.26.0.tar.xz"; }; }; kgamma5 = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kgamma5-5.25.5.tar.xz"; - sha256 = "1c305bs50km7bsn0phz7yj4x2168sxwsw9zxbpcgw4q3r53c0ywz"; - name = "kgamma5-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kgamma5-5.26.0.tar.xz"; + sha256 = "117pwi6ykyhkp7vfpvgxz158m4a76b75mkynichn0b5k3q8svy4h"; + name = "kgamma5-5.26.0.tar.xz"; }; }; khotkeys = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/khotkeys-5.25.5.tar.xz"; - sha256 = "0c9i4vxiiv90dpzsd2hjwavks87cvwplkj63751z8mazax6r95as"; - name = "khotkeys-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/khotkeys-5.26.0.tar.xz"; + sha256 = "02inmqfrsp3w3pig45m3ay544vhdhmrx0alf36van561w76kkdc5"; + name = "khotkeys-5.26.0.tar.xz"; }; }; kinfocenter = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kinfocenter-5.25.5.tar.xz"; - sha256 = "0zvki76yghkn158s7hb5g9drz7xaqxkmp2747404n2n0gmnmsdif"; - name = "kinfocenter-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kinfocenter-5.26.0.tar.xz"; + sha256 = "0nif06xsf7nmgyb3d1navz3vykw88xk88fzgqnax001cmrmiph82"; + name = "kinfocenter-5.26.0.tar.xz"; }; }; kmenuedit = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kmenuedit-5.25.5.tar.xz"; - sha256 = "0z85w7w207dnsinsz8yg6s408pwfy3l7wjkcsjpyg8aj8s9x6nl7"; - name = "kmenuedit-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kmenuedit-5.26.0.tar.xz"; + sha256 = "1cfinj96la1c4nkz885lfybk5fw8z8d42yshb3nks66r528xgsmi"; + name = "kmenuedit-5.26.0.tar.xz"; + }; + }; + kpipewire = { + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/kpipewire-5.26.0.tar.xz"; + sha256 = "1vmynvwcf2ll6hbcgdkmmdfyvib6fk1cq3yi6n0qdrqvbcrg62bs"; + name = "kpipewire-5.26.0.tar.xz"; }; }; kscreen = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kscreen-5.25.5.tar.xz"; - sha256 = "0361202n0366jiyv61w06jikh2i4s1fzr6x3chmdykx4fgvbqj7s"; - name = "kscreen-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kscreen-5.26.0.tar.xz"; + sha256 = "0ay5qc31b33q9h8isppga97vy1h5hrk8i44pbsr45qcjmigjkr16"; + name = "kscreen-5.26.0.tar.xz"; }; }; kscreenlocker = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kscreenlocker-5.25.5.tar.xz"; - sha256 = "0mivx0l266310iy52qi94b6wi8w2a8nl7cjn5750x66dz81jl3yj"; - name = "kscreenlocker-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kscreenlocker-5.26.0.tar.xz"; + sha256 = "0gf77s8pn8nyjmy5y8khw9l3094lnjbj6cyhcsl817yncp7v44p4"; + name = "kscreenlocker-5.26.0.tar.xz"; }; }; ksshaskpass = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/ksshaskpass-5.25.5.tar.xz"; - sha256 = "0z8pp2mh4s98jh8jkf6r8v014gb6svapmp0m1npzw7zcmr6jvpn6"; - name = "ksshaskpass-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/ksshaskpass-5.26.0.tar.xz"; + sha256 = "1wf5dn73g5whgf40g2irxm72lv6fhr3nillp8y6d08iw8p2mc9yc"; + name = "ksshaskpass-5.26.0.tar.xz"; }; }; ksystemstats = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/ksystemstats-5.25.5.tar.xz"; - sha256 = "07xm6gn2k3vsl1pkrd2n9w8w8b7jq26h3cpslqha4ipw0by2mlqa"; - name = "ksystemstats-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/ksystemstats-5.26.0.tar.xz"; + sha256 = "033b0b1qgkh27d708s6pzyra9dxy2h9fs0w4s0kvy9gkva1y2254"; + name = "ksystemstats-5.26.0.tar.xz"; }; }; kwallet-pam = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kwallet-pam-5.25.5.tar.xz"; - sha256 = "14w803lc3s2c0f4mqzzdhpfy5qnlz7wv00pbrc3v4k3zv381ci8n"; - name = "kwallet-pam-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kwallet-pam-5.26.0.tar.xz"; + sha256 = "1krcnsnyfxz7k2q9pcipv6mvzajkcgmgxsknb9g5cvrh0hla3fxq"; + name = "kwallet-pam-5.26.0.tar.xz"; }; }; kwayland-integration = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kwayland-integration-5.25.5.tar.xz"; - sha256 = "10xl7yrj519b9s5vq0hqqfz3vvg1fdwggw96snzm44iwycqbgss8"; - name = "kwayland-integration-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kwayland-integration-5.26.0.tar.xz"; + sha256 = "0h54mpj9z4cxb2f67lzp8zjm59xxlc35jffk2r0pyjs203a4247f"; + name = "kwayland-integration-5.26.0.tar.xz"; }; }; kwin = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kwin-5.25.5.tar.xz"; - sha256 = "1dh7ydwxbb9r53p353d53gq7w9vmp7idvsr4s5ldxmah35436v2s"; - name = "kwin-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kwin-5.26.0.tar.xz"; + sha256 = "1z9980s4pz9q4wd2lgr6iahqcc6y02f02mprzfbq6mlcq1llg7rs"; + name = "kwin-5.26.0.tar.xz"; }; }; kwrited = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kwrited-5.25.5.tar.xz"; - sha256 = "03gw3czdgyf35n6x79x416rk6f7w1ayzmy5pb65v9733nx1j34mh"; - name = "kwrited-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kwrited-5.26.0.tar.xz"; + sha256 = "173b5ppah5mapgx52hnkq6wfp6nn6z7mvm94mfz224r1vcr4841f"; + name = "kwrited-5.26.0.tar.xz"; }; }; layer-shell-qt = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/layer-shell-qt-5.25.5.tar.xz"; - sha256 = "1mvhklq7n9hhjing704jr3ybq58ixwr9fdg3phnqhmdnqc2q3w0l"; - name = "layer-shell-qt-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/layer-shell-qt-5.26.0.tar.xz"; + sha256 = "07mnrwk100mazrghg9biv4vlnnw92l88hwqchwkh541dgqa3s16y"; + name = "layer-shell-qt-5.26.0.tar.xz"; }; }; libkscreen = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/libkscreen-5.25.5.tar.xz"; - sha256 = "17f2pbbkpmw3a32nsqlwd0x5xb71l6dzrh7ldwcqv46nvb54yhfa"; - name = "libkscreen-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/libkscreen-5.26.0.tar.xz"; + sha256 = "092y26bn7g1a2v1jv1d7r71xrp5a8kdnfvz58szs4d4qm1iyp6jf"; + name = "libkscreen-5.26.0.tar.xz"; }; }; libksysguard = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/libksysguard-5.25.5.tar.xz"; - sha256 = "1gqsjsdkp25abqqp4f6cv6ih199q9ad7q1a4lkhjgsh4h8jq1856"; - name = "libksysguard-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/libksysguard-5.26.0.tar.xz"; + sha256 = "15ljaa6ypqdrb0x2b4chs7piq9pi4lm5hx36708has64xmrz9cj3"; + name = "libksysguard-5.26.0.tar.xz"; }; }; milou = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/milou-5.25.5.tar.xz"; - sha256 = "0ijdbiq169sy47g0x22pj9x6abldpfxcnski4w1jh9hi9qz1rc25"; - name = "milou-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/milou-5.26.0.tar.xz"; + sha256 = "1g4ga1ylzj4zcdx3wh5y4rz84w5bwv7041bkp7b03pia2hwfgvy0"; + name = "milou-5.26.0.tar.xz"; }; }; oxygen = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/oxygen-5.25.5.tar.xz"; - sha256 = "1szkaln4if8rafvjg2yjxarspf7lqls2pk0gzac89ncr7840c970"; - name = "oxygen-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/oxygen-5.26.0.tar.xz"; + sha256 = "0mbcdnv40j1jvc1i77rknrrs5xs6w5qaz7sliyygm2f01vgha6cz"; + name = "oxygen-5.26.0.tar.xz"; }; }; oxygen-sounds = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/oxygen-sounds-5.25.5.tar.xz"; - sha256 = "04rn3ccqszznknvblz2i8r406m32hk4d3yzma4vzq93jfk57hdf1"; - name = "oxygen-sounds-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/oxygen-sounds-5.26.0.tar.xz"; + sha256 = "0ww7njndc4ilwsc16l5jv7cbq8mzjm9yz7x515fhvwqzwh61vd47"; + name = "oxygen-sounds-5.26.0.tar.xz"; + }; + }; + plank-player = { + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/plank-player-5.26.0.tar.xz"; + sha256 = "0jwhrhbbwblj8c7n13hg7ac3dbmnybsspq1gpcd16l797msdyp2k"; + name = "plank-player-5.26.0.tar.xz"; + }; + }; + plasma-bigscreen = { + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/plasma-bigscreen-5.26.0.tar.xz"; + sha256 = "1jmv2f60pbgfs110560h4gix1hj8awmlydrikcyn0p2hhc6xdc9r"; + name = "plasma-bigscreen-5.26.0.tar.xz"; }; }; plasma-browser-integration = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-browser-integration-5.25.5.tar.xz"; - sha256 = "18pbn5ic5l3m8i1y99yprpwd4x4746aq3abqn1f2cq5h2683h2ia"; - name = "plasma-browser-integration-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-browser-integration-5.26.0.tar.xz"; + sha256 = "0vzkqhrafqwl5whqyjv1np37wzv5dm49gh4z3acv0yz83842asgl"; + name = "plasma-browser-integration-5.26.0.tar.xz"; }; }; plasma-desktop = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-desktop-5.25.5.tar.xz"; - sha256 = "05s1pkwr4xmkghp8jrwcyrvjm83n68ngmk2694055xcfgi0pxicg"; - name = "plasma-desktop-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-desktop-5.26.0.tar.xz"; + sha256 = "0x5csx29x81szmmil4mlxmfcmz3v1q0n3q3f6k3p4knhpv77x7vx"; + name = "plasma-desktop-5.26.0.tar.xz"; }; }; plasma-disks = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-disks-5.25.5.tar.xz"; - sha256 = "0vci2cf8vx2lclypys9rmvjb8haakv6ksrvqm5j28pazbq2kskvl"; - name = "plasma-disks-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-disks-5.26.0.tar.xz"; + sha256 = "0wb31vnh8bs5wxl07wawji2l66pmnhn9li3smcygsx0qcqxsmcxm"; + name = "plasma-disks-5.26.0.tar.xz"; }; }; plasma-firewall = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-firewall-5.25.5.tar.xz"; - sha256 = "0k3pc0dcsjr2hhh4hr8vhsvaddn66s6imm8skrr02icxqvljs6jh"; - name = "plasma-firewall-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-firewall-5.26.0.tar.xz"; + sha256 = "08ayf84ah294q473554zlgs8ri0l20bzc6gmbfrw833byviqwppr"; + name = "plasma-firewall-5.26.0.tar.xz"; }; }; plasma-integration = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-integration-5.25.5.tar.xz"; - sha256 = "1pab56cg2zi8fcaar53lhhh98iw7l07f5lkymkqhsh8a5crfc3yr"; - name = "plasma-integration-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-integration-5.26.0.tar.xz"; + sha256 = "0mqv9haanmp3q29ik2x07bmcfdly1icrzdcid76rlycnsr1v0qdg"; + name = "plasma-integration-5.26.0.tar.xz"; }; }; plasma-mobile = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-mobile-5.25.5.tar.xz"; - sha256 = "1q4amdqvjbcx88qdyvhhl6j5f0f9p41b3k99zsqv381f94dpybn9"; - name = "plasma-mobile-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-mobile-5.26.0.tar.xz"; + sha256 = "0zw7ppg8fqqb6i2z0zacij4qzwki1ixxi3ky1qvk8q7pqb8n47y2"; + name = "plasma-mobile-5.26.0.tar.xz"; }; }; plasma-nano = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-nano-5.25.5.tar.xz"; - sha256 = "1kgglhr3cvg0crfr6di21kp1pfdc017qh3jnaf25f15bllypznq9"; - name = "plasma-nano-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-nano-5.26.0.tar.xz"; + sha256 = "0cnb1y8xwxq711ighi9zzw6x3npfwpf9865bi16hha8fk7vzn6z7"; + name = "plasma-nano-5.26.0.tar.xz"; }; }; plasma-nm = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-nm-5.25.5.tar.xz"; - sha256 = "036bx0qjrjanfxy8aiy6ab7rmm2h8l7wlkvlwhzw2hgl1w03xjps"; - name = "plasma-nm-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-nm-5.26.0.tar.xz"; + sha256 = "1bjy4iq1v2nkhl0ib2v26anxvpl6dns1c1zqf5w24rfmpdmxz6ky"; + name = "plasma-nm-5.26.0.tar.xz"; }; }; plasma-pa = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-pa-5.25.5.tar.xz"; - sha256 = "0g06pm1isnzx4hv6380rjpyr22s4j5iw9083s71vnl4npx28npvb"; - name = "plasma-pa-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-pa-5.26.0.tar.xz"; + sha256 = "00ajjrjyvjxhfxg9amsr009rwpg35r2c29679dypkxfldki81czz"; + name = "plasma-pa-5.26.0.tar.xz"; + }; + }; + plasma-remotecontrollers = { + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/plasma-remotecontrollers-5.26.0.tar.xz"; + sha256 = "0gwmhsqdkr5ra2r7iwasggkxmd0xw08fm7fqvdqcp8m7p0fzc9ap"; + name = "plasma-remotecontrollers-5.26.0.tar.xz"; }; }; plasma-sdk = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-sdk-5.25.5.tar.xz"; - sha256 = "1z0cn0aiiivdb02r5vn8hm8hj9wbx053ksh5jgx2x048g67gmq96"; - name = "plasma-sdk-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-sdk-5.26.0.tar.xz"; + sha256 = "1wsgksds7ygq6d65x1yziqnicczq780gdx1z8xsfdw66gjajxf0r"; + name = "plasma-sdk-5.26.0.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-systemmonitor-5.25.5.tar.xz"; - sha256 = "0rs3avhpmfapzha8dkir9ny60ba2m92bbfv4avsd85vz5kggg29h"; - name = "plasma-systemmonitor-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-systemmonitor-5.26.0.tar.xz"; + sha256 = "1yj72qli0zjm0m20ys5djxcz2ab2v24l7grdk914x6yk4iz6pgs1"; + name = "plasma-systemmonitor-5.26.0.tar.xz"; }; }; plasma-tests = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-tests-5.25.5.tar.xz"; - sha256 = "14gdnyxl4fb5rqv1gpmp2wgx3x30pli919wjn835lbd2mf4rzwfq"; - name = "plasma-tests-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-tests-5.26.0.tar.xz"; + sha256 = "0hvklywisglygv74y2in9a8qkw00rqx78i0snw64hpmfl7n610p8"; + name = "plasma-tests-5.26.0.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-thunderbolt-5.25.5.tar.xz"; - sha256 = "1lbs4y163ccvd5zllazlp0f5v0g0rii1apbji9j7mr1n4w10wp16"; - name = "plasma-thunderbolt-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-thunderbolt-5.26.0.tar.xz"; + sha256 = "07davvxifdswm6s5v8sg3gzwd9s5b46q72c7jjnryjsb3gj0w755"; + name = "plasma-thunderbolt-5.26.0.tar.xz"; }; }; plasma-vault = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-vault-5.25.5.tar.xz"; - sha256 = "15nf4myl6sry0930m8qiixpr1i8bh1g58cy2gf304h029vr2fn5j"; - name = "plasma-vault-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-vault-5.26.0.tar.xz"; + sha256 = "0jx7i7xzi15hnwwscif0ilymfk2nrb93n8q5cjpr79gksmdwdajd"; + name = "plasma-vault-5.26.0.tar.xz"; }; }; plasma-workspace = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-workspace-5.25.5.tar.xz"; - sha256 = "0pxwg3i07sipfchn4qkmlr6kcgqbhj2s10xq69wi32x1fc13jx5x"; - name = "plasma-workspace-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-workspace-5.26.0.tar.xz"; + sha256 = "1cjnalc1yyc3ijm9idjd7bsghr34mnrk7fkk8d6qr8azqm5x67w4"; + name = "plasma-workspace-5.26.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-workspace-wallpapers-5.25.5.tar.xz"; - sha256 = "0pdgg8h6zwyxf1pj241mg3hd94wh38bqxj68af5jfp10xrwkzcyr"; - name = "plasma-workspace-wallpapers-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-workspace-wallpapers-5.26.0.tar.xz"; + sha256 = "10da3xpm82nn971yb9zh3qls78ngcghab3ivknqc6jbqzkk9z76v"; + name = "plasma-workspace-wallpapers-5.26.0.tar.xz"; }; }; plymouth-kcm = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plymouth-kcm-5.25.5.tar.xz"; - sha256 = "1knywmc6wdjqfq1xqli8hyi69kj7fvc0x0s246y7nrkskfc9ah67"; - name = "plymouth-kcm-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plymouth-kcm-5.26.0.tar.xz"; + sha256 = "0y7c8wmxb9aigrs6l1rjwhx1hxyip1g4csy121kjisdxzp4fijcd"; + name = "plymouth-kcm-5.26.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.25.5"; + version = "1-5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/polkit-kde-agent-1-5.25.5.tar.xz"; - sha256 = "1qb9nxlkgcv0c30l2vqgf9xs9d220q5pg7ikpb6zjzvj4wsvlvwd"; - name = "polkit-kde-agent-1-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/polkit-kde-agent-1-5.26.0.tar.xz"; + sha256 = "1fw8qh9yg87dq3vmxhas4qpx4zb0knf9nnz96fvcmfnnrh56ahxa"; + name = "polkit-kde-agent-1-5.26.0.tar.xz"; }; }; powerdevil = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/powerdevil-5.25.5.tar.xz"; - sha256 = "0anisirn7z8aw442npdnk1csb5ghpzj2hx49gpw4l6ijk70b76pr"; - name = "powerdevil-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/powerdevil-5.26.0.tar.xz"; + sha256 = "1bph5kg6w2rb5n2xwwh85zrar5cif6hcvwy4j8kazhqm2m507vkn"; + name = "powerdevil-5.26.0.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/qqc2-breeze-style-5.25.5.tar.xz"; - sha256 = "0z71kmhajk1jyp0f32kpl4pklbvxc34jp9jzq09gkq5vpsdccy6g"; - name = "qqc2-breeze-style-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/qqc2-breeze-style-5.26.0.tar.xz"; + sha256 = "1j6y636r4s0m30d9ynwqf9p9f85ivi5pys78y24787rh5nynq519"; + name = "qqc2-breeze-style-5.26.0.tar.xz"; }; }; sddm-kcm = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/sddm-kcm-5.25.5.tar.xz"; - sha256 = "1hvwjcgsjvlg61rfrak5111828lxf0lfh5p95d5kw1x4y2wlr756"; - name = "sddm-kcm-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/sddm-kcm-5.26.0.tar.xz"; + sha256 = "1hx6qrcb1sd7dhnsp6lma7wmrzkd348mcf3ya7v4daixyyasy7i7"; + name = "sddm-kcm-5.26.0.tar.xz"; }; }; systemsettings = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/systemsettings-5.25.5.tar.xz"; - sha256 = "0n7mf6ygi8fgn1m6pk2fadnqj1h58mxqni3h19xbi373wfypq5fl"; - name = "systemsettings-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/systemsettings-5.26.0.tar.xz"; + sha256 = "1k2gi0mrd91xcjch79rmz63imc5ngiyjx4agv5kxam0lnp010bxz"; + name = "systemsettings-5.26.0.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/xdg-desktop-portal-kde-5.25.5.tar.xz"; - sha256 = "0l3lmwihxyl65y0mkyg3afk1k6gc0ldjw2vg92g7yydbgmn39q7k"; - name = "xdg-desktop-portal-kde-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/xdg-desktop-portal-kde-5.26.0.tar.xz"; + sha256 = "17ig8yxm2iygyqg8r1jqbzhqp5sz71j05c7lsiilqpq5r4zng6ly"; + name = "xdg-desktop-portal-kde-5.26.0.tar.xz"; }; }; } From 5e62c78f4b565f98b798046c9285f5c0d663695f Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 17 Sep 2022 16:02:37 +0300 Subject: [PATCH 417/505] nixos/plasma5: add very basic plasma-bigscreen module --- .../services/x11/desktop-managers/plasma5.nix | 32 ++++++++++++++++- nixos/tests/all-tests.nix | 1 + nixos/tests/plasma-bigscreen.nix | 36 +++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/plasma-bigscreen.nix diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 3e04f6d0e6bb..aa1359bf3584 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -228,6 +228,14 @@ in is not strictly required for Plasma Mobile to run. ''; }; + + bigscreen.enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable support for running the Plasma Bigscreen session. + ''; + }; }; imports = [ @@ -237,7 +245,7 @@ in config = mkMerge [ # Common Plasma dependencies - (mkIf (cfg.enable || cfg.mobile.enable) { + (mkIf (cfg.enable || cfg.mobile.enable || cfg.bigscreen.enable) { security.wrappers = { kscreenlocker_greet = { @@ -595,5 +603,27 @@ in services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-mobile ]; }) + + # Plasma Bigscreen + (mkIf cfg.bigscreen.enable { + environment.systemPackages = + with pkgs.plasma5Packages; + [ + plasma-nano + plasma-settings + plasma-bigscreen + plasma-remotecontrollers + + aura-browser + plank-player + + plasma-pa + plasma-nm + kdeconnect-kde + ]; + + services.xserver.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-bigscreen ]; + services.udev.packages = [ pkgs.plasma5Packages.plasma-remotecontrollers ]; + }) ]; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3b697139dc84..47a433c0322b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -486,6 +486,7 @@ in { phylactery = handleTest ./web-apps/phylactery.nix {}; pict-rs = handleTest ./pict-rs.nix {}; pinnwand = handleTest ./pinnwand.nix {}; + plasma-bigscreen = handleTest ./plasma-bigscreen.nix {}; plasma5 = handleTest ./plasma5.nix {}; plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {}; plausible = handleTest ./plausible.nix {}; diff --git a/nixos/tests/plasma-bigscreen.nix b/nixos/tests/plasma-bigscreen.nix new file mode 100644 index 000000000000..ab459b6bffbe --- /dev/null +++ b/nixos/tests/plasma-bigscreen.nix @@ -0,0 +1,36 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "plasma-bigscreen"; + meta = with pkgs.lib.maintainers; { + maintainers = [ ttuegel k900 ]; + }; + + nodes.machine = { ... }: + + { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.defaultSession = "plasma-bigscreen-x11"; + services.xserver.desktopManager.plasma5.bigscreen.enable = true; + services.xserver.displayManager.autoLogin = { + enable = true; + user = "alice"; + }; + }; + + testScript = { nodes, ... }: let + user = nodes.machine.users.users.alice; + xdo = "${pkgs.xdotool}/bin/xdotool"; + in '' + with subtest("Wait for login"): + start_all() + machine.wait_for_file("${user.home}/.Xauthority") + machine.succeed("xauth merge ${user.home}/.Xauthority") + + with subtest("Check plasmashell started"): + machine.wait_until_succeeds("pgrep plasmashell") + machine.wait_for_window("Plasma Big Screen") + ''; +}) From 13961bf28e4e33bde5c7a365ec62bc5f182e9bf9 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 7 Oct 2022 13:39:27 +0300 Subject: [PATCH 418/505] pkgs/desktops/plasma-5: nixpkgs-fmt the whole thing --- .../3rdparty/addons/caffeine-plus.nix | 12 +- .../3rdparty/addons/krunner-symbols.nix | 13 +- .../3rdparty/addons/virtual-desktop-bar.nix | 4 +- .../kwin/scripts/dynamic-workspaces.nix | 15 +- .../3rdparty/kwin/scripts/krohnkite.nix | 15 +- .../plasma-5/3rdparty/kwin/scripts/kzones.nix | 15 +- .../3rdparty/kwin/scripts/parachute.nix | 15 +- .../plasma-5/3rdparty/kwin/scripts/tiling.nix | 15 +- .../plasma-5/3rdparty/lightly/default.nix | 2 +- pkgs/desktops/plasma-5/aura-browser.nix | 13 +- pkgs/desktops/plasma-5/bluedevil.nix | 40 +++- pkgs/desktops/plasma-5/breeze-grub.nix | 3 +- .../plasma-5/breeze-plymouth/default.nix | 55 +++-- pkgs/desktops/plasma-5/breeze-qt5.nix | 37 +++- pkgs/desktops/plasma-5/default.nix | 193 ++++++++++-------- pkgs/desktops/plasma-5/kactivitymanagerd.nix | 31 ++- pkgs/desktops/plasma-5/kde-cli-tools.nix | 34 ++- .../plasma-5/kde-gtk-config/default.nix | 40 +++- pkgs/desktops/plasma-5/kdeplasma-addons.nix | 49 ++++- pkgs/desktops/plasma-5/kgamma5.nix | 14 +- pkgs/desktops/plasma-5/khotkeys.nix | 33 ++- pkgs/desktops/plasma-5/kinfocenter.nix | 59 ++++-- pkgs/desktops/plasma-5/kmenuedit.nix | 23 ++- pkgs/desktops/plasma-5/kpipewire.nix | 27 ++- pkgs/desktops/plasma-5/kscreen.nix | 45 +++- pkgs/desktops/plasma-5/kscreenlocker.nix | 38 +++- pkgs/desktops/plasma-5/ksshaskpass.nix | 13 +- pkgs/desktops/plasma-5/ksystemstats.nix | 8 +- .../plasma-5/kwayland-integration.nix | 16 +- pkgs/desktops/plasma-5/kwin/default.nix | 137 ++++++++++--- pkgs/desktops/plasma-5/kwrited.nix | 13 +- pkgs/desktops/plasma-5/layer-shell-qt.nix | 12 +- pkgs/desktops/plasma-5/libkscreen/default.nix | 19 +- .../plasma-5/libksysguard/default.nix | 51 ++++- pkgs/desktops/plasma-5/milou.nix | 29 ++- pkgs/desktops/plasma-5/oxygen-sounds.nix | 5 +- pkgs/desktops/plasma-5/oxygen.nix | 39 +++- pkgs/desktops/plasma-5/plank-player.nix | 13 +- pkgs/desktops/plasma-5/plasma-bigscreen.nix | 31 ++- .../plasma-5/plasma-browser-integration.nix | 34 ++- .../plasma-5/plasma-desktop/default.nix | 129 +++++++++--- pkgs/desktops/plasma-5/plasma-disks.nix | 49 ++++- .../plasma-5/plasma-integration/default.nix | 33 ++- .../plasma-5/plasma-mobile/default.nix | 73 +++++-- .../desktops/plasma-5/plasma-nano/default.nix | 7 +- pkgs/desktops/plasma-5/plasma-nm/default.nix | 75 +++++-- pkgs/desktops/plasma-5/plasma-pa.nix | 42 +++- .../plasma-5/plasma-remotecontrollers.nix | 37 ++-- .../plasma-5/plasma-vault/default.nix | 29 +-- .../plasma-5/plasma-workspace-wallpapers.nix | 2 +- .../plasma-5/plasma-workspace/default.nix | 155 +++++++++++--- pkgs/desktops/plasma-5/polkit-kde-agent.nix | 30 ++- pkgs/desktops/plasma-5/powerdevil.nix | 46 ++++- pkgs/desktops/plasma-5/systemsettings.nix | 47 ++++- .../plasma-5/xdg-desktop-portal-kde.nix | 50 ++++- 55 files changed, 1517 insertions(+), 547 deletions(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix index 66e1255f223a..1a18e1a89de1 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix @@ -1,5 +1,10 @@ -{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules -, kwindowsystem, plasma-framework }: +{ lib +, mkDerivation +, fetchFromGitHub +, extra-cmake-modules +, kwindowsystem +, plasma-framework +}: mkDerivation rec { pname = "plasma-applet-caffeine-plus"; @@ -13,7 +18,8 @@ mkDerivation rec { }; buildInputs = [ - kwindowsystem plasma-framework + kwindowsystem + plasma-framework ]; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix index 5255bb4b0501..3ac49717390e 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix @@ -1,6 +1,13 @@ -{ lib, stdenv -, cmake, fetchFromGitHub, extra-cmake-modules -, qtbase, wrapQtAppsHook, ki18n, kdelibs4support, krunner +{ lib +, stdenv +, cmake +, fetchFromGitHub +, extra-cmake-modules +, qtbase +, wrapQtAppsHook +, ki18n +, kdelibs4support +, krunner }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix index e71a0bd0230c..5e4ac584047c 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix @@ -19,7 +19,9 @@ mkDerivation rec { }; buildInputs = [ - kwindowsystem plasma-framework qtx11extras + kwindowsystem + plasma-framework + qtx11extras ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix index 043f52c37efc..2e9864cb1da3 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "dynamic_workspaces"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix index 23802bef97bd..b6025c5bdf10 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "krohnkite"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix index a56ebf1579b1..ce0556ee1a77 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "kzones"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix index 5de935b9ec23..8d38583e1d51 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "parachute"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix index 8a455cb88826..5f13a95ce081 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "kwin-tiling"; @@ -18,7 +24,10 @@ mkDerivation rec { ''; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix index 39be6c63f1e3..c4ae4d75d201 100644 --- a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix @@ -22,7 +22,7 @@ mkDerivation rec{ sha256 = "k1fEZbhzluNlAmj5s/O9X20aCVQxlWQm/Iw/euX7cmI="; }; - extraCmakeFlags=["-DBUILD_TESTING=OFF"]; + extraCmakeFlags = [ "-DBUILD_TESTING=OFF" ]; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/aura-browser.nix b/pkgs/desktops/plasma-5/aura-browser.nix index b012417a6bc7..67af48b2bcb9 100644 --- a/pkgs/desktops/plasma-5/aura-browser.nix +++ b/pkgs/desktops/plasma-5/aura-browser.nix @@ -1,10 +1,9 @@ -{ - mkDerivation, - extra-cmake-modules, - qtwebengine, - qtquickcontrols2, - kirigami2, - ki18n, +{ mkDerivation +, extra-cmake-modules +, qtwebengine +, qtquickcontrols2 +, kirigami2 +, ki18n }: mkDerivation { pname = "aura-browser"; diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 389746f17af9..ab7ceea4b117 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,16 +1,40 @@ -{ - mkDerivation, lib, extra-cmake-modules, shared-mime-info, - qtbase, qtdeclarative, bluez-qt, - kcoreaddons, kcmutils, kdbusaddons, kded, ki18n, kiconthemes, kio, - knotifications, kwidgetsaddons, kwindowsystem, plasma-framework +{ mkDerivation +, lib +, extra-cmake-modules +, shared-mime-info +, qtbase +, qtdeclarative +, bluez-qt +, kcoreaddons +, kcmutils +, kdbusaddons +, kded +, ki18n +, kiconthemes +, kio +, knotifications +, kwidgetsaddons +, kwindowsystem +, plasma-framework }: mkDerivation { pname = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - qtbase qtdeclarative bluez-qt - ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded - kiconthemes knotifications kwidgetsaddons kcmutils + qtbase + qtdeclarative + bluez-qt + ki18n + kio + kwindowsystem + plasma-framework + kcoreaddons + kdbusaddons + kded + kiconthemes + knotifications + kwidgetsaddons + kcmutils ]; } diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix index 24d0c96cad97..86ce3dc112d0 100644 --- a/pkgs/desktops/plasma-5/breeze-grub.nix +++ b/pkgs/desktops/plasma-5/breeze-grub.nix @@ -1,5 +1,4 @@ -{ - mkDerivation +{ mkDerivation }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index bc60662b434a..b8188fece80b 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -1,26 +1,25 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - plymouth, - nixos-icons, - imagemagick, - netpbm, - perl, - logoName ? null, - logoFile ? null, - osName ? null, - osVersion ? null, - topColor ? "black", - bottomColor ? "black" +{ mkDerivation +, lib +, extra-cmake-modules +, plymouth +, nixos-icons +, imagemagick +, netpbm +, perl +, logoName ? null +, logoFile ? null +, osName ? null +, osVersion ? null +, topColor ? "black" +, bottomColor ? "black" }: let validColors = [ "black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green" ]; - resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf(toString logoFile)) else logoName; + resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) else logoName; in - assert lib.asserts.assertOneOf "topColor" topColor validColors; - assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; +assert lib.asserts.assertOneOf "topColor" topColor validColors; +assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; mkDerivation { @@ -30,21 +29,21 @@ mkDerivation { patches = [ ./install-paths.patch ]; - cmakeFlags = [] - ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" - ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" - ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" - ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" + cmakeFlags = [ ] + ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" + ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" + ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" + ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}" ; postPatch = '' - substituteInPlace cmake/FindPlymouth.cmake --subst-var out + substituteInPlace cmake/FindPlymouth.cmake --subst-var out '' + lib.optionalString (logoFile != null) '' - cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png + cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png - # conversion for 16bit taken from the breeze-plymouth readme - convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png - pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png + # conversion for 16bit taken from the breeze-plymouth readme + convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png + pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png ''; } diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index 13a426bb2587..bcabd31eea64 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -1,9 +1,18 @@ -{ - mkDerivation, - extra-cmake-modules, - frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, - kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative, - qtx11extras, fftw +{ mkDerivation +, extra-cmake-modules +, frameworkintegration +, kcmutils +, kconfigwidgets +, kcoreaddons +, kdecoration +, kguiaddons +, ki18n +, kwayland +, kwindowsystem +, plasma-framework +, qtdeclarative +, qtx11extras +, fftw }: mkDerivation { @@ -11,9 +20,19 @@ mkDerivation { sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ - frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration - kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative - qtx11extras fftw + frameworkintegration + kcmutils + kconfigwidgets + kcoreaddons + kdecoration + kguiaddons + ki18n + kwayland + kwindowsystem + plasma-framework + qtdeclarative + qtx11extras + fftw ]; outputs = [ "bin" "dev" "out" ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 581bd25027fd..bb3119ed6d45 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -1,31 +1,35 @@ /* -# New packages + # New packages -READ THIS FIRST + READ THIS FIRST -This module is for official packages in KDE Plasma 5. All available packages are -listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see -below). + This module is for official packages in KDE Plasma 5. All available packages are + listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see + below). -IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. -Many of the packages released upstream are not yet built in Nixpkgs due to lack -of demand. To add a Nixpkgs build for an upstream package, copy one of the -existing packages here and modify it as necessary. + Many of the packages released upstream are not yet built in Nixpkgs due to lack + of demand. To add a Nixpkgs build for an upstream package, copy one of the + existing packages here and modify it as necessary. -# Updates + # Updates -1. Update the URL in `./fetch.sh`. -2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5` + 1. Update the URL in `./fetch.sh`. + 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5` from the top of the Nixpkgs tree. -3. Use `nox-review wip` to check that everything builds. -4. Commit the changes and open a pull request. + 3. Use `nox-review wip` to check that everything builds. + 4. Commit the changes and open a pull request. */ -{ libsForQt5, lib, config, fetchurl -, gconf, gsettings-desktop-schemas +{ libsForQt5 +, lib +, config +, fetchurl +, gconf +, gsettings-desktop-schemas }: let @@ -33,7 +37,13 @@ let broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + lgpl21Plus + lgpl3Plus + bsd2 + mit + gpl2Plus + gpl3Plus + fdl12 ]; srcs = import ./srcs.nix { @@ -41,33 +51,35 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { }; packages = self: with self; let propagate = out: - let setupHook = { writeScript }: - writeScript "setup-hook" '' - if [[ "''${hookName-}" != postHook ]]; then - postHooks+=("source @dev@/nix-support/setup-hook") - else - # Propagate $${out} output - propagatedUserEnvPkgs+=" @${out}@" + let + setupHook = { writeScript }: + writeScript "setup-hook" '' + if [[ "''${hookName-}" != postHook ]]; then + postHooks+=("source @dev@/nix-support/setup-hook") + else + # Propagate $${out} output + propagatedUserEnvPkgs+=" @${out}@" - if [ -z "$outputDev" ]; then - echo "error: \$outputDev is unset!" >&2 - exit 1 - fi + if [ -z "$outputDev" ]; then + echo "error: \$outputDev is unset!" >&2 + exit 1 + fi - # Propagate $dev so that this setup hook is propagated - # But only if there is a separate $dev output - if [ "$outputDev" != out ]; then - propagatedBuildInputs+=" @dev@" - fi - fi - ''; - in callPackage setupHook {}; + # Propagate $dev so that this setup hook is propagated + # But only if there is a separate $dev output + if [ "$outputDev" != out ]; then + propagatedBuildInputs+=" @dev@" + fi + fi + ''; + in + callPackage setupHook { }; propagateBin = propagate "bin"; @@ -88,11 +100,11 @@ let setupHook = args.setupHook or defaultSetupHook; meta = - let meta = args.meta or {}; in + let meta = args.meta or { }; in meta // { homepage = meta.homepage or "http://www.kde.org"; license = meta.license or license; - maintainers = (meta.maintainers or []) ++ maintainers; + maintainers = (meta.maintainers or [ ]) ++ maintainers; platforms = meta.platforms or lib.platforms.linux; broken = meta.broken or broken; }; @@ -102,61 +114,62 @@ let }); }; - in { - aura-browser = callPackage ./aura-browser.nix {}; - bluedevil = callPackage ./bluedevil.nix {}; - breeze-gtk = callPackage ./breeze-gtk.nix {}; - breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze-grub = callPackage ./breeze-grub.nix {}; - breeze-plymouth = callPackage ./breeze-plymouth {}; - discover = callPackage ./discover.nix {}; - kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; - kde-cli-tools = callPackage ./kde-cli-tools.nix {}; + in + { + aura-browser = callPackage ./aura-browser.nix { }; + bluedevil = callPackage ./bluedevil.nix { }; + breeze-gtk = callPackage ./breeze-gtk.nix { }; + breeze-qt5 = callPackage ./breeze-qt5.nix { }; + breeze-grub = callPackage ./breeze-grub.nix { }; + breeze-plymouth = callPackage ./breeze-plymouth { }; + discover = callPackage ./discover.nix { }; + kactivitymanagerd = callPackage ./kactivitymanagerd.nix { }; + kde-cli-tools = callPackage ./kde-cli-tools.nix { }; kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; - kdecoration = callPackage ./kdecoration.nix {}; - kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; - kgamma5 = callPackage ./kgamma5.nix {}; - khotkeys = callPackage ./khotkeys.nix {}; - kinfocenter = callPackage ./kinfocenter.nix {}; - kmenuedit = callPackage ./kmenuedit.nix {}; - kpipewire = callPackage ./kpipewire.nix {}; - kscreen = callPackage ./kscreen.nix {}; - kscreenlocker = callPackage ./kscreenlocker.nix {}; - ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksystemstats = callPackage ./ksystemstats.nix {}; - kwallet-pam = callPackage ./kwallet-pam.nix {}; - kwayland-integration = callPackage ./kwayland-integration.nix {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited.nix {}; - layer-shell-qt = callPackage ./layer-shell-qt.nix {}; - libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard {}; - milou = callPackage ./milou.nix {}; - oxygen = callPackage ./oxygen.nix {}; - oxygen-sounds = callPackage ./oxygen-sounds.nix {}; - plank-player = callPackage ./plank-player.nix {}; - plasma-bigscreen = callPackage ./plasma-bigscreen.nix {}; - plasma-browser-integration = callPackage ./plasma-browser-integration.nix {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-disks = callPackage ./plasma-disks.nix {}; - plasma-integration = callPackage ./plasma-integration {}; - plasma-mobile = callPackage ./plasma-mobile {}; - plasma-nano = callPackage ./plasma-nano {}; - plasma-nm = callPackage ./plasma-nm {}; + kdecoration = callPackage ./kdecoration.nix { }; + kdeplasma-addons = callPackage ./kdeplasma-addons.nix { }; + kgamma5 = callPackage ./kgamma5.nix { }; + khotkeys = callPackage ./khotkeys.nix { }; + kinfocenter = callPackage ./kinfocenter.nix { }; + kmenuedit = callPackage ./kmenuedit.nix { }; + kpipewire = callPackage ./kpipewire.nix { }; + kscreen = callPackage ./kscreen.nix { }; + kscreenlocker = callPackage ./kscreenlocker.nix { }; + ksshaskpass = callPackage ./ksshaskpass.nix { }; + ksystemstats = callPackage ./ksystemstats.nix { }; + kwallet-pam = callPackage ./kwallet-pam.nix { }; + kwayland-integration = callPackage ./kwayland-integration.nix { }; + kwin = callPackage ./kwin { }; + kwrited = callPackage ./kwrited.nix { }; + layer-shell-qt = callPackage ./layer-shell-qt.nix { }; + libkscreen = callPackage ./libkscreen { }; + libksysguard = callPackage ./libksysguard { }; + milou = callPackage ./milou.nix { }; + oxygen = callPackage ./oxygen.nix { }; + oxygen-sounds = callPackage ./oxygen-sounds.nix { }; + plank-player = callPackage ./plank-player.nix { }; + plasma-bigscreen = callPackage ./plasma-bigscreen.nix { }; + plasma-browser-integration = callPackage ./plasma-browser-integration.nix { }; + plasma-desktop = callPackage ./plasma-desktop { }; + plasma-disks = callPackage ./plasma-disks.nix { }; + plasma-integration = callPackage ./plasma-integration { }; + plasma-mobile = callPackage ./plasma-mobile { }; + plasma-nano = callPackage ./plasma-nano { }; + plasma-nm = callPackage ./plasma-nm { }; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; - plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix {}; - plasma-sdk = callPackage ./plasma-sdk.nix {}; + plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { }; + plasma-sdk = callPackage ./plasma-sdk.nix { }; plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; - plasma-vault = callPackage ./plasma-vault {}; - plasma-workspace = callPackage ./plasma-workspace {}; - plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; - polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; - powerdevil = callPackage ./powerdevil.nix {}; - qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix {}; - sddm-kcm = callPackage ./sddm-kcm.nix {}; - systemsettings = callPackage ./systemsettings.nix {}; - xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; + plasma-vault = callPackage ./plasma-vault { }; + plasma-workspace = callPackage ./plasma-workspace { }; + plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { }; + polkit-kde-agent = callPackage ./polkit-kde-agent.nix { }; + powerdevil = callPackage ./powerdevil.nix { }; + qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix { }; + sddm-kcm = callPackage ./sddm-kcm.nix { }; + systemsettings = callPackage ./systemsettings.nix { }; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix { }; thirdParty = let inherit (libsForQt5) callPackage; in { plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 57800c316aa7..eb094c687105 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -1,15 +1,32 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel, - kwindowsystem, kxmlgui, kcrash, qtbase +{ mkDerivation +, lib +, extra-cmake-modules +, boost +, kconfig +, kcoreaddons +, kdbusaddons +, ki18n +, kio +, kglobalaccel +, kwindowsystem +, kxmlgui +, kcrash +, qtbase }: mkDerivation { pname = "kactivitymanagerd"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem - kxmlgui kcrash + boost + kconfig + kcoreaddons + kdbusaddons + kglobalaccel + ki18n + kio + kwindowsystem + kxmlgui + kcrash ]; } diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 02694b085f89..e02f1297c012 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,15 +1,37 @@ -{ - lib, mkDerivation, extra-cmake-modules, kdoctools, - kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, - qtsvg, qtx11extras, kactivities, plasma-workspace +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfig +, kdesu +, ki18n +, kiconthemes +, kinit +, kio +, kwindowsystem +, qtsvg +, qtx11extras +, kactivities +, plasma-workspace }: mkDerivation { pname = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg - qtx11extras kactivities plasma-workspace + kcmutils + kconfig + kdesu + ki18n + kiconthemes + kinit + kio + kwindowsystem + qtsvg + qtx11extras + kactivities + plasma-workspace ]; postInstall = '' # install a symlink in bin so that kdesu can eventually be found in PATH diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 6949f73a9ce7..a61fc328236d 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -1,17 +1,41 @@ -{ - mkDerivation, - extra-cmake-modules, wrapGAppsHook, - glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings-desktop-schemas, xsettingsd, kdecoration, sass +{ mkDerivation +, extra-cmake-modules +, wrapGAppsHook +, glib +, gtk2 +, gtk3 +, karchive +, kcmutils +, kconfigwidgets +, ki18n +, kiconthemes +, kio +, knewstuff +, gsettings-desktop-schemas +, xsettingsd +, kdecoration +, sass }: mkDerivation { pname = "kde-gtk-config"; nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; - dontWrapGApps = true; # There is nothing to wrap + dontWrapGApps = true; # There is nothing to wrap buildInputs = [ - ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings-desktop-schemas xsettingsd kdecoration sass + ki18n + kio + glib + gtk2 + gtk3 + karchive + kcmutils + kconfigwidgets + kiconthemes + knewstuff + gsettings-desktop-schemas + xsettingsd + kdecoration + sass ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 5be47327d723..b8461fbd108d 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,18 +1,47 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, kcoreaddons, kcmutils, kholidays, - kio, knewstuff, kpurpose, kross, krunner, kservice, - kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative, - qtwebengine, qtx11extras +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kconfig +, kconfigwidgets +, kcoreaddons +, kcmutils +, kholidays +, kio +, knewstuff +, kpurpose +, kross +, krunner +, kservice +, kunitconversion +, ibus +, plasma-framework +, plasma-workspace +, qtdeclarative +, qtwebengine +, qtx11extras }: mkDerivation { pname = "kdeplasma-addons"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio - knewstuff kpurpose kross krunner kservice kunitconversion ibus - plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras + kconfig + kconfigwidgets + kcoreaddons + kcmutils + kholidays + kio + knewstuff + kpurpose + kross + krunner + kservice + kunitconversion + ibus + plasma-framework + plasma-workspace + qtdeclarative + qtwebengine + qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index be5b191c3de7..5c05eca47979 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,7 +1,13 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, ki18n, qtbase, qtx11extras, libXxf86vm +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kconfig +, kconfigwidgets +, ki18n +, qtbase +, qtx11extras +, libXxf86vm }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index dfd5d4668a22..c30e1c447582 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -1,17 +1,34 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - qtbase, - kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui, - plasma-framework, plasma-workspace, qtx11extras +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtbase +, kcmutils +, kdbusaddons +, kdelibs4support +, kglobalaccel +, ki18n +, kio +, kxmlgui +, plasma-framework +, plasma-workspace +, qtx11extras }: mkDerivation { pname = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui - plasma-framework plasma-workspace qtx11extras + kcmutils + kdbusaddons + kdelibs4support + kglobalaccel + ki18n + kio + kxmlgui + plasma-framework + plasma-workspace + qtx11extras ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index 662662cdb2fd..c63d22858a55 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -1,22 +1,57 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - qtbase, - kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, - kdeclarative, ki18n, kiconthemes, kio, kirigami2, kpackage, kservice, - kwayland, kwidgetsaddons, kxmlgui, solid, systemsettings, - libraw1394, libGLU, pciutils, +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtbase +, kcmutils +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kio +, kirigami2 +, kpackage +, kservice +, kwayland +, kwidgetsaddons +, kxmlgui +, solid +, systemsettings +, libraw1394 +, libGLU +, pciutils }: mkDerivation { pname = "kinfocenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons - kdeclarative ki18n kiconthemes kio kirigami2 kpackage kservice kwayland - kwidgetsaddons kxmlgui solid systemsettings + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + ki18n + kiconthemes + kio + kirigami2 + kpackage + kservice + kwayland + kwidgetsaddons + kxmlgui + solid + systemsettings - libraw1394 libGLU pciutils + libraw1394 + libGLU + pciutils ]; preFixup = '' # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix index 6a9d055abe43..57b327a7cdc4 100644 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ b/pkgs/desktops/plasma-5/kmenuedit.nix @@ -1,14 +1,25 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - kdbusaddons, khotkeys, ki18n, kiconthemes, kio, kxmlgui, - sonnet +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kdbusaddons +, khotkeys +, ki18n +, kiconthemes +, kio +, kxmlgui +, sonnet }: mkDerivation { pname = "kmenuedit"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kdbusaddons khotkeys ki18n kiconthemes kio kxmlgui sonnet + kdbusaddons + khotkeys + ki18n + kiconthemes + kio + kxmlgui + sonnet ]; } diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix index 41191e6f4c6a..fd412711e4a2 100644 --- a/pkgs/desktops/plasma-5/kpipewire.nix +++ b/pkgs/desktops/plasma-5/kpipewire.nix @@ -1,15 +1,28 @@ -{ - mkDerivation, - extra-cmake-modules, - kwayland, ki18n, kcoreaddons, plasma-wayland-protocols, - libepoxy, ffmpeg, mesa, pipewire, wayland +{ mkDerivation +, extra-cmake-modules +, kwayland +, ki18n +, kcoreaddons +, plasma-wayland-protocols +, libepoxy +, ffmpeg +, mesa +, pipewire +, wayland }: mkDerivation { pname = "kpipewire"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kwayland ki18n kcoreaddons plasma-wayland-protocols - libepoxy ffmpeg mesa pipewire wayland + kwayland + ki18n + kcoreaddons + plasma-wayland-protocols + libepoxy + ffmpeg + mesa + pipewire + wayland ]; } diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 0d67c702dd5c..ca5ad59072f0 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -1,17 +1,44 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, - kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors, - kwindowsystem, kdeclarative, plasma-framework, qtx11extras, layer-shell-qt +{ mkDerivation +, extra-cmake-modules +, kconfig +, kcmutils +, kconfigwidgets +, kdbusaddons +, kglobalaccel +, ki18n +, kwidgetsaddons +, kxmlgui +, libkscreen +, qtdeclarative +, qtgraphicaleffects +, qtsensors +, kwindowsystem +, kdeclarative +, plasma-framework +, qtx11extras +, layer-shell-qt }: mkDerivation { pname = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n - kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors - kwindowsystem kdeclarative plasma-framework qtx11extras layer-shell-qt + kconfig + kcmutils + kconfigwidgets + kdbusaddons + kglobalaccel + ki18n + kwidgetsaddons + kxmlgui + libkscreen + qtdeclarative + qtgraphicaleffects + qtsensors + kwindowsystem + kdeclarative + plasma-framework + qtx11extras + layer-shell-qt ]; } diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index b37bbc6c8456..d53d808e1084 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -1,17 +1,39 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kcmutils, kcrash, kdeclarative, kglobalaccel, kidletime, - kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras, - wayland, layer-shell-qt, +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kcmutils +, kcrash +, kdeclarative +, kglobalaccel +, kidletime +, kwayland +, libXcursor +, pam +, plasma-framework +, qtbase +, qtdeclarative +, qtx11extras +, wayland +, layer-shell-qt }: mkDerivation { pname = "kscreenlocker"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland - libXcursor pam plasma-framework qtdeclarative qtx11extras wayland + kcmutils + kcrash + kdeclarative + kglobalaccel + kidletime + kwayland + libXcursor + pam + plasma-framework + qtdeclarative + qtx11extras + wayland layer-shell-qt ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index 4cbf08044934..9a5ee90cd362 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,7 +1,12 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase, +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kcoreaddons +, ki18n +, kwallet +, kwidgetsaddons +, qtbase }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix index d5f96e42981b..6b04d055eac7 100644 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -1,6 +1,10 @@ -{ mkDerivation, lib +{ mkDerivation +, lib , extra-cmake-modules -, libksysguard, libnl, lm_sensors, networkmanager-qt +, libksysguard +, libnl +, lm_sensors +, networkmanager-qt }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 5462814e8de2..eab364d90d00 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,8 +1,14 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, - wayland-protocols, wayland-scanner, wayland +{ mkDerivation +, lib +, extra-cmake-modules +, kguiaddons +, kidletime +, kwayland +, kwindowsystem +, qtbase +, wayland-protocols +, wayland-scanner +, wayland }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 46283eae26f4..f8177c929097 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,20 +1,61 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, fetchpatch, - - libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa, - pipewire, udev, wayland, xcb-util-cursor, xwayland, - plasma-wayland-protocols, wayland-protocols, libxcvt, - - qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors, - qtvirtualkeyboard, qtx11extras, - - breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, - kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, - kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, - krunner, kscreenlocker, kservice, kwayland, kwidgetsaddons, - kwindowsystem, kxmlgui, plasma-framework, libqaccessibilityclient, - python3 +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, fetchpatch +, libepoxy +, lcms2 +, libICE +, libSM +, libcap +, libdrm +, libinput +, libxkbcommon +, mesa +, pipewire +, udev +, wayland +, xcb-util-cursor +, xwayland +, plasma-wayland-protocols +, wayland-protocols +, libxcvt +, qtdeclarative +, qtmultimedia +, qtquickcontrols2 +, qtscript +, qtsensors +, qtvirtualkeyboard +, qtx11extras +, breeze-qt5 +, kactivities +, kcompletion +, kcmutils +, kconfig +, kconfigwidgets +, kcoreaddons +, kcrash +, kdeclarative +, kdecoration +, kglobalaccel +, ki18n +, kiconthemes +, kidletime +, kinit +, kio +, knewstuff +, knotifications +, kpackage +, krunner +, kscreenlocker +, kservice +, kwayland +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, plasma-framework +, libqaccessibilityclient +, python3 }: # TODO (ttuegel): investigate qmlplugindump failure @@ -23,18 +64,60 @@ mkDerivation { pname = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire - udev wayland xcb-util-cursor xwayland - libxcvt plasma-wayland-protocols wayland-protocols + libepoxy + lcms2 + libICE + libSM + libcap + libdrm + libinput + libxkbcommon + mesa + pipewire + udev + wayland + xcb-util-cursor + xwayland + libxcvt + plasma-wayland-protocols + wayland-protocols - qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors - qtvirtualkeyboard qtx11extras + qtdeclarative + qtmultimedia + qtquickcontrols2 + qtscript + qtsensors + qtvirtualkeyboard + qtx11extras - breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets - kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes - kidletime kinit kio knewstuff knotifications kpackage krunner kscreenlocker - kservice kwayland kwidgetsaddons kwindowsystem kxmlgui - plasma-framework libqaccessibilityclient + breeze-qt5 + kactivities + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kcrash + kdeclarative + kdecoration + kglobalaccel + ki18n + kiconthemes + kidletime + kinit + kio + knewstuff + knotifications + kpackage + krunner + kscreenlocker + kservice + kwayland + kwidgetsaddons + kwindowsystem + kxmlgui + plasma-framework + libqaccessibilityclient ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index 9ba1afaf9f83..3f19acea6bdc 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,7 +1,12 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase, +{ mkDerivation +, lib +, extra-cmake-modules +, kcoreaddons +, kdbusaddons +, ki18n +, knotifications +, kpty +, qtbase }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix index 812637795531..721eee493730 100644 --- a/pkgs/desktops/plasma-5/layer-shell-qt.nix +++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix @@ -1,6 +1,14 @@ -{ mkDerivation, lib +{ mkDerivation +, lib , extra-cmake-modules -, kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, wayland-scanner, wayland, wayland-protocols +, kguiaddons +, kidletime +, kwayland +, kwindowsystem +, qtbase +, wayland-scanner +, wayland +, wayland-protocols }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index cebe1ad4451e..ad9ddc95c045 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,10 +1,15 @@ -{ - mkDerivation, lib, propagate, - extra-cmake-modules, - qtbase, - wayland-scanner, kconfig, kwayland, - plasma-wayland-protocols, wayland, - libXrandr, qtx11extras +{ mkDerivation +, lib +, propagate +, extra-cmake-modules +, qtbase +, wayland-scanner +, kconfig +, kwayland +, plasma-wayland-protocols +, wayland +, libXrandr +, qtx11extras }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index ef4e44384448..8e9be6f743cf 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -1,9 +1,26 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, - knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, - qtbase, qtscript, qtwebengine, qtx11extras, libnl, libpcap, qtsensors, lm_sensors, +{ mkDerivation +, lib +, extra-cmake-modules +, kauth +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, ki18n +, kiconthemes +, knewstuff +, kservice +, kwidgetsaddons +, kwindowsystem +, plasma-framework +, qtbase +, qtscript +, qtwebengine +, qtx11extras +, libnl +, libpcap +, qtsensors +, lm_sensors }: mkDerivation { @@ -13,9 +30,25 @@ mkDerivation { ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets - kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras - qtwebengine knewstuff libnl libpcap qtsensors lm_sensors + kauth + kconfig + ki18n + kiconthemes + kwindowsystem + kcompletion + kconfigwidgets + kcoreaddons + kservice + kwidgetsaddons + plasma-framework + qtscript + qtx11extras + qtwebengine + knewstuff + libnl + libpcap + qtsensors + lm_sensors ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 8ae5061436d1..87f5f3b170f2 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,15 +1,30 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice, - plasma-framework, qtbase, qtscript, qtdeclarative +{ mkDerivation +, lib +, extra-cmake-modules +, kcoreaddons +, kdeclarative +, ki18n +, kitemmodels +, krunner +, kservice +, plasma-framework +, qtbase +, qtscript +, qtdeclarative }: mkDerivation { pname = "milou"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework - qtdeclarative qtscript + kcoreaddons + kdeclarative + ki18n + kitemmodels + krunner + kservice + plasma-framework + qtdeclarative + qtscript ]; } diff --git a/pkgs/desktops/plasma-5/oxygen-sounds.nix b/pkgs/desktops/plasma-5/oxygen-sounds.nix index ddb5be869bea..78fdebc416c8 100644 --- a/pkgs/desktops/plasma-5/oxygen-sounds.nix +++ b/pkgs/desktops/plasma-5/oxygen-sounds.nix @@ -1,6 +1,5 @@ -{ - mkDerivation, - extra-cmake-modules, +{ mkDerivation +, extra-cmake-modules }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 78603c3c306a..a9e4eb18820b 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -1,18 +1,39 @@ -{ - mkDerivation, - extra-cmake-modules, - frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, - ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative, - qtx11extras, libXdmcp +{ mkDerivation +, extra-cmake-modules +, frameworkintegration +, kcmutils +, kcompletion +, kconfig +, kdecoration +, kguiaddons +, ki18n +, kwidgetsaddons +, kservice +, kwayland +, kwindowsystem +, qtdeclarative +, qtx11extras +, libXdmcp }: mkDerivation { pname = "oxygen"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ - frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons - ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative - qtx11extras libXdmcp + frameworkintegration + kcmutils + kcompletion + kconfig + kdecoration + kguiaddons + ki18n + kservice + kwayland + kwidgetsaddons + kwindowsystem + qtdeclarative + qtx11extras + libXdmcp ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/plank-player.nix b/pkgs/desktops/plasma-5/plank-player.nix index 536db96ef3c3..f67cd8728ee7 100644 --- a/pkgs/desktops/plasma-5/plank-player.nix +++ b/pkgs/desktops/plasma-5/plank-player.nix @@ -1,10 +1,9 @@ -{ - mkDerivation, - extra-cmake-modules, - qtquickcontrols2, - qtmultimedia, - kirigami2, - ki18n, +{ mkDerivation +, extra-cmake-modules +, qtquickcontrols2 +, qtmultimedia +, kirigami2 +, ki18n }: mkDerivation { pname = "plank-player"; diff --git a/pkgs/desktops/plasma-5/plasma-bigscreen.nix b/pkgs/desktops/plasma-5/plasma-bigscreen.nix index 96b7b148fa08..f94b49efabc7 100644 --- a/pkgs/desktops/plasma-5/plasma-bigscreen.nix +++ b/pkgs/desktops/plasma-5/plasma-bigscreen.nix @@ -1,19 +1,18 @@ -{ - mkDerivation, - extra-cmake-modules, - kactivities, - kactivities-stats, - plasma-framework, - ki18n, - kirigami2, - kdeclarative, - kcmutils, - knotifications, - kio, - kwayland, - kwindowsystem, - plasma-workspace, - qtmultimedia, +{ mkDerivation +, extra-cmake-modules +, kactivities +, kactivities-stats +, plasma-framework +, ki18n +, kirigami2 +, kdeclarative +, kcmutils +, knotifications +, kio +, kwayland +, kwindowsystem +, plasma-workspace +, qtmultimedia }: mkDerivation { pname = "plasma-bigscreen"; diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix index 1ddd844444d8..dcd895efbbc7 100644 --- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix @@ -1,9 +1,17 @@ -{ - mkDerivation, - extra-cmake-modules, - qtbase, - kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose, - krunner, kwindowsystem, kactivities, plasma-workspace +{ mkDerivation +, extra-cmake-modules +, qtbase +, kfilemetadata +, kio +, ki18n +, kconfig +, kdbusaddons +, knotifications +, kpurpose +, krunner +, kwindowsystem +, kactivities +, plasma-workspace }: mkDerivation { @@ -12,7 +20,17 @@ mkDerivation { extra-cmake-modules ]; buildInputs = [ - qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose - krunner kwindowsystem kactivities plasma-workspace + qtbase + kfilemetadata + kio + ki18n + kconfig + kdbusaddons + knotifications + kpurpose + krunner + kwindowsystem + kactivities + plasma-workspace ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 6ab13f0c7261..5c71b38eaaf1 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,36 +1,115 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, wayland-scanner, - - boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, - libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, - xorgserver, util-linux, wayland, wayland-protocols, - - accounts-qt, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, - qtx11extras, - - attica, baloo, kaccounts-integration, kactivities, kactivities-stats, kauth, - kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, - kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, - kpeople, krunner, kscreenlocker, kwallet, kwin, phonon, - plasma-framework, plasma-workspace, qqc2-desktop-style, xf86inputlibinput +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, wayland-scanner +, boost +, fontconfig +, ibus +, libXcursor +, libXft +, libcanberra_kde +, libpulseaudio +, libxkbfile +, xf86inputevdev +, xf86inputsynaptics +, xinput +, xkeyboard_config +, xorgserver +, util-linux +, wayland +, wayland-protocols +, accounts-qt +, qtdeclarative +, qtquickcontrols +, qtquickcontrols2 +, qtsvg +, qtx11extras +, attica +, baloo +, kaccounts-integration +, kactivities +, kactivities-stats +, kauth +, kcmutils +, kdbusaddons +, kdeclarative +, kded +, kdelibs4support +, kemoticons +, kglobalaccel +, ki18n +, kitemmodels +, knewstuff +, knotifications +, knotifyconfig +, kpeople +, krunner +, kscreenlocker +, kwallet +, kwin +, phonon +, plasma-framework +, plasma-workspace +, qqc2-desktop-style +, xf86inputlibinput }: mkDerivation { pname = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ]; buildInputs = [ - boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver - libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput - xkeyboard_config wayland wayland-protocols + boost + fontconfig + ibus + libcanberra_kde + libpulseaudio + libXcursor + libXft + xorgserver + libxkbfile + phonon + xf86inputlibinput + xf86inputevdev + xf86inputsynaptics + xinput + xkeyboard_config + wayland + wayland-protocols - accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras + accounts-qt + qtdeclarative + qtquickcontrols + qtquickcontrols2 + qtsvg + qtx11extras - attica baloo kaccounts-integration kactivities kactivities-stats kauth - kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons - kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig - kpeople krunner kscreenlocker kwallet kwin plasma-framework - plasma-workspace qqc2-desktop-style + attica + baloo + kaccounts-integration + kactivities + kactivities-stats + kauth + kcmutils + kdbusaddons + kdeclarative + kded + kdelibs4support + kemoticons + kglobalaccel + ki18n + kitemmodels + knewstuff + knotifications + knotifyconfig + kpeople + krunner + kscreenlocker + kwallet + kwin + plasma-framework + plasma-workspace + qqc2-desktop-style ]; patches = [ diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix index 8ddd53548e75..801bf4d978b3 100644 --- a/pkgs/desktops/plasma-5/plasma-disks.nix +++ b/pkgs/desktops/plasma-5/plasma-disks.nix @@ -1,18 +1,49 @@ -{ - mkDerivation, extra-cmake-modules, kdoctools, - kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, - kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace, - systemsettings +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfig +, kdbusaddons +, khtml +, ki18n +, kiconthemes +, kio +, kitemviews +, kservice +, kwindowsystem +, kxmlgui +, qtquickcontrols +, qtquickcontrols2 +, kactivities +, kactivities-stats +, kirigami2 +, kcrash +, plasma-workspace +, systemsettings }: mkDerivation { pname = "plasma-disks"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice - kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 - kactivities kactivities-stats kirigami2 kcrash plasma-workspace + kcmutils + kconfig + kdbusaddons + khtml + ki18n + kiconthemes + kio + kitemviews + kservice + kwindowsystem + kxmlgui + qtquickcontrols + qtquickcontrols2 + kactivities + kactivities-stats + kirigami2 + kcrash + plasma-workspace systemsettings ]; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix index 2c6bd8337ff1..f88b737e0ec7 100644 --- a/pkgs/desktops/plasma-5/plasma-integration/default.nix +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -1,9 +1,17 @@ -{ - mkDerivation, - extra-cmake-modules, - breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, - kwayland, libXcursor, qtquickcontrols2, wayland, wayland-protocols, - plasma-wayland-protocols +{ mkDerivation +, extra-cmake-modules +, breeze-qt5 +, kconfig +, kconfigwidgets +, kiconthemes +, kio +, knotifications +, kwayland +, libXcursor +, qtquickcontrols2 +, wayland +, wayland-protocols +, plasma-wayland-protocols }: # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration @@ -12,8 +20,17 @@ mkDerivation { pname = "plasma-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland - libXcursor qtquickcontrols2 wayland wayland-protocols + breeze-qt5 + kconfig + kconfigwidgets + kiconthemes + kio + knotifications + kwayland + libXcursor + qtquickcontrols2 + wayland + wayland-protocols plasma-wayland-protocols ]; } diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index 41324d53b6a7..ce0da404bb59 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -1,16 +1,36 @@ -{ - mkDerivation, lib, - - extra-cmake-modules, kdoctools, - - coreutils, dbus, gnugrep, gnused, libdbusmenu, pam, wayland, appstream, - - kdeclarative, kdelibs4support, kpeople, kconfig, krunner, kinit, kwayland, kwin, - plasma-framework, telepathy, libphonenumber, protobuf, libqofono, modemmanager-qt, - networkmanager-qt, plasma-workspace, - maliit-framework, maliit-keyboard, qtfeedback, - - qtwayland, qttools +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, coreutils +, dbus +, gnugrep +, gnused +, libdbusmenu +, pam +, wayland +, appstream +, kdeclarative +, kdelibs4support +, kpeople +, kconfig +, krunner +, kinit +, kwayland +, kwin +, plasma-framework +, telepathy +, libphonenumber +, protobuf +, libqofono +, modemmanager-qt +, networkmanager-qt +, plasma-workspace +, maliit-framework +, maliit-keyboard +, qtfeedback +, qtwayland +, qttools }: let inherit (lib) getBin getLib; in @@ -20,10 +40,29 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - appstream libdbusmenu pam wayland - kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin - plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt - networkmanager-qt maliit-framework maliit-keyboard plasma-workspace qtfeedback + appstream + libdbusmenu + pam + wayland + kdeclarative + kdelibs4support + kpeople + kconfig + krunner + kinit + kwayland + kwin + plasma-framework + telepathy + libphonenumber + protobuf + libqofono + modemmanager-qt + networkmanager-qt + maliit-framework + maliit-keyboard + plasma-workspace + qtfeedback ]; postPatch = '' diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix index 6e2608c7f97b..50f0d321b394 100644 --- a/pkgs/desktops/plasma-5/plasma-nano/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nano/default.nix @@ -1,7 +1,6 @@ -{ - mkDerivation, - extra-cmake-modules, - plasma-framework +{ mkDerivation +, extra-cmake-modules +, plasma-framework }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 28331fc70738..99f4033303f9 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,27 +1,70 @@ -{ - mkDerivation, lib, substituteAll, - extra-cmake-modules, kdoctools, - kcmutils, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, - ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, - kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, prison, solid, - - mobile-broadband-provider-info, openconnect, openvpn, - modemmanager-qt, networkmanager-qt, qca-qt5, - qtbase, qtdeclarative, qttools, +{ mkDerivation +, lib +, substituteAll +, extra-cmake-modules +, kdoctools +, kcmutils +, kcompletion +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kinit +, kio +, kitemviews +, knotifications +, kservice +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, plasma-framework +, prison +, solid +, mobile-broadband-provider-info +, openconnect +, openvpn +, modemmanager-qt +, networkmanager-qt +, qca-qt5 +, qtbase +, qtdeclarative +, qttools }: mkDerivation { pname = "plasma-nm"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ - kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion - kcmutils kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui - prison solid + kdeclarative + ki18n + kio + kwindowsystem + plasma-framework + kcompletion + kcmutils + kconfigwidgets + kcoreaddons + kdbusaddons + kiconthemes + kinit + kitemviews + knotifications + kservice + kwallet + kwidgetsaddons + kxmlgui + prison + solid qtdeclarative - modemmanager-qt networkmanager-qt qca-qt5 - mobile-broadband-provider-info openconnect + modemmanager-qt + networkmanager-qt + qca-qt5 + mobile-broadband-provider-info + openconnect ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index b0a4e614bf32..07170892f279 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,20 +1,44 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kcmutils, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework, - qtbase, qtdeclarative, - gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfigwidgets +, kcoreaddons +, kdeclarative +, kglobalaccel +, ki18n +, kwindowsystem +, plasma-framework +, qtbase +, qtdeclarative +, gconf +, glib +, libcanberra-gtk3 +, libpulseaudio +, sound-theme-freedesktop }: mkDerivation { pname = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop + gconf + glib + libcanberra-gtk3 + libpulseaudio + sound-theme-freedesktop - kcmutils kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework + kcmutils + kconfigwidgets + kcoreaddons + kdeclarative + kglobalaccel + ki18n + plasma-framework kwindowsystem - qtbase qtdeclarative + qtbase + qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix index a1688e939c7b..3f169244fdaf 100644 --- a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix +++ b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix @@ -1,22 +1,21 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, - knotifications, - ki18n, - solid, - kcoreaddons, - kdeclarative, - kcmutils, - kpackage, - kwindowsystem, - wayland, - pkg-config, - libcec, - libcec_platform, - libevdev, - plasma-workspace, - plasma-wayland-protocols, +{ mkDerivation +, extra-cmake-modules +, kconfig +, knotifications +, ki18n +, solid +, kcoreaddons +, kdeclarative +, kcmutils +, kpackage +, kwindowsystem +, wayland +, pkg-config +, libcec +, libcec_platform +, libevdev +, plasma-workspace +, plasma-wayland-protocols }: mkDerivation { pname = "plasma-remotecontrollers"; diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix index b6ceb37a71ff..ba1def530476 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/default.nix +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -1,16 +1,14 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - - kactivities, - plasma-framework, - kwindowsystem, - networkmanager-qt, - libksysguard, - - encfs, - cryfs, - fuse +{ mkDerivation +, lib +, extra-cmake-modules +, kactivities +, plasma-framework +, kwindowsystem +, networkmanager-qt +, libksysguard +, encfs +, cryfs +, fuse }: mkDerivation { @@ -24,7 +22,10 @@ mkDerivation { ]; buildInputs = [ - kactivities plasma-framework kwindowsystem libksysguard + kactivities + plasma-framework + kwindowsystem + libksysguard networkmanager-qt ]; diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix index 8ae136ac78ba..799973c21538 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix @@ -1,4 +1,4 @@ -{ mkDerivation , extra-cmake-modules }: +{ mkDerivation, extra-cmake-modules }: mkDerivation { pname = "plasma-workspace-wallpapers"; diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 27fb2b0c594e..252b6a9fac55 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -1,23 +1,72 @@ -{ - mkDerivation, lib, - - extra-cmake-modules, kdoctools, - - coreutils, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, - libXtst, libXft, pam, wayland, xmessage, xsetroot, - - baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, - kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, - kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, - kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, - kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, - phonon, plasma-framework, prison, solid, kholidays, kquickcharts, - appstream-qt, plasma-wayland-protocols, kpipewire, libkexiv2, - - qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, - qtwayland, qtx11extras, qqc2-desktop-style, polkit-qt, - - pipewire, libdrm +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, coreutils +, gnugrep +, gnused +, isocodes +, libdbusmenu +, libSM +, libXcursor +, libXtst +, libXft +, pam +, wayland +, xmessage +, xsetroot +, baloo +, breeze-qt5 +, kactivities +, kactivities-stats +, kcmutils +, kconfig +, kcrash +, kdbusaddons +, kdeclarative +, kdelibs4support +, kdesu +, kglobalaccel +, kidletime +, kinit +, kjsembed +, knewstuff +, knotifyconfig +, kpackage +, kpeople +, krunner +, kscreenlocker +, ktexteditor +, ktextwidgets +, kwallet +, kwayland +, kwin +, kxmlrpcclient +, libkscreen +, libksysguard +, libqalculate +, networkmanager-qt +, phonon +, plasma-framework +, prison +, solid +, kholidays +, kquickcharts +, appstream-qt +, plasma-wayland-protocols +, kpipewire +, libkexiv2 +, qtgraphicaleffects +, qtquickcontrols +, qtquickcontrols2 +, qtscript +, qttools +, qtwayland +, qtx11extras +, qqc2-desktop-style +, polkit-qt +, pipewire +, libdrm }: let inherit (lib) getBin getLib; in @@ -28,20 +77,66 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - isocodes libdbusmenu libSM libXcursor libXtst libXft pam wayland + isocodes + libdbusmenu + libSM + libXcursor + libXtst + libXft + pam + wayland - baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons - kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff - knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor - ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard - libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays kquickcharts appstream-qt plasma-wayland-protocols kpipewire + baloo + kactivities + kactivities-stats + kcmutils + kconfig + kcrash + kdbusaddons + kdeclarative + kdelibs4support + kdesu + kglobalaccel + kidletime + kjsembed + knewstuff + knotifyconfig + kpackage + kpeople + krunner + kscreenlocker + ktexteditor + ktextwidgets + kwallet + kwayland + kwin + kxmlrpcclient + libkscreen + libksysguard + libqalculate + networkmanager-qt + phonon + plasma-framework + prison + solid + kholidays + kquickcharts + appstream-qt + plasma-wayland-protocols + kpipewire libkexiv2 - qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland - qtx11extras qqc2-desktop-style polkit-qt + qtgraphicaleffects + qtquickcontrols + qtquickcontrols2 + qtscript + qtwayland + qtx11extras + qqc2-desktop-style + polkit-qt - pipewire libdrm + pipewire + libdrm ]; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 82ebf3e31365..3f4387ed5f34 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -1,15 +1,33 @@ -{ - mkDerivation, lib, extra-cmake-modules, - kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, - kwidgetsaddons, kwindowsystem, polkit-qt, qtbase +{ mkDerivation +, lib +, extra-cmake-modules +, kcoreaddons +, kconfig +, kcrash +, kdbusaddons +, ki18n +, kiconthemes +, knotifications +, kwidgetsaddons +, kwindowsystem +, polkit-qt +, qtbase }: mkDerivation { pname = "polkit-kde-agent"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ - kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes - knotifications kwindowsystem polkit-qt + kdbusaddons + kwidgetsaddons + kcoreaddons + kcrash + kconfig + ki18n + kiconthemes + knotifications + kwindowsystem + polkit-qt ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index bb511c21ba67..d60f9701dee6 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,17 +1,45 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - bluez-qt, kactivities, kauth, kconfig, kdbusaddons, - kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, - networkmanager-qt, plasma-workspace, qtx11extras, solid, udev +{ mkDerivation +, extra-cmake-modules +, kdoctools +, bluez-qt +, kactivities +, kauth +, kconfig +, kdbusaddons +, kglobalaccel +, ki18n +, kidletime +, kio +, knotifyconfig +, kwayland +, libkscreen +, networkmanager-qt +, plasma-workspace +, qtx11extras +, solid +, udev }: mkDerivation { pname = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth - kglobalaccel ki18n kio kidletime kwayland libkscreen - networkmanager-qt plasma-workspace qtx11extras + kconfig + kdbusaddons + knotifyconfig + solid + udev + bluez-qt + kactivities + kauth + kglobalaccel + ki18n + kio + kidletime + kwayland + libkscreen + networkmanager-qt + plasma-workspace + qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index c83bbcecf567..94d8f92ac4f9 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -1,17 +1,48 @@ -{ - mkDerivation, extra-cmake-modules, kdoctools, - kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, - kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfig +, kdbusaddons +, khtml +, ki18n +, kiconthemes +, kio +, kitemviews +, kservice +, kwindowsystem +, kxmlgui +, qtquickcontrols +, qtquickcontrols2 +, kactivities +, kactivities-stats +, kirigami2 +, kcrash +, plasma-workspace }: mkDerivation { pname = "systemsettings"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice - kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 - kactivities kactivities-stats kirigami2 kcrash plasma-workspace + kcmutils + kconfig + kdbusaddons + khtml + ki18n + kiconthemes + kio + kitemviews + kservice + kwindowsystem + kxmlgui + qtquickcontrols + qtquickcontrols2 + kactivities + kactivities-stats + kirigami2 + kcrash + plasma-workspace ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 00533367d4ce..dc5728791b60 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,19 +1,49 @@ -{ - mkDerivation, lib, - extra-cmake-modules, gettext, kdoctools, - cups, libepoxy, mesa, pcre, pipewire, wayland, wayland-protocols, - kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio, - qtbase +{ mkDerivation +, lib +, extra-cmake-modules +, gettext +, kdoctools +, cups +, libepoxy +, mesa +, pcre +, pipewire +, wayland +, wayland-protocols +, kcoreaddons +, knotifications +, kwayland +, kwidgetsaddons +, kwindowsystem +, kirigami2 +, kdeclarative +, plasma-framework +, plasma-wayland-protocols +, kio +, qtbase }: mkDerivation { pname = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ - cups libepoxy mesa pcre pipewire wayland wayland-protocols + cups + libepoxy + mesa + pcre + pipewire + wayland + wayland-protocols - kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem - kirigami2 kdeclarative plasma-framework plasma-wayland-protocols + kio + kcoreaddons + knotifications + kwayland + kwidgetsaddons + kwindowsystem + kirigami2 + kdeclarative + plasma-framework + plasma-wayland-protocols ]; } From 1a805a718df2360663c686de12a8727de57a90bf Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Oct 2022 10:22:13 +0300 Subject: [PATCH 419/505] kde/frameworks: 5.98 -> 5.99 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 333 insertions(+), 333 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index e7704c32122b..168ab3bdf63e 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.98/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.99/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 6b03f50687a2..2c7ae1f8a4b2 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/attica-5.98.0.tar.xz"; - sha256 = "0w1w6w2jia1q32jnn2dhyxmkq64ha1dcbsqj233v4f224rp3aknp"; - name = "attica-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/attica-5.99.0.tar.xz"; + sha256 = "1cb3cdn8v68d14l7gax4zdjk0vgqwj6gxmdnzhf9qfvik6rd6nhp"; + name = "attica-5.99.0.tar.xz"; }; }; baloo = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/baloo-5.98.0.tar.xz"; - sha256 = "0x515lnvrzlnsv5i924q17mzi88k00krj90myad17s0g7p5pi1rw"; - name = "baloo-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/baloo-5.99.0.tar.xz"; + sha256 = "0spz0sa2lbdbm12d10bswcyawayxpykk3v8yicv5khgf6adpdyq0"; + name = "baloo-5.99.0.tar.xz"; }; }; bluez-qt = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/bluez-qt-5.98.0.tar.xz"; - sha256 = "0h2k2qiskn921cpni5rs7x5ahric6dlllwsrk77akpi4xcsrip2g"; - name = "bluez-qt-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/bluez-qt-5.99.0.tar.xz"; + sha256 = "11fg7lk1yxj5dfq7s8z17n9prvnqfvk1hsgyd1ygi1x1d2qipjg7"; + name = "bluez-qt-5.99.0.tar.xz"; }; }; breeze-icons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/breeze-icons-5.98.0.tar.xz"; - sha256 = "0a3zvmhcfsnxv0jpyjny3sl769p99psadl1872v0qlkax47pvsjp"; - name = "breeze-icons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/breeze-icons-5.99.0.tar.xz"; + sha256 = "1z9wrmb4jj7sfnb7kqmx2ww53vily52ycm7rgycr2b1q0jf6j3s8"; + name = "breeze-icons-5.99.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/extra-cmake-modules-5.98.0.tar.xz"; - sha256 = "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w"; - name = "extra-cmake-modules-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/extra-cmake-modules-5.99.0.tar.xz"; + sha256 = "0zl0hwp077b8w338bl0210i6892kwfx2vqpn55qvb3b20sk8m081"; + name = "extra-cmake-modules-5.99.0.tar.xz"; }; }; frameworkintegration = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/frameworkintegration-5.98.0.tar.xz"; - sha256 = "1mrangjj8lhm4njpkhqna2zwnidkd9crs23gj6kdlwzmiknypi6q"; - name = "frameworkintegration-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/frameworkintegration-5.99.0.tar.xz"; + sha256 = "14dx60xvgcb6nf5d83cgm7y6wc8d7ngxg6aaka6k8996qfkczz9k"; + name = "frameworkintegration-5.99.0.tar.xz"; }; }; kactivities = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kactivities-5.98.0.tar.xz"; - sha256 = "0n7r88y1b8mph5al2xh8fbw5ckdzdmdzjipf205y20ib35bskd9i"; - name = "kactivities-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kactivities-5.99.0.tar.xz"; + sha256 = "1l7jzj3nscfmbiq105v9gkz4sd0c92vydmhw4j9mjjjn16aqbs39"; + name = "kactivities-5.99.0.tar.xz"; }; }; kactivities-stats = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kactivities-stats-5.98.0.tar.xz"; - sha256 = "0zvw3km1wf91wl9xbjvawjia0847kbs3js4nbf3d0z87l5h6rbx8"; - name = "kactivities-stats-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kactivities-stats-5.99.0.tar.xz"; + sha256 = "0cr0sjk1rwv3zjvmhs2xc7wfs33r9x6padybc7v2aq751gz5cc4k"; + name = "kactivities-stats-5.99.0.tar.xz"; }; }; kapidox = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kapidox-5.98.0.tar.xz"; - sha256 = "1k2qk8ibv5dqdhkn2992n8rlmslpmngz83hxb7zrh3pkphdg8v2n"; - name = "kapidox-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kapidox-5.99.0.tar.xz"; + sha256 = "15r8x5z50xwfmh507kf3hsr8yqlfank224hfhcrpyl1vi256jb8c"; + name = "kapidox-5.99.0.tar.xz"; }; }; karchive = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/karchive-5.98.0.tar.xz"; - sha256 = "1ipj7j1iw6g56z0qppji38h6qwbs05piiqqbsw8hdbf96l6cdiq2"; - name = "karchive-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/karchive-5.99.0.tar.xz"; + sha256 = "1z4msj6w7g2fy2mp07aadm9f2qv5x4mhjisv7ppl8hrhz355f6ap"; + name = "karchive-5.99.0.tar.xz"; }; }; kauth = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kauth-5.98.0.tar.xz"; - sha256 = "0nzdvx2mibpq1cgzpll9ffjr46vch1qvriaywyqih0iybx6mx5z6"; - name = "kauth-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kauth-5.99.0.tar.xz"; + sha256 = "14xz3gh4p7dn0wacjyqwm5x82kiwik3nswx7icmhnq686cvp7fin"; + name = "kauth-5.99.0.tar.xz"; }; }; kbookmarks = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kbookmarks-5.98.0.tar.xz"; - sha256 = "1rpjqz2xnpb2wp2k3pjdclbkb0p96y48x6h8l056nr93alxyrqvi"; - name = "kbookmarks-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kbookmarks-5.99.0.tar.xz"; + sha256 = "0vb8q69ki6aqmq8hacqq886dl7kwf9zyw015vb52nsinv8zjvf5m"; + name = "kbookmarks-5.99.0.tar.xz"; }; }; kcalendarcore = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcalendarcore-5.98.0.tar.xz"; - sha256 = "16kclspsjzld9n07z1i8li2pc91ihpqhbk46a4s92nsihs2dkayk"; - name = "kcalendarcore-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcalendarcore-5.99.0.tar.xz"; + sha256 = "11zcgjkz0q4da3vxis7b4lg07sfvk01z0dgx1ccpa15ardmc8l8r"; + name = "kcalendarcore-5.99.0.tar.xz"; }; }; kcmutils = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcmutils-5.98.0.tar.xz"; - sha256 = "0jqkg4i16jnxricrhi1cbvv7gjjj7ry3z36mzh11h48ml7rl05qx"; - name = "kcmutils-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcmutils-5.99.0.tar.xz"; + sha256 = "1ljaz8xja2z720cr6n8g2lizsb4kw4vlakfv5xhq466am27csyvm"; + name = "kcmutils-5.99.0.tar.xz"; }; }; kcodecs = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcodecs-5.98.0.tar.xz"; - sha256 = "0n10r7s9r25xp7vlym41qi421kld00niig73yark7yghj0r41jcz"; - name = "kcodecs-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcodecs-5.99.0.tar.xz"; + sha256 = "0xi0hscwf4kv5cp7hxwialy2wqr6ijdh0syh9p43icwx6c8q1kb2"; + name = "kcodecs-5.99.0.tar.xz"; }; }; kcompletion = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcompletion-5.98.0.tar.xz"; - sha256 = "191vid00zskvhl6dgj6yz9iyvwdcmg35l5gq68ggjr17cj59acsf"; - name = "kcompletion-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcompletion-5.99.0.tar.xz"; + sha256 = "14s7nmslli2vaiwg993rg0wvfqlnfcvxadapl41s92iisf6b4m2b"; + name = "kcompletion-5.99.0.tar.xz"; }; }; kconfig = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kconfig-5.98.0.tar.xz"; - sha256 = "15m2bggfr682q68dym7nzmvz7q7pwarzijad1wj0r5cs62l3bkjy"; - name = "kconfig-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kconfig-5.99.0.tar.xz"; + sha256 = "19jqsah1x1086sqnv5f4bicmi4c5y8idxrx96ji7jign5z9c7isx"; + name = "kconfig-5.99.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kconfigwidgets-5.98.0.tar.xz"; - sha256 = "05bwldqc5k6dlzsxjby5565sch6i0mh7jg5cbyjz24xb1fpj0d7b"; - name = "kconfigwidgets-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kconfigwidgets-5.99.0.tar.xz"; + sha256 = "07xzgmx3fvrynzhnnxrdr4536n1v10rwgk2z92q1y1q18cmbwyc5"; + name = "kconfigwidgets-5.99.0.tar.xz"; }; }; kcontacts = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcontacts-5.98.0.tar.xz"; - sha256 = "0g3lg1i9rg7hjw7xjx9228sy54dy35lgwghcjds5cawszl5yi106"; - name = "kcontacts-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcontacts-5.99.0.tar.xz"; + sha256 = "1f3288xll0kd0dyq7namfykq8f9zkg5lm27lk2vfvba4v28hdax5"; + name = "kcontacts-5.99.0.tar.xz"; }; }; kcoreaddons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcoreaddons-5.98.0.tar.xz"; - sha256 = "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52"; - name = "kcoreaddons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcoreaddons-5.99.0.tar.xz"; + sha256 = "06qkyk3zjkpjd7zynx5krh6k2qx8nxmggyhkvd4dgcbi74ys6xjs"; + name = "kcoreaddons-5.99.0.tar.xz"; }; }; kcrash = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcrash-5.98.0.tar.xz"; - sha256 = "03ba3x9jgp15dxgwbjnv5s98f5di2z4ncp4hiv1qkyiibqqfx6kf"; - name = "kcrash-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcrash-5.99.0.tar.xz"; + sha256 = "1wn3cwdhipw2ry1qf58cf24vq23jg8rnki33vc6mwbi54qkc95p8"; + name = "kcrash-5.99.0.tar.xz"; }; }; kdav = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdav-5.98.0.tar.xz"; - sha256 = "02474a3k7yqgnb1sbxbnm6l4cahn88y2631jvkq9xlmcx7xs2dzi"; - name = "kdav-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdav-5.99.0.tar.xz"; + sha256 = "1r36nlybwwn5pk6q9hl4zkyhp3vyrqdp75g4fd4jj1a2y88yiwzd"; + name = "kdav-5.99.0.tar.xz"; }; }; kdbusaddons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdbusaddons-5.98.0.tar.xz"; - sha256 = "0fwdmlnci2xn5pi1ywgia3xka3zsh6gl6xpx1gvql7lczk1y490a"; - name = "kdbusaddons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdbusaddons-5.99.0.tar.xz"; + sha256 = "1n9j9gf4br0vykbwf1n0zcvwfz727d71ny92ka0g97bid7nwrix0"; + name = "kdbusaddons-5.99.0.tar.xz"; }; }; kdeclarative = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdeclarative-5.98.0.tar.xz"; - sha256 = "0y5scmcnzhwvyb7x6fdb59xgdhghw8v9i3r05gx1x7g1gfsw0wh6"; - name = "kdeclarative-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdeclarative-5.99.0.tar.xz"; + sha256 = "191s25l07z0blqcap23l6gbzvxa6pcqhsfaqfkf4f3vap48wr2hn"; + name = "kdeclarative-5.99.0.tar.xz"; }; }; kded = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kded-5.98.0.tar.xz"; - sha256 = "1k8yxdnihfvvdjmw7lmd62vi5k1hpvjdcwd7njqxz6178iq7dd75"; - name = "kded-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kded-5.99.0.tar.xz"; + sha256 = "1kbh921p3n9zszbvsrnrmi32v567s7dqp7dfm13kykmz9lsxih82"; + name = "kded-5.99.0.tar.xz"; }; }; kdelibs4support = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kdelibs4support-5.98.0.tar.xz"; - sha256 = "0hyyrxic1rkw2jrr92rnmbk6bqkfrcnpc917vs7xyansk9799b8f"; - name = "kdelibs4support-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kdelibs4support-5.99.0.tar.xz"; + sha256 = "074d7qaai4xj2w1534862a13flqfchdr2c6651gdgrw4275cfd85"; + name = "kdelibs4support-5.99.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kdesignerplugin-5.98.0.tar.xz"; - sha256 = "17b0javl6k5zcmx04aqzmh3qdgwvzhf62x603m4pg6xbl3zns67g"; - name = "kdesignerplugin-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kdesignerplugin-5.99.0.tar.xz"; + sha256 = "0wvx95nx11b25ib1yqmagvzp2ky7yqdrwaxm03cvhb0y92ymmrmf"; + name = "kdesignerplugin-5.99.0.tar.xz"; }; }; kdesu = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdesu-5.98.0.tar.xz"; - sha256 = "15fbb7zifk4lhnlwvqhs9svzb80qwms03zbrjfnsc1n1wyyfk7v2"; - name = "kdesu-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdesu-5.99.0.tar.xz"; + sha256 = "0chwfman5ka1fgbv5ckr21z93xmbhccv527y43mqa9rwa3gdk4xk"; + name = "kdesu-5.99.0.tar.xz"; }; }; kdewebkit = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kdewebkit-5.98.0.tar.xz"; - sha256 = "03bwwgzh1xfj4w7q2cvr7712yrjgf9qhqkqgzypcdb49gpvaq164"; - name = "kdewebkit-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kdewebkit-5.99.0.tar.xz"; + sha256 = "1m1x63w6qb4dbr5p9vzg0v5hc0bxk86h2qswm52nx8wagapi1qhp"; + name = "kdewebkit-5.99.0.tar.xz"; }; }; kdnssd = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdnssd-5.98.0.tar.xz"; - sha256 = "0wcjq0g1cdjz9npy31i4rqbx85a95f15w71aamhm8x82l8nysv4g"; - name = "kdnssd-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdnssd-5.99.0.tar.xz"; + sha256 = "071ab2gx19vrl5jcm14w4y0rk431wmmmkzcs8mkcr8rwpdclyca7"; + name = "kdnssd-5.99.0.tar.xz"; }; }; kdoctools = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdoctools-5.98.0.tar.xz"; - sha256 = "0ygpjasdynsmb3c8rdwnc5jminl5f34cmqnihsig831xsq8z6chs"; - name = "kdoctools-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdoctools-5.99.0.tar.xz"; + sha256 = "19p3lkis641cdbbfpld122n242l3980j5x38mwd6slpl2alyz5f6"; + name = "kdoctools-5.99.0.tar.xz"; }; }; kemoticons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kemoticons-5.98.0.tar.xz"; - sha256 = "0f3d0jmpnqkrjn95sbvjzda923rfdgrlxd4k58pmzd0bblxkcxh2"; - name = "kemoticons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kemoticons-5.99.0.tar.xz"; + sha256 = "1fihsp4w9icc47fswnikmdpdwrznrv2zdddc59akd5n308224sys"; + name = "kemoticons-5.99.0.tar.xz"; }; }; kfilemetadata = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kfilemetadata-5.98.0.tar.xz"; - sha256 = "1nsvslhs2kiff3r5ji8z931lh6srvjzzvwnv9cs0j74sr46c6rkn"; - name = "kfilemetadata-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kfilemetadata-5.99.0.tar.xz"; + sha256 = "15ni3ns6c85a7121nph9c48f9ddna5bfj1134wrn76jwa2scs7vs"; + name = "kfilemetadata-5.99.0.tar.xz"; }; }; kglobalaccel = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kglobalaccel-5.98.0.tar.xz"; - sha256 = "1vr6k7lpxsxa6in60ld2wcdqfpaan5xgbmwm3xyr584x6pv737cl"; - name = "kglobalaccel-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kglobalaccel-5.99.0.tar.xz"; + sha256 = "0c4wi6kpra34wwvsj12f1bis8jkv4c57jgp9b5k72h04hpnps7a7"; + name = "kglobalaccel-5.99.0.tar.xz"; }; }; kguiaddons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kguiaddons-5.98.0.tar.xz"; - sha256 = "022qf858khdqklq117i223ihpw8mvdcbcfn8cwqmn2cv9qnfxnqj"; - name = "kguiaddons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kguiaddons-5.99.0.tar.xz"; + sha256 = "0kqvf7h98d0bsgqmcfwasi7ik3025g0bi3brx47wrkd3nxjym1zf"; + name = "kguiaddons-5.99.0.tar.xz"; }; }; kholidays = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kholidays-5.98.0.tar.xz"; - sha256 = "0ysw52wiyxrkprn0gis85nphpfl1wdb4439i66dfmg7s9nyqpzp0"; - name = "kholidays-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kholidays-5.99.0.tar.xz"; + sha256 = "1k165ksmznhx2d5ycmw1lwly7qkmj50113w1qrfqvg16jl6il4zq"; + name = "kholidays-5.99.0.tar.xz"; }; }; khtml = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/khtml-5.98.0.tar.xz"; - sha256 = "0bflwrp6i2w6a3fq2m2df655495rpnsmqcm7w1f1dzfndc6yd9i5"; - name = "khtml-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/khtml-5.99.0.tar.xz"; + sha256 = "0vwkii8x6l3sw0nkxvv960frz9qgjxpkxg6cabxvp3v5gcb3fbzr"; + name = "khtml-5.99.0.tar.xz"; }; }; ki18n = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/ki18n-5.98.0.tar.xz"; - sha256 = "0b3r53v2ybhlyqpkjv98dv2w9q49yqqxk9qzbyc4mm7ypq4hvl47"; - name = "ki18n-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/ki18n-5.99.0.tar.xz"; + sha256 = "1bgq7saadrh9vvx15hyf03cir1nywad63vlg07qpc8ra01ddsi0m"; + name = "ki18n-5.99.0.tar.xz"; }; }; kiconthemes = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kiconthemes-5.98.0.tar.xz"; - sha256 = "1qmld8xgabmwx2dh5395pll0a0jgirxhlbqv6aph76jg4lvynkqx"; - name = "kiconthemes-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kiconthemes-5.99.0.tar.xz"; + sha256 = "019s0wr00s6c8p70jzi3vr2m5wkc3rsnlc44ldn16z4r4x9wl9m4"; + name = "kiconthemes-5.99.0.tar.xz"; }; }; kidletime = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kidletime-5.98.0.tar.xz"; - sha256 = "1jdbjkishqnlzz1qrzyg92xnlsl7w89dmrh0zhzaj9bnr5a3icck"; - name = "kidletime-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kidletime-5.99.0.tar.xz"; + sha256 = "1wfwhfzhpsy1m5zm2m99dsg0g9hjns33m4v4714sfpyngzqwlggg"; + name = "kidletime-5.99.0.tar.xz"; }; }; kimageformats = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kimageformats-5.98.0.tar.xz"; - sha256 = "0v4jr1lh2qjk453q8mpz94cd98k4kmjrykn8kxrd7zvrkaa4snfy"; - name = "kimageformats-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kimageformats-5.99.0.tar.xz"; + sha256 = "1vmi3mi7gg81f556dm8gk7i3k9izr008swpdpyqd3n03zva3drh6"; + name = "kimageformats-5.99.0.tar.xz"; }; }; kinit = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kinit-5.98.0.tar.xz"; - sha256 = "04654hz3yipnlhy5gz3bkh988fcfl1lv7608k4xa5qnbsxaqh141"; - name = "kinit-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kinit-5.99.0.tar.xz"; + sha256 = "0xq1sqyni7xzcnjiaszaxwhv7q2p4zjp6nixkam356iswkbss0i3"; + name = "kinit-5.99.0.tar.xz"; }; }; kio = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kio-5.98.0.tar.xz"; - sha256 = "0z1ikpa3an3qmd26h2v48kxxw1jph21i12x4nawvc4x1dp4vkm1d"; - name = "kio-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kio-5.99.0.tar.xz"; + sha256 = "0z587zrmdxg2dld6x6qzkpnqbcar7swz76ihhclwhcsjp94vzlpg"; + name = "kio-5.99.0.tar.xz"; }; }; kirigami2 = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kirigami2-5.98.0.tar.xz"; - sha256 = "1l0ggwrprmg5n5y3gxv7h4593fg87d7naxkf30603kkavq0hgks6"; - name = "kirigami2-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kirigami2-5.99.0.tar.xz"; + sha256 = "1qh3vpac07582d944zgh3sxsb5i4kn2csa5dj6m52697jfpyp25r"; + name = "kirigami2-5.99.0.tar.xz"; }; }; kitemmodels = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kitemmodels-5.98.0.tar.xz"; - sha256 = "1z9swjmll833jxy2ym63zzgi9vl8ld79mgypndqszsrd4mfsbs16"; - name = "kitemmodels-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kitemmodels-5.99.0.tar.xz"; + sha256 = "1z52dkrj5pg0c3avm8jph54j4vjfswsnkcmbdnbg6337qs6rvkip"; + name = "kitemmodels-5.99.0.tar.xz"; }; }; kitemviews = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kitemviews-5.98.0.tar.xz"; - sha256 = "176gqlinsvdgkbg7kr4qd97mnvcnbymrkcs9kg6hm75qzxcaj8dj"; - name = "kitemviews-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kitemviews-5.99.0.tar.xz"; + sha256 = "13gr90sjbpqkzg370d82ji03wn9d3zcnvlhmpkvclbql6knx0q8i"; + name = "kitemviews-5.99.0.tar.xz"; }; }; kjobwidgets = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kjobwidgets-5.98.0.tar.xz"; - sha256 = "0f87n5d3h2f9y1z2imfd0jj9108wbcxg7dg4k1c53zar2lrfx4wc"; - name = "kjobwidgets-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kjobwidgets-5.99.0.tar.xz"; + sha256 = "1ywqpcw925wl1lcrqpkvdhwj5s4m3n02mghx8pir7w42n36ykxq6"; + name = "kjobwidgets-5.99.0.tar.xz"; }; }; kjs = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kjs-5.98.0.tar.xz"; - sha256 = "03is1a5b1sfh1nd011lchgir9nrywvax06ilg9y7z0vsn0ick7ik"; - name = "kjs-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kjs-5.99.0.tar.xz"; + sha256 = "0jsy13gjhyl0yhdx7dxxapaqigr9a06bz555pngnfzf6lia15wa0"; + name = "kjs-5.99.0.tar.xz"; }; }; kjsembed = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kjsembed-5.98.0.tar.xz"; - sha256 = "0zb4vr0hp73lzc1gfnpq1grwmlpdvnp8awf3ydx4vqjh9n6jbaf2"; - name = "kjsembed-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kjsembed-5.99.0.tar.xz"; + sha256 = "0w104v96416bcf18aimxqykmi7d40l2x53g8d91zjclpylxx12gw"; + name = "kjsembed-5.99.0.tar.xz"; }; }; kmediaplayer = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kmediaplayer-5.98.0.tar.xz"; - sha256 = "0wcv99xgg9pxijbjl4cmsgmpwb893ira6wd3ys5ihk2nakbvd09x"; - name = "kmediaplayer-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kmediaplayer-5.99.0.tar.xz"; + sha256 = "1f2cn1gakjh7m52gsm4294ccn35iwwa35diyd6r8k6fvyf0bn3ny"; + name = "kmediaplayer-5.99.0.tar.xz"; }; }; knewstuff = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/knewstuff-5.98.0.tar.xz"; - sha256 = "09mxzpv0l1i5ml963gdnji8rskmi8b2f0hp4rn6ibkcj00z48fgy"; - name = "knewstuff-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/knewstuff-5.99.0.tar.xz"; + sha256 = "0bd7shvl6m4gry8cql2p64iba8iim12rsj5shaqp31n512mbc928"; + name = "knewstuff-5.99.0.tar.xz"; }; }; knotifications = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/knotifications-5.98.0.tar.xz"; - sha256 = "10whr3wjldaxdvbj6i250rqgsy2m1n606ja1yka571f1fz7laqcd"; - name = "knotifications-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/knotifications-5.99.0.tar.xz"; + sha256 = "0arhbhf5hrg943zmr9gs6dq3z7jifica72bqnxpv4jgn05l15c9n"; + name = "knotifications-5.99.0.tar.xz"; }; }; knotifyconfig = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/knotifyconfig-5.98.0.tar.xz"; - sha256 = "1qlmgr5rifygp8zk8qfjwm6k72kfyj8x6hvqwy2a59lfi3wgbm07"; - name = "knotifyconfig-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/knotifyconfig-5.99.0.tar.xz"; + sha256 = "1k0ryay0vdd0slzcdjlvp3kry7q9v3drx06jl1qwamfjs4ak65xp"; + name = "knotifyconfig-5.99.0.tar.xz"; }; }; kpackage = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kpackage-5.98.0.tar.xz"; - sha256 = "1234jq9qqhq2z5afkkniz6w5s1ab9r4x9wamq3c9y08nzjq634py"; - name = "kpackage-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kpackage-5.99.0.tar.xz"; + sha256 = "05z459mg0l0gv8749sdsgj9xfhwqgsv2cxwfjsqv06nymgq71jyq"; + name = "kpackage-5.99.0.tar.xz"; }; }; kparts = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kparts-5.98.0.tar.xz"; - sha256 = "01gcnywbzrgwlk4cws2rr139r95r201yfal1af3jkd7g2x499vgr"; - name = "kparts-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kparts-5.99.0.tar.xz"; + sha256 = "0pkw1r1hr34ppl72blcmsdgp9a37dav7l83nc3dfcfvkhzzj0ch0"; + name = "kparts-5.99.0.tar.xz"; }; }; kpeople = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kpeople-5.98.0.tar.xz"; - sha256 = "0wxy8pxkbfqbb4i9v3q912shzck56bk6xra3blhwva82qm9rps0f"; - name = "kpeople-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kpeople-5.99.0.tar.xz"; + sha256 = "0gb63gvi61gncmd79i1zdjcgidlmb4xh5ldvp6piydw5kl2z81bz"; + name = "kpeople-5.99.0.tar.xz"; }; }; kplotting = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kplotting-5.98.0.tar.xz"; - sha256 = "0hnzyl1x6acv1psdgsa9prpvnm12j71x6w6wbs1b0fl9bv5zw222"; - name = "kplotting-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kplotting-5.99.0.tar.xz"; + sha256 = "0yxlzh1ffjs4b3fw7yxkvsxiabm1jw8zgkzzgqvmsjs41h1g8nyq"; + name = "kplotting-5.99.0.tar.xz"; }; }; kpty = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kpty-5.98.0.tar.xz"; - sha256 = "0arxbdxldwnrcg5x1vpvkwdd4hayrpqvn08jz6r7zb4s9h1582ww"; - name = "kpty-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kpty-5.99.0.tar.xz"; + sha256 = "0vg8s3minm1p2qmhp7i7d0yxvbkzpxibvb76w9kag1ds3lq8k150"; + name = "kpty-5.99.0.tar.xz"; }; }; kquickcharts = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kquickcharts-5.98.0.tar.xz"; - sha256 = "1xll5yf8cjziraxgybmhclnsg1i5lgmvh5bqqnwnzncg8anzijhk"; - name = "kquickcharts-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kquickcharts-5.99.0.tar.xz"; + sha256 = "0b60jj9w491amciq3cragsyjfzamzakajhvzfb76xpjw2wvjaqb9"; + name = "kquickcharts-5.99.0.tar.xz"; }; }; kross = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kross-5.98.0.tar.xz"; - sha256 = "0yjn66r44jxlrm4vz1nf8s64kcw7lmarjpqz1mcgb1n4jc28hs60"; - name = "kross-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kross-5.99.0.tar.xz"; + sha256 = "1ml8fylm66dksnx5d3n2p0mndxwspqb25ak3inlf8m2my6asixvv"; + name = "kross-5.99.0.tar.xz"; }; }; krunner = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/krunner-5.98.0.tar.xz"; - sha256 = "0kch839xw09h1lddqgdcfwniq6rza5wdyyzcx99hcasn7l60nhsj"; - name = "krunner-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/krunner-5.99.0.tar.xz"; + sha256 = "1nf8cvzvbgaynimgf5i3lc632w71zzypbdg8a25lyvvc2n5qf895"; + name = "krunner-5.99.0.tar.xz"; }; }; kservice = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kservice-5.98.0.tar.xz"; - sha256 = "0lgwpcdkkbxwq84zp5aymrdwy0iacqxz5ckc89pymcm0bacyhl31"; - name = "kservice-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kservice-5.99.0.tar.xz"; + sha256 = "0ra6znqja27g3r4b856h26nchn8h5lzxahazsyx5ndrkx1ranl0s"; + name = "kservice-5.99.0.tar.xz"; }; }; ktexteditor = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/ktexteditor-5.98.0.tar.xz"; - sha256 = "1pazi9rz4v95g31s7d26yla8rcb0cgd08mlmdcasywsaxc8nn7vw"; - name = "ktexteditor-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/ktexteditor-5.99.0.tar.xz"; + sha256 = "13462wsc5nd71w6hyn010zgmw83ml02kpximazk0pjf6akamqg8j"; + name = "ktexteditor-5.99.0.tar.xz"; }; }; ktextwidgets = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/ktextwidgets-5.98.0.tar.xz"; - sha256 = "14ivmpng7x9rsk3x6kyd86jabzqxgjcdrma1im44wacnvisi4llk"; - name = "ktextwidgets-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/ktextwidgets-5.99.0.tar.xz"; + sha256 = "1a39nj96hi6wvzig9khp1rfh32hfd25zgmzb5ybz0rpqagqdzs1i"; + name = "ktextwidgets-5.99.0.tar.xz"; }; }; kunitconversion = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kunitconversion-5.98.0.tar.xz"; - sha256 = "0lhyg1d1k25kqk94lzy8mb06p4c17limmcrzirnsnxjvhjrc6r05"; - name = "kunitconversion-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kunitconversion-5.99.0.tar.xz"; + sha256 = "0bx44j94j2zp68n32zkml101j49pi1zq829aqsl8zxdzyj4qm8ny"; + name = "kunitconversion-5.99.0.tar.xz"; }; }; kwallet = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kwallet-5.98.0.tar.xz"; - sha256 = "0kwxkxlk0xlxkjgpjpb40xfl2l9hnhpymb4lxw4zwlxjn81r6sab"; - name = "kwallet-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kwallet-5.99.0.tar.xz"; + sha256 = "01raw36fzk3bjih72vi9ixyc0pngbqr6amyvwiy3lmkjd1rnpinj"; + name = "kwallet-5.99.0.tar.xz"; }; }; kwayland = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kwayland-5.98.0.tar.xz"; - sha256 = "0c0953gm63xhrqb7aspvf28wi7x31mrgaid23dw5gqphkbgis5qw"; - name = "kwayland-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kwayland-5.99.0.tar.xz"; + sha256 = "18k5vmlg1ahxv83892937k4d9h5yz7a06nj0v6dfjcx8wcjj3gm7"; + name = "kwayland-5.99.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kwidgetsaddons-5.98.0.tar.xz"; - sha256 = "117wki4w2bs1d2pjhi5qpb2b3qhhva6fq9gikba5fb6980kmdayr"; - name = "kwidgetsaddons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kwidgetsaddons-5.99.0.tar.xz"; + sha256 = "0scjrpwbp4p8hkxbvsaamd0y7fx5drq7nl6icfsm5v2v5rpa5kas"; + name = "kwidgetsaddons-5.99.0.tar.xz"; }; }; kwindowsystem = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kwindowsystem-5.98.0.tar.xz"; - sha256 = "02l7xmxcilmrxpkkid4m9srl0d8ymqgwpw5j80w3g57p0rahwjl1"; - name = "kwindowsystem-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kwindowsystem-5.99.0.tar.xz"; + sha256 = "0xzqlw0nr8icdmwpr6rpi806ryb7wl6pm6cznmdhf19caszkzlgl"; + name = "kwindowsystem-5.99.0.tar.xz"; }; }; kxmlgui = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kxmlgui-5.98.0.tar.xz"; - sha256 = "08n5l3zgkh0fxaqwrfx5mk4j5wq9ylkpxd37751qcivpag7l0x45"; - name = "kxmlgui-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kxmlgui-5.99.0.tar.xz"; + sha256 = "1p2ay1hfkhm3cfzyb7b31y5i7scq0z3cypysryfcnz75zz7wd4ic"; + name = "kxmlgui-5.99.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kxmlrpcclient-5.98.0.tar.xz"; - sha256 = "09apfrkgvvzv8zwxyjbi5qb145a9awirk02nx474bshgypfqslpb"; - name = "kxmlrpcclient-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kxmlrpcclient-5.99.0.tar.xz"; + sha256 = "0rma78pj0h3ss28ncz7km0cd5l1rwwf5vraf0h96apb0vh2y115x"; + name = "kxmlrpcclient-5.99.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/modemmanager-qt-5.98.0.tar.xz"; - sha256 = "0gk4jy3r1451a2dajhnz6lin4lfawc4qdlxp7n7m43ca4d89h13k"; - name = "modemmanager-qt-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/modemmanager-qt-5.99.0.tar.xz"; + sha256 = "0wjcrnkgaxq5kqck6fl2328k220byhmc66ss63x7rmz7y3jir17g"; + name = "modemmanager-qt-5.99.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/networkmanager-qt-5.98.0.tar.xz"; - sha256 = "0s1h02v9k8nyl30mw7gayzvpb8bnzzp9crcfqpry7rf02rxv9idw"; - name = "networkmanager-qt-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/networkmanager-qt-5.99.0.tar.xz"; + sha256 = "0643dx3jcjrabrhds2d3lh5h9c7dc6q26gg4vb5vrhgwsybqzna9"; + name = "networkmanager-qt-5.99.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/oxygen-icons5-5.98.0.tar.xz"; - sha256 = "03wk52hqrgj0r73nb4yiq7rnmdn4rrqzrj3cdzbg3flkw5r7wbbq"; - name = "oxygen-icons5-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/oxygen-icons5-5.99.0.tar.xz"; + sha256 = "1pak09dps9fwcs6rcbvjdxvivw8ahcvnmzk175ky7xjq065aprlc"; + name = "oxygen-icons5-5.99.0.tar.xz"; }; }; plasma-framework = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/plasma-framework-5.98.0.tar.xz"; - sha256 = "1bmwvk0pj0bnb8qhcl0bz82r63nls6h7lzzmkfkdwcwmjifmiqg4"; - name = "plasma-framework-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/plasma-framework-5.99.0.tar.xz"; + sha256 = "1ax029s0nmcv4cg6pqgv66hgyj5b4djdvvnmpmzb1003l22aivck"; + name = "plasma-framework-5.99.0.tar.xz"; }; }; prison = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/prison-5.98.0.tar.xz"; - sha256 = "1ppqm1f06q8fc1ncvzn9a133npmvlh1qxgvvbpwn6m0a8cr7ac6w"; - name = "prison-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/prison-5.99.0.tar.xz"; + sha256 = "1wf1fkqgnyrbd8i2mhkb6baynkkg010f2lbiwbz77jkrkv0vkpl4"; + name = "prison-5.99.0.tar.xz"; }; }; purpose = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/purpose-5.98.0.tar.xz"; - sha256 = "0g9ykhsn9dl3y3qp4wm3r7bkdhpl9mcbg671wa26qx3ba8a2jynr"; - name = "purpose-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/purpose-5.99.0.tar.xz"; + sha256 = "1bh2rrc3h9r95qv5kn45nhx10vgcfv6y7qfl7r152mrsvas317qy"; + name = "purpose-5.99.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/qqc2-desktop-style-5.98.0.tar.xz"; - sha256 = "1af7izd4k220dzngf1nwgcw0bi7vl772lpjrqd9fp9rijh74dx7d"; - name = "qqc2-desktop-style-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/qqc2-desktop-style-5.99.0.tar.xz"; + sha256 = "19pykvy9ifnfnhh7587dbb68jnk1bfjyipw3f1gshqr9b9vgjfdx"; + name = "qqc2-desktop-style-5.99.0.tar.xz"; }; }; solid = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/solid-5.98.0.tar.xz"; - sha256 = "14bf2k40skhyhrmgyyscg7psm1a8klf4z696pimlwjjhnawjfr06"; - name = "solid-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/solid-5.99.0.tar.xz"; + sha256 = "0yyhyqhvb2r374idn70rr74vyjvrgsv604issvx8d8dmvwyldrcb"; + name = "solid-5.99.0.tar.xz"; }; }; sonnet = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/sonnet-5.98.0.tar.xz"; - sha256 = "0j4p91xx1scg3jmvq6km7bwfjz5ihafk76yf1byb6aqyw50h3bm3"; - name = "sonnet-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/sonnet-5.99.0.tar.xz"; + sha256 = "1r57zhxfcgkp2bh3yqirdyl1s040qjzcsg4jsvvzqp10z408xwgk"; + name = "sonnet-5.99.0.tar.xz"; }; }; syndication = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/syndication-5.98.0.tar.xz"; - sha256 = "04py880hxkvidydsqcyjbkq0wv9cp42d7svkdgf74fmzfyfrmrax"; - name = "syndication-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/syndication-5.99.0.tar.xz"; + sha256 = "1lfgm0a2wmsssr4vlw5h4gjvci6g11n78y609mzk5hw51989i672"; + name = "syndication-5.99.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/syntax-highlighting-5.98.0.tar.xz"; - sha256 = "092ilbhhs8xaqblc9w1xksapdzvqyazz8lj011wz4762p1nagiq2"; - name = "syntax-highlighting-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/syntax-highlighting-5.99.0.tar.xz"; + sha256 = "0yh92dmf6kfannbx1iv90k7g931vlqw82qfvhbk7m8kvggdvy2xy"; + name = "syntax-highlighting-5.99.0.tar.xz"; }; }; threadweaver = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/threadweaver-5.98.0.tar.xz"; - sha256 = "1pwinpz5kscx64kc7dn4qf76m64kxzp92zjk8j2a2s1mx0s0vk2s"; - name = "threadweaver-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/threadweaver-5.99.0.tar.xz"; + sha256 = "1j3vcr2kcmd01byklnly239xb07vs9d74vnd7y37zjbg3yx14ina"; + name = "threadweaver-5.99.0.tar.xz"; }; }; } From 6c2e5077f20580baab7d7dd374670b7faf5b42d8 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Oct 2022 11:30:41 +0300 Subject: [PATCH 420/505] kidletime: add new Wayland deps --- pkgs/development/libraries/kde-frameworks/kidletime.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 6379a5e2e31b..ee6a33a83225 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -1,12 +1,13 @@ { mkDerivation, extra-cmake-modules, - qtbase, qtx11extras + qtbase, qtx11extras, + wayland, plasma-wayland-protocols }: mkDerivation { pname = "kidletime"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; + buildInputs = [ qtx11extras wayland plasma-wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; } From 961575f53cd9b3d49afcaf5a8d74c7c17b7b5f5d Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Oct 2022 12:56:27 +0300 Subject: [PATCH 421/505] all-packages: don't recurse into libsForQt5_openssl_1_1 The two things that care about it are exposed as top level attributes anyway. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc178cfc73e7..186c66857ea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21611,10 +21611,10 @@ with pkgs; }; }; }); - libsForQt5_openssl_1_1 = recurseIntoAttrs (import ./qt5-packages.nix { + libsForQt5_openssl_1_1 = import ./qt5-packages.nix { inherit lib pkgs; qt5 = qt5_openssl_1_1; - }); + }; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt515; From eb7e4115061f70b1e96c3174239985df5f3f6808 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Wed, 12 Oct 2022 13:06:43 +0400 Subject: [PATCH 422/505] kwin: Fix building on aarch64-linux Revert this commit to avoid dependency on that is not providede by GCC 9 that we currently use on aarch64: https://invent.kde.org/plasma/kwin/-/commit/9a34ebbffc791cbeadc9abafda793ebee654b270 Part of NixOS/nixpkgs#191357 --- ...1-Revert-x11-Refactor-output-updates.patch | 153 ++++++++++++++++++ pkgs/desktops/plasma-5/kwin/default.nix | 3 + 2 files changed, 156 insertions(+) create mode 100644 pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch diff --git a/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch b/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch new file mode 100644 index 000000000000..ddaa7f76b13b --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch @@ -0,0 +1,153 @@ +From 84f020835e3624342a928aae68e62e636bf2cc8c Mon Sep 17 00:00:00 2001 +From: Yuriy Taraday +Date: Wed, 12 Oct 2022 12:07:23 +0400 +Subject: [PATCH] Revert "[x11] Refactor output updates" + +This reverts commit 9a34ebbffc791cbeadc9abafda793ebee654b270. + +This should fix compilation with older GCC. +--- + CMakeLists.txt | 2 +- + .../standalone/x11_standalone_platform.cpp | 63 +++++++++++-------- + 2 files changed, 38 insertions(+), 27 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3e7bf700e..6ff24aa5c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,7 +70,7 @@ add_definitions(-DMESA_EGL_NO_X11_HEADERS) + add_definitions(-DEGL_NO_X11) + add_definitions(-DEGL_NO_PLATFORM_SPECIFIC_TYPES) + +-set(CMAKE_CXX_STANDARD 20) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + + # required frameworks by Core +diff --git a/src/backends/x11/standalone/x11_standalone_platform.cpp b/src/backends/x11/standalone/x11_standalone_platform.cpp +index 498d5cbe3..ac0f732b2 100644 +--- a/src/backends/x11/standalone/x11_standalone_platform.cpp ++++ b/src/backends/x11/standalone/x11_standalone_platform.cpp +@@ -54,8 +54,6 @@ + #include + #endif + +-#include +- + namespace KWin + { + +@@ -407,7 +405,8 @@ void X11StandalonePlatform::invertScreen() + ScreenResources res((active_client && active_client->window() != XCB_WINDOW_NONE) ? active_client->window() : rootWindow()); + + if (!res.isNull()) { +- for (auto crtc : std::span(res.crtcs(), res->num_crtcs)) { ++ for (int j = 0; j < res->num_crtcs; ++j) { ++ auto crtc = res.crtcs()[j]; + CrtcGamma gamma(crtc); + if (gamma.isNull()) { + continue; +@@ -480,39 +479,54 @@ void X11StandalonePlatform::doUpdateOutputs() + if (Xcb::Extensions::self()->isRandrAvailable()) { + T resources(rootWindow()); + if (!resources.isNull()) { ++ xcb_randr_crtc_t *crtcs = resources.crtcs(); ++ const xcb_randr_mode_info_t *modes = resources.modes(); ++ ++ QVector infos(resources->num_crtcs); ++ for (int i = 0; i < resources->num_crtcs; ++i) { ++ infos[i] = Xcb::RandR::CrtcInfo(crtcs[i], resources->config_timestamp); ++ } + +- std::span crtcs(resources.crtcs(), resources->num_crtcs); +- for (auto crtc : crtcs) { +- Xcb::RandR::CrtcInfo info(crtc, resources->config_timestamp); ++ for (int i = 0; i < resources->num_crtcs; ++i) { ++ Xcb::RandR::CrtcInfo info(infos.at(i)); + + const QRect geometry = info.rect(); + if (!geometry.isValid()) { + continue; + } + +- float refreshRate = -1.0f; ++ xcb_randr_output_t *outputs = info.outputs(); ++ QVector outputInfos(outputs ? resources->num_outputs : 0); ++ QVector edids(outputs ? resources->num_outputs : 0); ++ if (outputs) { ++ for (int i = 0; i < resources->num_outputs; ++i) { ++ outputInfos[i] = Xcb::RandR::OutputInfo(outputs[i], resources->config_timestamp); ++ edids[i] = Xcb::RandR::OutputProperty(outputs[i], atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false); ++ } ++ } + +- for (auto mode : std::span(resources.modes(), resources->num_modes)) { +- if (info->mode == mode.id) { +- if (mode.htotal != 0 && mode.vtotal != 0) { // BUG 313996 ++ float refreshRate = -1.0f; ++ for (int j = 0; j < resources->num_modes; ++j) { ++ if (info->mode == modes[j].id) { ++ if (modes[j].htotal != 0 && modes[j].vtotal != 0) { // BUG 313996 + // refresh rate calculation - WTF was wikipedia 1998 when I needed it? +- int dotclock = mode.dot_clock, +- vtotal = mode.vtotal; +- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) { ++ int dotclock = modes[j].dot_clock, ++ vtotal = modes[j].vtotal; ++ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) { + dotclock *= 2; + } +- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) { ++ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) { + vtotal *= 2; + } +- refreshRate = dotclock / float(mode.htotal * vtotal); ++ refreshRate = dotclock / float(modes[j].htotal * vtotal); + } + break; // found mode + } + } + +- for (auto xcbOutput : std::span(info.outputs(), info->num_outputs)) { +- Xcb::RandR::OutputInfo outputInfo(xcbOutput, resources->config_timestamp); +- if (outputInfo->crtc != crtc) { ++ for (int j = 0; j < info->num_outputs; ++j) { ++ Xcb::RandR::OutputInfo outputInfo(outputInfos.at(j)); ++ if (outputInfo->crtc != crtcs[i]) { + continue; + } + +@@ -528,14 +542,12 @@ void X11StandalonePlatform::doUpdateOutputs() + // TODO: Perhaps the output has to save the inherited gamma ramp and + // restore it during tear down. Currently neither standalone x11 nor + // drm platform do this. +- Xcb::RandR::CrtcGamma gamma(crtc); ++ Xcb::RandR::CrtcGamma gamma(crtcs[i]); + + output->setRenderLoop(m_renderLoop.get()); +- output->setCrtc(crtc); ++ output->setCrtc(crtcs[i]); + output->setGammaRampSize(gamma.isNull() ? 0 : gamma->size); +- auto it = std::find(crtcs.begin(), crtcs.end(), crtc); +- int crtcIndex = std::distance(crtcs.begin(), it); +- output->setXineramaNumber(crtcIndex); ++ output->setXineramaNumber(i); + + QSize physicalSize(outputInfo->mm_width, outputInfo->mm_height); + switch (info->rotation) { +@@ -556,10 +568,9 @@ void X11StandalonePlatform::doUpdateOutputs() + .physicalSize = physicalSize, + }; + +- auto edidProperty = Xcb::RandR::OutputProperty(xcbOutput, atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false); + bool ok; +- if (auto data = edidProperty.toByteArray(&ok); ok && !data.isEmpty()) { +- if (auto edid = Edid(data, edidProperty.data()->num_items); edid.isValid()) { ++ if (auto data = edids[j].toByteArray(&ok); ok && !data.isEmpty()) { ++ if (auto edid = Edid(data, edids[j].data()->num_items); edid.isValid()) { + information.manufacturer = edid.manufacturerString(); + information.model = edid.monitorName(); + information.serialNumber = edid.serialNumber(); +-- +2.37.2 + diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index f8177c929097..8f69c965ea07 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,4 +1,5 @@ { mkDerivation +, stdenv , lib , extra-cmake-modules , kdoctools @@ -141,6 +142,8 @@ mkDerivation { url = "https://invent.kde.org/plasma/kwin/-/commit/9a008b223ad696db3bf5692750f2b74e578e08b8.diff"; sha256 = "sha256-f35G+g2MVABLDbAkCed3ZmtDWrzYn1rdD08mEx35j4k="; }) + ] ++ lib.optionals stdenv.isAarch64 [ + ./0001-Revert-x11-Refactor-output-updates.patch ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' From 81e445e508f49daabe7fc60f302207eb4555b9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 12 Oct 2022 18:32:28 +0200 Subject: [PATCH 423/505] rubyPackages.*: satisfy pcre* requirements in GTK stack Some of them want both versions. Suspicious but OK I guess. --- .../ruby-modules/gem-config/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 12c24cd99a92..1a1993aebee4 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -20,7 +20,7 @@ { lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi -, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, gecode_3, curl +, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz @@ -69,13 +69,13 @@ in cairo = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; + buildInputs = [ gtk2 pcre2 xorg.libpthreadstubs xorg.libXdmcp]; }; cairo-gobject = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; + buildInputs = [ cairo pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; charlock_holmes = attrs: { @@ -230,7 +230,7 @@ in gio2 = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; + buildInputs = [ gtk2 pcre pcre2 gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; }; gitlab-markup = attrs: { meta.priority = 1; }; @@ -275,7 +275,7 @@ in glib2 = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre ]; + buildInputs = [ gtk2 pcre2 ]; }; gtk2 = attrs: { @@ -293,7 +293,7 @@ in harfbuzz libdatrie libthai - pcre + pcre pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; @@ -301,7 +301,7 @@ in }; gobject-introspection = attrs: { - nativeBuildInputs = [ pkg-config pcre ] + nativeBuildInputs = [ pkg-config pcre2 ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ]; }; @@ -518,7 +518,7 @@ in pkg-config fribidi harfbuzz - pcre + pcre pcre2 xorg.libpthreadstubs xorg.libXdmcp ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; From 38d712a21898424f8953ec268081a9a6ee4a7004 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 16:44:03 +0000 Subject: [PATCH 424/505] goa: 3.7.6 -> 3.10.0 --- pkgs/development/tools/goa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index e28c6094b37d..bbbdbe5bab75 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.7.6"; + version = "3.10.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-AxMt9XnpUvAwWtjh391ep+MFysF5I/HUeHS8Kq8/fvU="; + sha256 = "sha256-Z/J1L6fYuim6LkVh+LDrr3FLTZO7uQwHXRg0YTofkWA="; }; - vendorSha256 = "sha256-eTMqvl7h12GbzEmO5Lo4hdFrbqti3zl9edTz+zS0Xu8="; + vendorSha256 = "sha256-r/1huS/6qqS6TuqPQkwqKuYwye5DYQWYfBS1IcXWRgk="; subPackages = [ "cmd/goa" ]; From fd0989d64cd779d287ec6c753a3f22ebfd617090 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Oct 2022 18:46:32 +0200 Subject: [PATCH 425/505] freeimage: fix build on aarch64-darwin --- pkgs/development/libraries/freeimage/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 807e96669c67..dd5056ced93f 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchsvn, darwin, libtiff , libpng, zlib, libwebp, libraw, openexr, openjpeg , libjpeg, jxrlib, pkg-config -, fixDarwinDylibNames }: +, fixDarwinDylibNames, autoSignDarwinBinariesHook }: stdenv.mkDerivation { pname = "freeimage"; @@ -39,6 +39,8 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools fixDarwinDylibNames + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e7546d684a7..1ef4a95369ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18487,6 +18487,7 @@ with pkgs; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; freeimage = callPackage ../development/libraries/freeimage { + inherit (darwin) autoSignDarwinBinariesHook; libraw = libraw_unstable; }; From 5430715f9ecbe6cb61ee69cbdaf0c4a62d50e3da Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Oct 2022 18:46:47 +0200 Subject: [PATCH 426/505] perceptualdiff: unbreak on aarch64-darwin --- pkgs/tools/graphics/perceptualdiff/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index f2281bc5d35f..919b99327110 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ uri-canva ]; platforms = platforms.unix; - broken = stdenv.hostPlatform.system == "aarch64-darwin"; }; } From 37a64594bde38d4b3dda3298f826642b6131bfd9 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Oct 2022 20:28:53 +0300 Subject: [PATCH 427/505] nixos/plasma-bigscreen: enable uinput correctly This is required for plasma-remotecontrollers to actually work. Make sure to also add your user to the `uinput` group. --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 4 +++- nixos/tests/plasma-bigscreen.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index aa1359bf3584..44faa19bc22a 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -623,7 +623,9 @@ in ]; services.xserver.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-bigscreen ]; - services.udev.packages = [ pkgs.plasma5Packages.plasma-remotecontrollers ]; + + # required for plasma-remotecontrollers to work correctly + hardware.uinput.enable = true; }) ]; } diff --git a/nixos/tests/plasma-bigscreen.nix b/nixos/tests/plasma-bigscreen.nix index ab459b6bffbe..1c61cafcbff3 100644 --- a/nixos/tests/plasma-bigscreen.nix +++ b/nixos/tests/plasma-bigscreen.nix @@ -18,6 +18,8 @@ import ./make-test-python.nix ({ pkgs, ...} : enable = true; user = "alice"; }; + + users.users.alice.extraGroups = ["uinput"]; }; testScript = { nodes, ... }: let From e1d6e67f8e914adb7e3160983121e7bec46f164e Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sun, 9 Oct 2022 04:18:43 +0800 Subject: [PATCH 428/505] maintainers: add kouyk --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6030ae15c982..47a41b30042f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7330,6 +7330,12 @@ githubId = 2037002; name = "Konstantinos"; }; + kouyk = { + email = "skykinetic@stevenkou.xyz"; + github = "kouyk"; + githubId = 1729497; + name = "Steven Kou"; + }; kovirobi = { email = "kovirobi@gmail.com"; github = "KoviRobi"; From ca7c98346268ffa16bf0df8f603587a04f978f52 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sun, 9 Oct 2022 02:23:22 +0800 Subject: [PATCH 429/505] jetbrains.gateway: init at 223.6646.21 --- .../editors/jetbrains/default.nix | 29 +++++++++++++++++++ .../editors/jetbrains/versions.json | 27 +++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 47dabbf0cbb9..b2713def5bb8 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -86,6 +86,22 @@ let }; }); + buildGateway = { pname, version, src, license, description, wmClass, ... }: + (mkJetBrainsProduct { + inherit pname version src wmClass jdk; + product = "Gateway"; + meta = with lib; { + homepage = "https://www.jetbrains.com/remote-development/gateway/"; + inherit description license platforms; + longDescription = '' + JetBrains Gateway is a lightweight launcher that connects a remote + server with your local machine, downloads necessary components on the + backend, and opens your project in JetBrains Client. + ''; + maintainers = with maintainers; [ kouyk ]; + }; + }); + buildGoland = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit pname version src wmClass jdk; @@ -301,6 +317,19 @@ in update-channel = products.datagrip.update-channel; }; + gateway = buildGateway rec { + pname = "gateway"; + version = products.gateway.version; + description = "Your single entry point to all remote development environments"; + license = lib.licenses.unfree; + src = fetchurl { + url = products.gateway.url; + sha256 = products.gateway.sha256; + }; + wmClass = "jetbrains-gateway"; + update-channel = products.gateway.update-channel; + }; + goland = buildGoland rec { pname = "goland"; version = products.goland.version; diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 77baa60a0c97..5505c0c61c8f 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -18,6 +18,15 @@ "version-major-minor": "2022.1.1", "build_number": "222.4345.5" }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", + "version": "2022.3 EAP", + "sha256": "4868baed9350065c1db760f07a09badd1473132af640cc19330e20c8a0940d7d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.tar.gz", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" + }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", @@ -128,6 +137,15 @@ "version-major-minor": "2022.1.1", "build_number": "222.4345.5" }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", + "version": "2022.3 EAP", + "sha256": "2db71a052501db41d5cfe142f1a6e3178fe02830f0da127d00fbf93a4629c61b", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.dmg", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" + }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", @@ -238,6 +256,15 @@ "version-major-minor": "2022.1.1", "build_number": "222.4345.5" }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", + "version": "2022.3 EAP", + "sha256": "513d3a271c5ff20fdc5c22f6e28eb21cfbb283d01ade2d11f33bb7eb79317410", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21-aarch64.dmg", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" + }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", From 2b387a08ccd110210d9594f142bb30c3ef45bda2 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sun, 9 Oct 2022 02:27:38 +0800 Subject: [PATCH 430/505] jetbrains: set JDK for JetBrains Client --- pkgs/applications/editors/jetbrains/linux.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index 3f77f3fae5b1..fde3e52632e8 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -80,6 +80,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default JDK_HOME "$jdk" \ --set-default ANDROID_JAVA_HOME "$jdk" \ --set-default JAVA_HOME "$jdk" \ + --set-default JETBRAINSCLIENT_JDK "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ${hiName}_VM_OPTIONS ${vmoptsFile} From 6302d8f8068a04c2886faa6bed95e3ffb98d45ff Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Oct 2022 21:20:45 +0200 Subject: [PATCH 431/505] element-{web,desktop}: 1.11.8 -> 1.11.10 ChangeLog: https://github.com/vector-im/element-web/releases/tag/v1.11.10 & https://github.com/vector-im/element-web/releases/tag/v1.11.9 Nothing significant in element-desktop except for the element-web update. --- .../networking/instant-messengers/element/pin.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index ce17529cd398..f5f38124ceb6 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.8", - "desktopSrcHash": "l6IwztPEPSo3WgdUBPO4ZNgfoLts8NaqvoHekAhfVGg=", - "desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc", - "webSrcHash": "Etxlq2TEaZM9Qz4ig5H00DsshJoFH6+wtt+RL1dR2n4=", - "webYarnHash": "1q05r2shv1c3kghwksjzrh9rl25ins6r2y46ng7smdml4f9vdcc0" + "version": "1.11.10", + "desktopSrcHash": "cywTZ5OgKaFkHh3i3KLfb8HH8ZlIAOY3Xn2WHyY0fNM=", + "desktopYarnHash": "1xwnw9hbbrr72xs2d43qwhbmhfk3w4z80cipyrmdj5y248y8sz84", + "webSrcHash": "r7WZUWgPDEBS9xpc1YmmPVGch7B2ouJOFAoKdcC/55Q=", + "webYarnHash": "0s8wxf13jc9x4zykhm4abgq3a38mjya7z43kjsags1fxhilf09bc" } From fefc598f2cd6c1c414b77256b62ce0ab3b05644c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Oct 2022 22:41:53 +0200 Subject: [PATCH 432/505] python310Packages.archinfo: 9.2.21 -> 9.2.22 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 8119ac5cdb44..c4c492009a96 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-29KWlXZ4KrDq4CmTeF6z1CDVDgnO2JyxOdOi5bhl1nI="; + hash = "sha256-fqGz8+ZKmeBuwbjxFofspKSMdyG0NLVj+Jq+VPK2A90="; }; nativeBuildInputs = [ From 90133e5f7437d5a4413108ff616710a19b6f0ad2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Oct 2022 22:41:59 +0200 Subject: [PATCH 433/505] python310Packages.ailment: 9.2.21 -> 9.2.22 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6fdc8b2dd4f2..2c19b714c957 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-LIqazN7U0pRt9yUsnb5vM6ZOtQOstkwanNr7FufHyUo="; + hash = "sha256-mCShbfpIsbIxFs/YDJY21Cvorn6sAB4f+s5zops8MAc="; }; nativeBuildInputs = [ From 370cf20988bb4b388629f3a38dd74a750a66b6c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Oct 2022 22:42:15 +0200 Subject: [PATCH 434/505] python310Packages.pyvex: 9.2.21 -> 9.2.22 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index eb91d68069c4..87f29704b428 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-uMUK8bnRaig71mdAmTc9rUu4zZnSgbAFZkv2o3hj6G0="; + hash = "sha256-yPz4tCZGoeUMv+qP/9J6e3moJpRsJIXddRJlyy5jky4="; }; nativeBuildInputs = [ From 6b295a6dbfbc2219371d0a7669d5fb1681f63a67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Oct 2022 22:42:21 +0200 Subject: [PATCH 435/505] python310Packages.claripy: 9.2.21 -> 9.2.22 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 60f46431bf9b..992fb0fbc835 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-4Ql1oYWNxoDKwl6IOrJQ5uMepqtRqrY2cmjsa3w0h9E="; + hash = "sha256-ToRQB3JUZrCuuVMF5IK6zBwYpABQrXsBK3WIc/+E+uM="; }; nativeBuildInputs = [ From 47a13c0e7492c47e953b01275569c5bff0e09dcd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Oct 2022 22:42:28 +0200 Subject: [PATCH 436/505] python310Packages.cle: 9.2.21 -> 9.2.22 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 417e8becf36e..625eab88d76c 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.21"; + version = "9.2.22"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-pVatQJMDocP6RWzCzgyJ1vzmqfdEVYjVFW9m+rS1IoI="; + hash = "sha256-Ppxpptgx91kyCiVrpEUa9ZxZLN9rCLnGB/nl1Fj/gDQ="; }; nativeBuildInputs = [ From 11533d5056089aecb8d0ad25187969d069b47642 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Oct 2022 22:42:36 +0200 Subject: [PATCH 437/505] python310Packages.angr: 9.2.21 -> 9.2.22 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index cc88392d53c8..c9d0b436bbb8 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-DOH1yRdWpKpYEjcnQInYU3g2HRm3wj3y8W7Kyuz4i2M="; + hash = "sha256-hkFWZHEdIXOQm14t05eyOqFTtWdXdgrQLjh+iVdKiCw="; }; propagatedBuildInputs = [ From ff3f76ad3945fa2afa43f3a8d63aa34898ae53eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 23:12:00 +0000 Subject: [PATCH 438/505] build(deps): bump cachix/cachix-action from 10 to 11 Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 10 to 11. - [Release notes](https://github.com/cachix/cachix-action/releases) - [Commits](https://github.com/cachix/cachix-action/compare/v10...v11) --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/manual-rendering.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 2d31392caf45..53e64e422b66 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v17 - - uses: cachix/cachix-action@v10 + - uses: cachix/cachix-action@v11 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 86825eb5aef3..ae04b011e215 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -22,7 +22,7 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - - uses: cachix/cachix-action@v10 + - uses: cachix/cachix-action@v11 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 2aebeeeea2ab..0cf9046da995 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -22,7 +22,7 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - - uses: cachix/cachix-action@v10 + - uses: cachix/cachix-action@v11 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index 5d2518dffc04..33113cf399fb 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -22,7 +22,7 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - - uses: cachix/cachix-action@v10 + - uses: cachix/cachix-action@v11 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci From d2e6195f5b83e84e176bf9dc16ee93ea209037d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 23:12:03 +0000 Subject: [PATCH 439/505] build(deps): bump cachix/install-nix-action from 17 to 18 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 17 to 18. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v17...v18) --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/manual-rendering.yml | 2 +- .github/workflows/nixos-manual.yml | 2 +- .github/workflows/update-terraform-providers.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 53e64e422b66..bdd3c6445470 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -19,7 +19,7 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v17 + - uses: cachix/install-nix-action@v18 - uses: cachix/cachix-action@v11 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 5b57614e1107..081bd6146af1 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v17 + - uses: cachix/install-nix-action@v18 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index ae04b011e215..450c57d68ad0 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v17 + - uses: cachix/install-nix-action@v18 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 0cf9046da995..4b2f6da72212 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v17 + - uses: cachix/install-nix-action@v18 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index 33113cf399fb..4ea18f3e3d46 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v17 + - uses: cachix/install-nix-action@v18 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml index 5453513a53a6..b7f8c495a03f 100644 --- a/.github/workflows/nixos-manual.yml +++ b/.github/workflows/nixos-manual.yml @@ -19,7 +19,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v17 + - uses: cachix/install-nix-action@v18 - name: Check DocBook files generated from Markdown are consistent run: | nixos/doc/manual/md-to-db.sh diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index a711ab5db8ff..8580368c3e3b 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v17 + - uses: cachix/install-nix-action@v18 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: setup From 03229edc43b025b91647b5aa33ea2170a36a143a Mon Sep 17 00:00:00 2001 From: ilkecan Date: Thu, 13 Oct 2022 00:02:57 +0000 Subject: [PATCH 440/505] alacritty: 0.11.0-rc2 -> 0.11.0 --- pkgs/applications/terminal-emulators/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 2b145717fb38..9eff16045637 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -54,16 +54,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.11.0-rc2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-svo7DIPgNQy+MkIrRtRQjKQ2ND0CRfofSCiXJqoWby0="; + hash = "sha256-2jNE0UdPXfOyAfPPVKhdBpuVVw4IpwWQ+RLQlJNnK0Y="; }; - cargoSha256 = "sha256-ClAW7WjnDs4Peu+UqcOwtuDDkWYWACMQU5p39CiIFm0="; + cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw="; nativeBuildInputs = [ cmake From e20908d82c48d20d1eb96df38ca29d57163ad5bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 00:23:28 +0000 Subject: [PATCH 441/505] python310Packages.desktop-notifier: 3.4.0 -> 3.4.1 --- .../development/python-modules/desktop-notifier/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index a60d4ae45a4e..342b07387248 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.4.0"; + version = "3.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-lOXoiWY6gyWBL4RLrvslqcMmwtjMTOaHJZzsDO+C/F4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cqPLnahs3fT6AfQQkS5azh4/cHzaexytg78RsJG5c6U="; }; nativeBuildInputs = [ From 218dfe8eae410c250967fc0fd8671d5f2b111583 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 00:38:00 +0000 Subject: [PATCH 442/505] sickgear: 0.25.44 -> 0.25.46 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 94f471dd53fe..2f22cf390386 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.44"; + version = "0.25.46"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-j9sLIxUru2rjKaL4uV03yQfEdbXpKo1xGunrNZc/t7E="; + sha256 = "sha256-oXWnrzi10DrVb8aAn27kDAJzhZ+VTFsmpLGt7AB55jU="; }; patches = [ From 82da2bfa8eee921b92c30a6753c4496494f6d84c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Oct 2022 04:04:13 +0200 Subject: [PATCH 443/505] prometheus-kea-exporter: 0.4.4 -> 0.5.0 --- pkgs/servers/monitoring/prometheus/kea-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix index c3ebc47c072d..5fe9c6baee70 100644 --- a/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -2,16 +2,16 @@ python3Packages.buildPythonApplication rec { pname = "kea-exporter"; - version = "0.4.4"; + version = "0.5.0"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-8hWQfI9HCSKhkgN3F0mwvKKJg6FlwqRZ1QuQFB1YXrc="; + hash = "sha256-RSW1HStfPV7yiuLgGIuMjS3vPXz8P3vmtfw6tDHXp6o="; }; nativeBuildInputs = with python3Packages; [ - poetry-core + pdm-pep517 ]; propagatedBuildInputs = with python3Packages; [ From 8cd5129b1a0a5f34dba5d40f5af627a54fb6361b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 02:06:28 +0000 Subject: [PATCH 444/505] python310Packages.dropbox: 11.34.0 -> 11.35.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 7f0d01ec96f9..f38b504cbb8c 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.34.0"; + version = "11.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-bahl78c0MGu4AoANO/FWYq/DQWPC4T8WVdRHKzwg444="; + hash = "sha256-vrOqsRe2sBsL5CIfGCmoO3geE9G0FJl88HRcP6FzZe0="; }; propagatedBuildInputs = [ From a580f2ed2151c74a6b46921a2db61d569338fab9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 12 Oct 2022 13:27:54 -0400 Subject: [PATCH 445/505] ruff: 0.0.69 -> 0.0.72 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a8c76f3e5e2e..55198659371c 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.69"; + version = "0.0.72"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5TAuWBb4RJGO7prliR+c1wAOmTRaJ/erwK9ISQTiaNA="; + sha256 = "sha256-K2wrPDb0GcwhGzLFNGXMH7CKTleOHwe3FtA82BZk+Bo="; }; - cargoSha256 = "sha256-bv51Hj/JMfFr9SLGQxAoWDCeLr4cI6jpYxnnncAQ6kU="; + cargoSha256 = "sha256-acB8kcdItJyE2Mr+fU0yojpDJh02V21DZfqQ5q+Wn20="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 707f2016aad8cd52a0814a57ba3e3d28bf06d62b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Oct 2022 05:16:41 +0200 Subject: [PATCH 446/505] kea: build with openssl instead of botan2 Botan is unfortunately lacking behind in TLSv1.3 support and other distros have also done this swap. --- pkgs/tools/networking/kea/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 88a0d0a180f0..1ad67e45f292 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -1,14 +1,20 @@ { stdenv , lib , fetchurl + +# build time , autoreconfHook , pkg-config + +# runtime , boost -, botan2 , libmysqlclient , log4cplus +, openssl , postgresql , python3 + +# tests , nixosTests }: @@ -21,7 +27,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-2n2QymKncmAtrG535QcxkDhCKJWtaO6xQvFIfWfVMdI="; }; - patches = [ ./dont-create-var.patch ]; + patches = [ + ./dont-create-var.patch + ]; postPatch = '' substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc" @@ -31,6 +39,7 @@ stdenv.mkDerivation rec { "--enable-perfdhcp" "--enable-shell" "--localstatedir=/var" + "--with-openssl=${lib.getDev openssl}" "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config" "--with-pgsql=${postgresql}/bin/pg_config" ]; @@ -42,9 +51,9 @@ stdenv.mkDerivation rec { buildInputs = [ boost - botan2 libmysqlclient log4cplus + openssl python3 ]; From d2d5d5b22efe38b2d8b9595dcb95479863979305 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Oct 2022 05:17:52 +0200 Subject: [PATCH 447/505] kea: build documentation and manpages Very easily due to the comforts of the sphinx hook <3 --- pkgs/tools/networking/kea/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 1ad67e45f292..13540b7e6247 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc" ''; + outputs = [ + "out" + "doc" + "man" + ]; + configureFlags = [ "--enable-perfdhcp" "--enable-shell" @@ -47,7 +53,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config + ] ++ (with python3.pkgs; [ + sphinxHook + sphinx-rtd-theme + ]); + + sphinxBuilders = [ + "html" + "man" ]; + sphinxRoot = "doc/sphinx"; buildInputs = [ boost From d4877de9c9d6f5ae25f5f318057df0507e80d936 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Oct 2022 05:36:07 +0200 Subject: [PATCH 448/505] kea: add prometheus-exporter to passthru tests And reorganize passthru.tests, due to naming clash between kea and prometheus-exporters.kea when relying on inherit. --- pkgs/tools/networking/kea/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 13540b7e6247..e03e013f9ba0 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -75,7 +75,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit (nixosTests) kea systemd-networkd-ipv6-prefix-delegation; + kea = nixosTests.kea; + prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation; + prometheus-exporter = nixosTests.prometheus-exporters.kea; }; meta = with lib; { From 6dc602a4a0d9c8b56291637fd494f2165bdf9701 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 03:54:34 +0000 Subject: [PATCH 449/505] =?UTF-8?q?terraform-providers.github:=205.3.0=20?= =?UTF-8?q?=E2=86=92=205.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 711080c9c0b8..46f2d881310a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -423,13 +423,13 @@ "version": "2.2.0" }, "github": { - "hash": "sha256-NJ5HvW3LOvshzea7t0/sAsp3SqiXErXd32Ej0Qp4zsk=", + "hash": "sha256-XivwHkibeaoFTeJRtTF8xqt2IwXbzcKtKwAmwCf8Ll4=", "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v5.3.0", + "rev": "v5.4.0", "vendorHash": null, - "version": "5.3.0" + "version": "5.4.0" }, "gitlab": { "hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=", From 40dcf2f95b77ab4f54557d6a4e3e26d1823d16b3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 03:56:10 +0000 Subject: [PATCH 450/505] =?UTF-8?q?terraform-providers.helm:=202.7.0=20?= =?UTF-8?q?=E2=86=92=202.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 46f2d881310a..8dcd2581db89 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -497,13 +497,13 @@ "version": "1.35.2" }, "helm": { - "hash": "sha256-oX6pchJcgv9w5xLGe09GBzngz9+a/OZn6FTBWURgiLk=", + "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.7.0", + "rev": "v2.7.1", "vendorHash": null, - "version": "2.7.0" + "version": "2.7.1" }, "heroku": { "hash": "sha256-V6jShbhVwsUTxj2tp2msIseZnckHgB7bBswqIRlrwjQ=", From f003f0a63bceef55afe75c51d6b5a3876bc304c0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 03:58:51 +0000 Subject: [PATCH 451/505] =?UTF-8?q?terraform-providers.spotinst:=201.84.0?= =?UTF-8?q?=20=E2=86=92=201.85.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8dcd2581db89..d708868cece7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1075,13 +1075,13 @@ "version": "0.7.1" }, "spotinst": { - "hash": "sha256-D/HFeozi5IRj7G+pRzY/V98+oejfmQlW4y6ddob7OBI=", + "hash": "sha256-hlTeN8dQWHU4yHDUqCeBbfapDI1lbxj05FlUN+vUOuM=", "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.84.0", + "rev": "v1.85.0", "vendorHash": "sha256-BDYX/4D3R2A1w3k14mON/2KZUg2kPbwePXQQpVanqdU=", - "version": "1.84.0" + "version": "1.85.0" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", From cfea568da97a2668ef3cb3fc42eaacfb0e706807 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 04:00:26 +0000 Subject: [PATCH 452/505] =?UTF-8?q?terraform-providers.tencentcloud:=201.7?= =?UTF-8?q?8.3=20=E2=86=92=201.78.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d708868cece7..331f64515165 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1111,13 +1111,13 @@ "version": "2.19.1" }, "tencentcloud": { - "hash": "sha256-SoCXh0pRqEkto2K+ZfN7ncVGDVC32zDElS+rBdOfa0g=", + "hash": "sha256-kAbLfuENWHxu51Eu+7X1X4HiWkD8KAL4awZpGRg0BaU=", "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.3", + "rev": "v1.78.4", "vendorHash": null, - "version": "1.78.3" + "version": "1.78.4" }, "tfe": { "hash": "sha256-jh5bRe/3OsdgvSpraYEc1NgvBmYb1tFuVSPQ2ZAesSY=", From a2f2949cdb37e2cf13df4f8249078baa0085dfaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 02:36:49 +0000 Subject: [PATCH 453/505] python310Packages.fastapi-mail: 1.1.5 -> 1.2.0 --- pkgs/development/python-modules/fastapi-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index f1ddf3bce788..f7f4b33f1680 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.1.5"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "sabuhish"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Rt+0ZZqo9tiATwS7iwtp7K2RW3t2tsLw5Hp2WrT40B0="; + hash = "sha256-RAUxc7spJL1QECAO0uZcCVAR/LaFIxFu61LD4RV9nEI="; }; postPatch = '' From b51a278e7676bc0670534f6bcacdbad78688be07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 03:36:53 +0000 Subject: [PATCH 454/505] python310Packages.google-cloud-dlp: 3.9.1 -> 3.9.2 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 390af1240dcb..331b6d8adb7b 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.9.1"; + version = "3.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-UZ44USwAVUCXYUelrFj+5DZ7x67BIU7Q6zPeV5Fh68s="; + hash = "sha256-yoiHO4/dhFDGZJB+WiouyBtbTQWIecwaIvR+qw8MGBU="; }; propagatedBuildInputs = [ From ea8940acebcebde2eae1b13fb369e8823065f370 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 03:37:38 +0000 Subject: [PATCH 455/505] python310Packages.google-cloud-error-reporting: 1.6.2 -> 1.6.3 --- .../python-modules/google-cloud-error-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 9dc701dcb1ef..5ec7903b9e2d 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.6.2"; + version = "1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uiKJOec6chc0YB3OowQ2CQajo/iQekcEwIDkXVLEve8="; + hash = "sha256-7QR4NS98MtJ8aMLC+qQeTrK1Rv5kw6XlZhSKbatrZFY="; }; propagatedBuildInputs = [ From d673432b224558f837382dc32b665f01690be96c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 03:38:58 +0000 Subject: [PATCH 456/505] python310Packages.google-cloud-iam-logging: 1.0.5 -> 1.0.6 --- .../python-modules/google-cloud-iam-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index a5fe179eea18..601d213892e2 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IIXCMB1QOwKafqaXM9s4jDqZWO2pnOVxhrm0USm2bPc="; + hash = "sha256-XiuEki6bNKZ8CzfcBBjnDbAh2yEADZohpP991OTf2DI="; }; propagatedBuildInputs = [ From 1f50d35aae248ee9ff8bbdf5b499892a16d30362 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 03:52:22 +0000 Subject: [PATCH 457/505] python310Packages.google-cloud-websecurityscanner: 1.9.1 -> 1.9.2 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 0e2cc1cac338..d35944777fbf 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.9.1"; + version = "1.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TBZI32KX1c5XPAV1AmjQvQVhE5UgGOGd5U/enLRV3IU="; + hash = "sha256-fUnoV5I9kMwC9zUdsHit6MbIYFV+3E+GT76vwEmzNNs="; }; propagatedBuildInputs = [ From e1858385ec9730c0120dae4bce1fade16ecdb4ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 03:37:51 +0000 Subject: [PATCH 458/505] python310Packages.google-cloud-firestore: 2.7.1 -> 2.7.2 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 3e8d3734ba78..5abd123f8f1a 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UcgDxbFf5/ZRdtEcMaGhOkPZrJDAmKSOSTJv1fIbY48="; + sha256 = "sha256-yGB6dLcRxEuqPYGEbpOI5DInos/1ILWmzeXN+ck/W+g="; }; propagatedBuildInputs = [ From 0671df7f0299648e5a08b718077ef6406a8cc70b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 6 Oct 2022 07:18:27 +0200 Subject: [PATCH 459/505] ocamlPackages.uuidm: disable for OCaml < 4.08 --- pkgs/development/ocaml-modules/uuidm/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index b7940b64032c..0ead92d9c54b 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "uuidm is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { version = "0.9.8"; pname = "uuidm"; From ed50e17618a0b28196401a3f9d7f707df93b88b8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 6 Oct 2022 07:18:31 +0200 Subject: [PATCH 460/505] ocamlPackages.lablgtk_2_14: remove at 2.14.0 (broken) --- .../ocaml-modules/lablgtk/2.14.0.nix | 41 ------------------- pkgs/top-level/ocaml-packages.nix | 3 -- 2 files changed, 44 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/lablgtk/2.14.0.nix diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix deleted file mode 100644 index 47f48c89be79..000000000000 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview, camlp4 }: - -if lib.versionAtLeast ocaml.version "4.04" -then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else - -let - pname = "lablgtk"; -in - -stdenv.mkDerivation (rec { - name = "${pname}-${version}"; - version = "2.14.0"; - - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz"; - sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; - }; - - nativeBuildInputs = [ pkg-config ocaml findlib camlp4 ]; - buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; - - configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; - buildFlags = [ "world" ]; - - preInstall = '' - mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib - export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH - ''; - - meta = { - branch = "2.14"; - inherit (ocaml.meta) platforms; - maintainers = [ - lib.maintainers.maggesi - lib.maintainers.roconnor - ]; - homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html"; - description = "LablGTK is is an Objective Caml interface to GTK"; - license = lib.licenses.lgpl21Plus; - }; -}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ca3223703079..cf5b4fcb5987 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -686,9 +686,6 @@ let lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; - lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { - inherit (pkgs.gnome2) libgnomecanvas gtksourceview; - }; lablgtk = callPackage ../development/ocaml-modules/lablgtk { inherit (pkgs.gnome2) libgnomecanvas gtksourceview; }; From d618530963a0e1d112c2584e2fc1ae9743cf7b08 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 6 Oct 2022 07:18:34 +0200 Subject: [PATCH 461/505] =?UTF-8?q?ocamlPackages.ocamlbuild:=200.14.1=20?= =?UTF-8?q?=E2=86=92=200.14.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/ocamlbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 3d8ade975f99..e2e3f07d58eb 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocamlbuild"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "sha256-ZL0BwOCWTNDjNkrwNAmzHjHF1Rpg3CUuV4lSqcwDqgI="; + sha256 = "sha256-QAqIMdi6M9V7RIX0kppKPSkCJE/pLx2iMdh5XYXQCJs="; }; createFindlibDestdir = true; From 915e21c171827c5376ea8e35d89637719a7d31ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 07:03:27 +0000 Subject: [PATCH 462/505] credhub-cli: 2.9.4 -> 2.9.5 --- pkgs/tools/admin/credhub-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 30c16e4676d8..ed87e44daf5e 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-vRzap9JiV6HzQJKVAByLPMCqADMufoool8Nuw2xu2L4="; + sha256 = "sha256-M2FIzLl1pQ/TJinG4UOh2VQWfZx4iT3Qw6pJhjv88cM="; }; # these tests require network access that we're not going to give them From cf1e358e04ebda06625f9efcd238e5301838cab5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Oct 2022 15:41:30 +0800 Subject: [PATCH 463/505] pantheon.elementary-calendar: switch to merged patch --- .../apps/elementary-calendar/default.nix | 9 ++- .../partly-revert-pr-301.patch | 57 ------------------- 2 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 9f5613fcd22e..d90a56af2bb6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -41,9 +41,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio="; }) - # Workaround for showing date numbers (TODO: should try to fix upstream) - # https://github.com/elementary/calendar/issues/756#issuecomment-1252400047 - ./partly-revert-pr-301.patch + # GridDay: Fix day in month in grid with GLib 2.73.1+ + # https://github.com/elementary/calendar/pull/763 + (fetchpatch { + url = "https://github.com/elementary/calendar/commit/20b0983c85935bedef065b786ec8bbca55ba7d9e.patch"; + sha256 = "sha256-Tw9uNqqRAC+vOp7EWzZVeDmZxt3hTGl9UIP21FcunqA="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch b/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch deleted file mode 100644 index 0de31ee6365d..000000000000 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/src/Grid/Grid.vala b/src/Grid/Grid.vala -index 61706fc8..9b69fc14 100644 ---- a/src/Grid/Grid.vala -+++ b/src/Grid/Grid.vala -@@ -215,7 +215,7 @@ public class Grid : Gtk.Grid { - - day.in_current_month = new_date.get_month () == month_start.get_month (); - -- day.date = new_date; -+ day.update_date (new_date); - return day; - } - -diff --git a/src/Grid/GridDay.vala b/src/Grid/GridDay.vala -index 3e59cb7b..df04fe6f 100644 ---- a/src/Grid/GridDay.vala -+++ b/src/Grid/GridDay.vala -@@ -35,6 +35,7 @@ public class Maya.View.GridDay : Gtk.EventBox { - public bool draw_left_border = true; - private VAutoHider event_box; - private GLib.HashTable event_buttons; -+ Gtk.Label label; - - public bool in_current_month { - set { -@@ -79,7 +80,7 @@ public class Maya.View.GridDay : Gtk.EventBox { - style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - style_context.add_class ("cell"); - -- var label = new Gtk.Label (""); -+ label = new Gtk.Label (""); - label.halign = Gtk.Align.END; - label.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - label.margin = EVENT_MARGIN; -@@ -100,10 +101,6 @@ public class Maya.View.GridDay : Gtk.EventBox { - - Gtk.TargetEntry dnd = {"binary/calendar", 0, 0}; - Gtk.drag_dest_set (this, Gtk.DestDefaults.MOTION, {dnd}, Gdk.DragAction.MOVE); -- -- this.notify["date"].connect (() => { -- label.label = date.get_day_of_month ().to_string (); -- }); - } - - public override bool drag_drop (Gdk.DragContext context, int x, int y, uint time_) { -@@ -174,6 +171,11 @@ public class Maya.View.GridDay : Gtk.EventBox { - event_buttons.remove_all (); - } - -+ public void update_date (DateTime date) { -+ this.date = date; -+ label.label = date.get_day_of_month ().to_string (); -+ } -+ - public void set_selected (bool selected) { - if (selected) { - set_state_flags (Gtk.StateFlags.SELECTED, true); From 872526f999ad70a9d09206921699da5ff87eb944 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Oct 2022 15:44:25 +0800 Subject: [PATCH 464/505] pantheon.wingpanel-indicator-datetime: switch to merged patch --- .../wingpanel-indicators/datetime/default.nix | 10 +++-- .../datetime/partly-revert-pr-150.patch | 40 ------------------- 2 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index c884dd2d247d..b00fdb95d3e0 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -38,9 +39,12 @@ stdenv.mkDerivation rec { elementary_calendar = elementary-calendar; }) - # Workaround for showing date numbers (TODO: should try to fix upstream) - # https://github.com/elementary/calendar/issues/756#issuecomment-1252400047 - ./partly-revert-pr-150.patch + # GridDay: Do not connect to the notify signal for the property + # https://github.com/elementary/wingpanel-indicator-datetime/pull/305 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/845ac1345124571fe995ab7138d5dfe4d29847e9.patch"; + sha256 = "sha256-/wd/FnhjC0c0Y8mCZg8XNoPOYAAmfK+g1F6L6TMEkdM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch deleted file mode 100644 index 766c1dda29f7..000000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/Widgets/calendar/Grid.vala b/src/Widgets/calendar/Grid.vala -index e440306..21a631a 100644 ---- a/src/Widgets/calendar/Grid.vala -+++ b/src/Widgets/calendar/Grid.vala -@@ -229,7 +229,7 @@ namespace DateTime.Widgets { - day.sensitive_container (false); - } - -- day.date = new_date; -+ day.update_date (new_date); - - return day; - } -diff --git a/src/Widgets/calendar/GridDay.vala b/src/Widgets/calendar/GridDay.vala -index 8602875..7bd6140 100644 ---- a/src/Widgets/calendar/GridDay.vala -+++ b/src/Widgets/calendar/GridDay.vala -@@ -79,10 +79,6 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox { - button_press_event.connect (on_button_press); - key_press_event.connect (on_key_press); - -- notify["date"].connect (() => { -- label.label = date.get_day_of_month ().to_string (); -- }); -- - component_dots = new Gee.HashMap (); - } - -@@ -124,6 +120,11 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox { - } - } - -+ public void update_date (GLib.DateTime date) { -+ this.date = date; -+ label.label = date.get_day_of_month ().to_string (); -+ } -+ - public void set_selected (bool selected) { - if (selected) { - set_state_flags (Gtk.StateFlags.SELECTED, true); From 631a07824d868288b96c470f3fe61810ad9e1eed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 01:01:11 +0000 Subject: [PATCH 465/505] tailscale: 1.30.2 -> 1.32.0 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index b36b5449caef..ecb2108858e4 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.30.2"; + version = "1.32.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-xs3LhldFP4gB5ouW1q8eiCZ5nZD6j9QROm/s+qFMA88="; + sha256 = "sha256-+pJ7YwJKtlB/UmuvKT4zoWRn1ZBAf75/GcscPbFuA8c="; }; - vendorSha256 = "sha256-+7Cr7wmt4PheHJRAlyKhRd6QRIZBqrbVtn5I94h8lLo="; + vendorSha256 = "sha256-VW6FvbgLcokVGunTCHUXKuH5+O6T55hGIP2g5kFfBsE="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From a04a0f1bf4c25b0579b05ed473dc439018675815 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 12 Oct 2022 12:17:14 -0400 Subject: [PATCH 466/505] vault: 1.11.4 -> 1.12.0 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index fd8f714e2285..e3016eacf714 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.11.4"; + version = "1.12.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-t7mcnXOBP5fTnYVTLVfA2HOynKri88tQdkyl6p83aFQ="; + sha256 = "sha256-c2MIX4uDbHuiuZr12SkUV6jLsx2PS3Q+NngacT7AQO0="; }; - vendorSha256 = "sha256-4WbNrFK80uQPUrTvNHBRAYynqpOxAolj1t6XJ0Bb8I4="; + vendorSha256 = "sha256-BPIUIy1xEUzbh1ESldiOhDpYp4EdfUi/QkBNqk3U1UY="; subPackages = [ "." ]; From fbcc270b981b3caad3359c807f6c7d5b5773fd9c Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 12 Oct 2022 12:20:58 -0400 Subject: [PATCH 467/505] vault-bin: 1.11.4 -> 1.12.0 --- pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index ccde88230463..beca57e85ff2 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.11.4"; + version = "1.12.0"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-+txLeWsk63rj1iWOI3p9oP2aAEY/VYbvMOYtGQ6gHV8="; - aarch64-linux = "sha256-py8HF4uydQIIW1zu5W2c1VF6Dtp4yw+hUs8fPjIa7YQ="; - i686-linux = "sha256-87dmhr2HEBqjPDd4SrVGH5Fw7Rar9HqWxNRMK8Vg9yY="; - x86_64-darwin = "sha256-AsVYI5uM9b5NIaf0Qkb5/zbJ0WYxROBIa0nvbX08OcI="; - aarch64-darwin = "sha256-2Fqk5C9who8tV7+OnVODcK5DyJjE6V5akIR4oNhDQlA="; + x86_64-linux = "sha256-khDTpgezINAIZ8YFhOGoTSe6qzA6bkyhyX25VgcFAhU="; + aarch64-linux = "sha256-XOiuH9KmwXz8sR9FzH+wEIg0xzrMAIZaHVHf3TdJp10="; + i686-linux = "sha256-jCXQX04/Q1dHCIEcFlq60ICib/kjM8bE8ZKjF+0YPjE="; + x86_64-darwin = "sha256-fQaHI0ySer6lRdaEcNl7GN51IP+F5y/FR99Q66LQl3k="; + aarch64-darwin = "sha256-ME1u/g3l5Jqwvk9Qw4tTmbIvHOKkPMRayhRgPbZIYnA="; }; in fetchzip { From 5e166272ab4695dc08dd889ad3ade37b725f4eca Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 12 Oct 2022 17:11:51 -0400 Subject: [PATCH 468/505] kubernetes-helm: 3.10.0 -> 3.10.1 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 55e5c77c733c..5ec74e95e05c 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-oYM7T0t/U7Y/O4u3t9eDjfoxjVeNFBPJdlPs+p9PXOM="; + sha256 = "sha256-OyU97zyN7fZMZAD2BEp8TW2z2E9Rl/yeiVkQaJ1GWZk="; }; - vendorSha256 = "sha256-cyqTed3IZ5JFHYTphrOzSmcAc9xyre2LuMC3p0rfh/Y="; + vendorSha256 = "sha256-vyHT/N5lat/vqM2jK4Q+jJOtZpS52YCYGcJqfa5e0KM="; subPackages = [ "cmd/helm" ]; ldflags = [ From dfe919cd8e902a0c1002e7ab0328254fba9c2da6 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 12 Oct 2022 18:49:51 +0200 Subject: [PATCH 469/505] ko: 0.11.2 -> 0.12.0 - updates the github repository (org moved from google to ko-build) - updates precheck to make sure tests passes Signed-off-by: Vincent Demeester --- pkgs/development/tools/ko/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index f7add96fbad9..490ea3241049 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "google"; + owner = "ko-build"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BwK49dSt3D2BrYvluDOBYIH5qEt59HC1hssHl1D2Heg="; + sha256 = "sha256-hhPV40e5wB2/VcdigqgjffDW4X1ZDddXTZiCUBijtHQ="; }; vendorSha256 = null; @@ -36,6 +36,10 @@ buildGoModule rec { # resolves some complaints from ko export GOROOT="$(go env GOROOT)" git init + + # ko tests will fail if any of those env are set, as ko tries + # to make sure it can build and target multiple GOOS/GOARCH + unset GOOS GOARCH GOARM ''; postInstall = '' @@ -46,8 +50,8 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://github.com/google/ko"; - changelog = "https://github.com/google/ko/releases/tag/v${version}"; + homepage = "https://github.com/ko-build/ko"; + changelog = "https://github.com/ko-build/ko/releases/tag/v${version}"; description = "Build and deploy Go applications on Kubernetes"; longDescription = '' ko is a simple, fast container image builder for Go applications. @@ -56,6 +60,6 @@ buildGoModule rec { ko also includes support for simple YAML templating which makes it a powerful tool for Kubernetes applications. ''; license = licenses.asl20; - maintainers = with maintainers; [ nickcao jk ]; + maintainers = with maintainers; [ nickcao jk vdemeester ]; }; } From 1859b8e843e2c88cd62e89ded9c431c2f23cda74 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 12 Oct 2022 09:36:30 +0200 Subject: [PATCH 470/505] ginkgo: 2.2.0 -> 2.3.1 Signed-off-by: Sascha Grunert --- pkgs/development/tools/ginkgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index a96e6df37d1a..7c3e71cdda18 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-1qbUnsCy2JM0GJAvM//cG7j3OsJZCnd+7KXol4FsXFI="; + sha256 = "sha256-sBO0rJFRG38qAh1svChkbyCv8eJ9KjVPJHgOhxUMuH0="; }; - vendorSha256 = "sha256-QXrRsDaWoPp4mbgS7nV/5c5Z5Ca6PyoDpfrjvtoHK4Q="; + vendorSha256 = "sha256-yPzuhM0m+ltkz2z7D+DcFVjZ3OvGkJqQdc6iFidcty8="; # integration tests expect more file changes # types tests are missing CodeLocation From 275f5047a069285c6b4c4c2fb71f6ce0839d9b3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 09:24:37 +0000 Subject: [PATCH 471/505] flyctl: 0.0.409 -> 0.0.413 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 42edaed7f5d2..26b9971771af 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.409"; + version = "0.0.413"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-ijkmPyz29p8+YUbx9zPj0hSbpTLJiOXOFEzlJI6hI6I="; + sha256 = "sha256-TpLvIaaZMNMZ4MAVjGA4jMVf1RxcHRUmMUsfoFBTSik="; }; - vendorSha256 = "sha256-1pgR6ghuPSFI3KXOyjNmmiVKJU2y4RCRBpFRY5Yt59A="; + vendorSha256 = "sha256-ZnT9IaL6j2EzKk2RRftB4qELIi4nXKC/2zBOhInFYHA="; subPackages = [ "." ]; From 3485c3d03fe84c75525d0e11fb21e039ba3c107b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 09:30:24 +0000 Subject: [PATCH 472/505] flow: 0.188.2 -> 0.189.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index edc57ab10b13..f98c623b48cb 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.188.2"; + version = "0.189.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-oMiq4NMerhyLWtx4NhvTbK5yt7LhqnGTkFPRb+vwuug="; + sha256 = "sha256-sV2O5bFzIRm6ZiBwgDz8Y+NA5y44UztIAyvnIzkup/I="; }; makeFlags = [ "FLOW_RELEASE=1" ]; From fa90ccd7de3c44f4f44dc66245b785a453411b43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 09:31:52 +0000 Subject: [PATCH 473/505] freerdpUnstable: 2.8.0 -> 2.8.1 --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index c769b7de6c86..89e952945c87 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0="; + sha256 = "sha256-0heCwXFms6Ni/F1TaS5QEK+ePlR9DXUrzVj3vA5DvCk="; }; postPatch = '' From bb4926cac85130a1306c07fbeefdf9d118f3688f Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 13 Oct 2022 11:51:36 +0200 Subject: [PATCH 474/505] broot: 1.16.0 -> 1.16.1 https://github.com/Canop/broot/releases/tag/v1.16.1 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 0d4919599d93..be80dd4c22a3 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.16.0"; + version = "1.16.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1R6Q1xRV8FG8IMwZ+u7BJBvIqT1Pgah3emA1oln5hS0="; + sha256 = "sha256-OiTZAQYVIMJmQXGQkqcMsUykCImbEOCnYcKmwXwXlpQ="; }; - cargoHash = "sha256-+Q5rdOEN7arIyj+2n2JRtr8kRQgXmlxq3jumpuDiYdE="; + cargoHash = "sha256-sPJ8NrnwAHuCPLPef8tCbU4nM5J04CzGwf58a9J5Gz4="; nativeBuildInputs = [ installShellFiles From 475ef7975e2194c38b75899fa40cc0c2ddf2ccaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 11:07:24 +0000 Subject: [PATCH 475/505] python310Packages.mne-python: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index c7ceeb0d4f77..71a37c16596f 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.1.1"; + version = "1.2.0"; # PyPI dist insufficient to run tests src = fetchFromGitHub { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-VM7sKcQeAeK20r4/jehhGlvBSHhYwA2SgsNL5Oa/Hug="; + sha256 = "sha256-IqZYkPomS/AjZrPDZapPaZ1jhtrzAvi5MOd9rYrSdKo="; }; propagatedBuildInputs = [ From 5b055190e37d220b787b304e400391299bba022c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 13 Oct 2022 13:36:47 +0200 Subject: [PATCH 476/505] doc/stdenv: Clarify status of the hooks --- doc/stdenv/stdenv.chapter.md | 68 +++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index e87ab4727077..a304c0e14657 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1010,19 +1010,19 @@ The *existence* of setups hooks has long been documented and packages inside Nix First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation` or when using a custom builder that has `source $stdenv/setup`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. -### `move-docs.sh` {#move-docs.sh} +### Default hook `move-docs.sh` {#move-docs.sh} This setup hook moves any installed documentation to the `/share` subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the `share` subdirectory. -### `compress-man-pages.sh` {#compress-man-pages.sh} +### Default hook `compress-man-pages.sh` {#compress-man-pages.sh} This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages. -### `strip.sh` {#strip.sh} +### Default hook `strip.sh` {#strip.sh} This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages. -### `patch-shebangs.sh` {#patch-shebangs.sh} +### Default hook `patch-shebangs.sh` {#patch-shebangs.sh} This setup hook patches installed scripts to add Nix store paths to their shebang interpreter as found in the build environment. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system which interpreter to use to execute the script's contents. @@ -1089,27 +1089,29 @@ If you need to run `patchShebangs` at build time, it must be called explicitly w [patchShebangs]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh#L24-L105 [patchShebangsAuto]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh#L107-L119 -### `audit-tmpdir.sh` {#audit-tmpdir.sh} +### Default hook `audit-tmpdir.sh` {#audit-tmpdir.sh} This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only. -### `multiple-outputs.sh` {#multiple-outputs.sh} +### Default hook `multiple-outputs.sh` {#multiple-outputs.sh} This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in `outputs`. This behavior can be turned off by setting `setOutputFlags` to false in the derivation environment. See [](#chap-multiple-output) for more information. -### `move-sbin.sh` {#move-sbin.sh} +### Default hook `move-sbin.sh` {#move-sbin.sh} This setup hook moves any binaries installed in the `sbin/` subdirectory into `bin/`. In addition, a link is provided from `sbin/` to `bin/` for compatibility. -### `move-lib64.sh` {#move-lib64.sh} +### Default hook `move-lib64.sh` {#move-lib64.sh} This setup hook moves any libraries installed in the `lib64/` subdirectory into `lib/`. In addition, a link is provided from `lib64/` to `lib/` for compatibility. -### `move-systemd-user-units.sh` {#move-systemd-user-units.sh} +### Default hook `move-systemd-user-units.sh` {#move-systemd-user-units.sh} This setup hook moves any systemd user units installed in the `lib/` subdirectory into `share/`. In addition, a link is provided from `share/` to `lib/` for compatibility. This is needed for systemd to find user services when installed into the user profile. -### `set-source-date-epoch-to-latest.sh` {#set-source-date-epoch-to-latest.sh} +This hook only runs when compiling for Linux. + +### Default hook `set-source-date-epoch-to-latest.sh` {#set-source-date-epoch-to-latest.sh} This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file. @@ -1133,51 +1135,51 @@ Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard envi Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses. -### Perl {#setup-hook-perl} +### Optional hook Perl {#setup-hook-perl} Adds the `lib/site_perl` subdirectory of each build input to the `PERL5LIB` environment variable. For instance, if `buildInputs` contains Perl, then the `lib/site_perl` subdirectory of each input is added to the `PERL5LIB` environment variable. -### Python {#setup-hook-python} +### Optional hook Python {#setup-hook-python} Adds the `lib/${python.libPrefix}/site-packages` subdirectory of each build input to the `PYTHONPATH` environment variable. -### pkg-config {#setup-hook-pkg-config} +### Optional hook pkg-config {#setup-hook-pkg-config} Adds the `lib/pkgconfig` and `share/pkgconfig` subdirectories of each build input to the `PKG_CONFIG_PATH` environment variable. -### Automake {#setup-hook-automake} +### Optional hook Automake {#setup-hook-automake} Adds the `share/aclocal` subdirectory of each build input to the `ACLOCAL_PATH` environment variable. -### Autoconf {#setup-hook-autoconf} +### Optional hook Autoconf {#setup-hook-autoconf} The `autoreconfHook` derivation adds `autoreconfPhase`, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts. -### libxml2 {#setup-hook-libxml2} +### Optional hook libxml2 {#setup-hook-libxml2} Adds every file named `catalog.xml` found under the `xml/dtd` and `xml/xsl` subdirectories of each build input to the `XML_CATALOG_FILES` environment variable. -### teTeX / TeX Live {#tetex-tex-live} +### Optional hook teTeX / TeX Live {#tetex-tex-live} Adds the `share/texmf-nix` subdirectory of each build input to the `TEXINPUTS` environment variable. -### Qt 4 {#qt-4} +### Optional hook Qt 4 {#qt-4} Sets the `QTDIR` environment variable to Qt’s path. -### gdk-pixbuf {#setup-hook-gdk-pixbuf} +### Optional hook gdk-pixbuf {#setup-hook-gdk-pixbuf} Exports `GDK_PIXBUF_MODULE_FILE` environment variable to the builder. Add librsvg package to `buildInputs` to get svg support. See also the [setup hook description in GNOME platform docs](#ssec-gnome-hooks-gdk-pixbuf). -### GHC {#ghc} +### Optional hook GHC {#ghc} Creates a temporary package database and registers every Haskell build input in it (TODO: how?). -### GNOME platform {#gnome-platform} +### Optional hook GNOME platform {#gnome-platform} Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in [](#sec-language-gnome). -### autoPatchelfHook {#setup-hook-autopatchelfhook} +### Optional hook autoPatchelfHook {#setup-hook-autopatchelfhook} This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given `buildInputs` and `nativeBuildInputs`. @@ -1189,7 +1191,7 @@ By default `autoPatchelf` will fail as soon as any ELF file requires a dependenc The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. -### breakpointHook {#breakpointhook} +### Optional hook breakpointHook {#breakpointhook} This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the `cntr` command. Upon build error it will print instructions on how to use `cntr`, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At `/var/lib/cntr` the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. `cntr` is only supported on Linux-based platforms. To use it first add `cntr` to your `environment.systemPackages` on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add `breakpointHook` to `nativeBuildInputs`. @@ -1207,7 +1209,7 @@ Caution with remote builds This won’t work with remote builds as the build environment is on a different machine and can’t be accessed by `cntr`. Remote builds can be turned off by setting `--option builders ''` for `nix-build` or `--builders ''` for `nix build`. ::: -### installShellFiles {#installshellfiles} +### Optional hook `installShellFiles` {#installshellfiles} This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook. @@ -1233,23 +1235,23 @@ postInstall = '' ''; ``` -### libiconv, libintl {#libiconv-libintl} +### Optional hook libiconv, libintl {#libiconv-libintl} A few libraries automatically add to `NIX_LDFLAGS` their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set `dontAddExtraLibs`. -### validatePkgConfig {#validatepkgconfig} +### Optional hook validatePkgConfig {#validatepkgconfig} The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables. -### cmake {#cmake} +### Optional hook cmake {#cmake} Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. `cmakeFlags` controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. -### xcbuildHook {#xcbuildhook} +### Optional hook xcbuildHook {#xcbuildhook} Overrides the build and install phases to run the "xcbuild" command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild. -### Meson {#meson} +### Optional hook Meson {#meson} Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere. @@ -1275,19 +1277,19 @@ What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#c Disables using Meson’s `configurePhase`. -### ninja {#ninja} +### Optional hook ninja {#ninja} Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja. -### unzip {#unzip} +### Optional hook unzip {#unzip} This setup hook will allow you to unzip .zip files specified in `$src`. There are many similar packages like `unrar`, `undmg`, etc. -### wafHook {#wafhook} +### Optional hook wafHook {#wafhook} Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script. -### scons {#scons} +### Optional hook scons {#scons} Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time. From c4cd43a20956675e88596216a7568ad650a60b29 Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski <3494992+nazarewk@users.noreply.github.com> Date: Thu, 13 Oct 2022 15:38:37 +0200 Subject: [PATCH 477/505] edid-generator: actually generate binaries the package was not generating *.bin files as the `make` call was missing --- pkgs/tools/misc/edid-generator/default.nix | 26 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index c184dc0b3dd3..09402111fb66 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -1,12 +1,24 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , dos2unix , edid-decode , hexdump , zsh -, modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync +, modelines ? [ ] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync +, clean ? false # should it skip all, but explicitly listed modelines? }: +# Usage: +# (edid-generator.override { +# clean = true; +# modelines = [ +# ''Modeline "PG278Q_2560x1440" 241.50 2560 2608 2640 2720 1440 1443 1448 1481 -hsync +vsync'' +# ''Modeline "PG278Q_2560x1440@120" 497.75 2560 2608 2640 2720 1440 1443 1448 1525 +hsync -vsync'' +# ''Modeline "U2711_2560x1440" 241.50 2560 2600 2632 2720 1440 1443 1448 1481 -hsync +vsync'' +# ]; +# }) + stdenv.mkDerivation rec { pname = "edid-generator"; version = "unstable-2018-03-15"; @@ -22,9 +34,15 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs modeline2edid + # allows makefile to discover prefixes and suffixes in addition to just `[0-9]*x[0-9]*.S` + awk -i inplace '/^SOURCES\t/ { print "SOURCES\t:= $(wildcard *[0-9]*x[0-9]**.S)"; next; }; { print; }' Makefile ''; - configurePhase = (lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); + configurePhase = '' + test '${toString clean}' != 1 || rm *x*.S + ${lib.concatMapStringsSep "\n" (m: "./modeline2edid - <<<'${m}'") modelines} + make clean all + ''; installPhase = '' install -Dm 444 *.bin -t "$out/lib/firmware/edid" @@ -34,7 +52,7 @@ stdenv.mkDerivation rec { description = "Hackerswork to generate an EDID blob from given Xorg Modelines"; homepage = "https://github.com/akatrevorjay/edid-generator"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.flokli ]; + maintainers = with lib.maintainers; [ flokli nazarewk ]; platforms = lib.platforms.all; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/edid-generator.x86_64-darwin }; From 2db8de920eebf9ef488c4725d579a2c3862d9a04 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 13 Oct 2022 15:36:04 +0200 Subject: [PATCH 478/505] doc: Move non-stdenv hooks out of stdenv chapter --- doc/hooks/autoconf.section.md | 4 + doc/hooks/automake.section.md | 4 + doc/hooks/autopatchelf.section.md | 12 ++ doc/hooks/breakpoint.section.md | 18 +++ doc/hooks/cmake.section.md | 4 + doc/hooks/gdk-pixbuf.section.md | 4 + doc/hooks/ghc.section.md | 4 + doc/hooks/gnome.section.md | 4 + doc/hooks/index.xml | 26 ++++ doc/hooks/installShellFiles.section.md | 26 ++++ doc/hooks/libiconv.section.md | 4 + doc/hooks/libxml2.section.md | 4 + doc/hooks/meson.section.md | 26 ++++ doc/hooks/ninja.section.md | 4 + doc/hooks/perl.section.md | 4 + doc/hooks/pkg-config.section.md | 4 + doc/hooks/python.section.md | 4 + doc/hooks/qt-4.section.md | 4 + doc/hooks/scons.section.md | 4 + doc/hooks/tetex-tex-live.section.md | 4 + doc/hooks/unzip.section.md | 4 + doc/hooks/validatePkgConfig.section.md | 4 + doc/hooks/waf.section.md | 4 + doc/hooks/xcbuild.section.md | 4 + doc/stdenv/stdenv.chapter.md | 183 ++----------------------- 25 files changed, 199 insertions(+), 168 deletions(-) create mode 100644 doc/hooks/autoconf.section.md create mode 100644 doc/hooks/automake.section.md create mode 100644 doc/hooks/autopatchelf.section.md create mode 100644 doc/hooks/breakpoint.section.md create mode 100644 doc/hooks/cmake.section.md create mode 100644 doc/hooks/gdk-pixbuf.section.md create mode 100644 doc/hooks/ghc.section.md create mode 100644 doc/hooks/gnome.section.md create mode 100644 doc/hooks/installShellFiles.section.md create mode 100644 doc/hooks/libiconv.section.md create mode 100644 doc/hooks/libxml2.section.md create mode 100644 doc/hooks/meson.section.md create mode 100644 doc/hooks/ninja.section.md create mode 100644 doc/hooks/perl.section.md create mode 100644 doc/hooks/pkg-config.section.md create mode 100644 doc/hooks/python.section.md create mode 100644 doc/hooks/qt-4.section.md create mode 100644 doc/hooks/scons.section.md create mode 100644 doc/hooks/tetex-tex-live.section.md create mode 100644 doc/hooks/unzip.section.md create mode 100644 doc/hooks/validatePkgConfig.section.md create mode 100644 doc/hooks/waf.section.md create mode 100644 doc/hooks/xcbuild.section.md diff --git a/doc/hooks/autoconf.section.md b/doc/hooks/autoconf.section.md new file mode 100644 index 000000000000..13d75910f192 --- /dev/null +++ b/doc/hooks/autoconf.section.md @@ -0,0 +1,4 @@ + +### Autoconf {#setup-hook-autoconf} + +The `autoreconfHook` derivation adds `autoreconfPhase`, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts. diff --git a/doc/hooks/automake.section.md b/doc/hooks/automake.section.md new file mode 100644 index 000000000000..562ac18fcd93 --- /dev/null +++ b/doc/hooks/automake.section.md @@ -0,0 +1,4 @@ + +### Automake {#setup-hook-automake} + +Adds the `share/aclocal` subdirectory of each build input to the `ACLOCAL_PATH` environment variable. diff --git a/doc/hooks/autopatchelf.section.md b/doc/hooks/autopatchelf.section.md new file mode 100644 index 000000000000..9c2852ccf279 --- /dev/null +++ b/doc/hooks/autopatchelf.section.md @@ -0,0 +1,12 @@ + +### autoPatchelfHook {#setup-hook-autopatchelfhook} + +This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given `buildInputs` and `nativeBuildInputs`. + +You can also specify a `runtimeDependencies` variable which lists dependencies to be unconditionally added to rpath of all executables. This is useful for programs that use dlopen 3 to load libraries at runtime. + +In certain situations you may want to run the main command (`autoPatchelf`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchelf` environment variable to a non-empty value. + +By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchelfIgnoreMissingDeps` can be set to a list like `autoPatchelfIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to simply `[ "*" ]` to ignore all missing dependencies. + +The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. diff --git a/doc/hooks/breakpoint.section.md b/doc/hooks/breakpoint.section.md new file mode 100644 index 000000000000..41e50653e91d --- /dev/null +++ b/doc/hooks/breakpoint.section.md @@ -0,0 +1,18 @@ + +### breakpointHook {#breakpointhook} + +This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the `cntr` command. Upon build error it will print instructions on how to use `cntr`, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At `/var/lib/cntr` the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. `cntr` is only supported on Linux-based platforms. To use it first add `cntr` to your `environment.systemPackages` on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add `breakpointHook` to `nativeBuildInputs`. + +```nix +nativeBuildInputs = [ breakpointHook ]; +``` + +When a build failure happens there will be an instruction printed that shows how to attach with `cntr` to the build sandbox. + +::: {.note} +::: {.title} +Caution with remote builds +::: + +This won’t work with remote builds as the build environment is on a different machine and can’t be accessed by `cntr`. Remote builds can be turned off by setting `--option builders ''` for `nix-build` or `--builders ''` for `nix build`. +::: diff --git a/doc/hooks/cmake.section.md b/doc/hooks/cmake.section.md new file mode 100644 index 000000000000..58fbfa45a2e0 --- /dev/null +++ b/doc/hooks/cmake.section.md @@ -0,0 +1,4 @@ + +### cmake {#cmake} + +Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. `cmakeFlags` controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. diff --git a/doc/hooks/gdk-pixbuf.section.md b/doc/hooks/gdk-pixbuf.section.md new file mode 100644 index 000000000000..565216560abc --- /dev/null +++ b/doc/hooks/gdk-pixbuf.section.md @@ -0,0 +1,4 @@ + +### gdk-pixbuf {#setup-hook-gdk-pixbuf} + +Exports `GDK_PIXBUF_MODULE_FILE` environment variable to the builder. Add librsvg package to `buildInputs` to get svg support. See also the [setup hook description in GNOME platform docs](#ssec-gnome-hooks-gdk-pixbuf). diff --git a/doc/hooks/ghc.section.md b/doc/hooks/ghc.section.md new file mode 100644 index 000000000000..a4b0841ea486 --- /dev/null +++ b/doc/hooks/ghc.section.md @@ -0,0 +1,4 @@ + +### GHC {#ghc} + +Creates a temporary package database and registers every Haskell build input in it (TODO: how?). diff --git a/doc/hooks/gnome.section.md b/doc/hooks/gnome.section.md new file mode 100644 index 000000000000..8c209d9b472c --- /dev/null +++ b/doc/hooks/gnome.section.md @@ -0,0 +1,4 @@ + +### GNOME platform {#gnome-platform} + +Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in [](#sec-language-gnome). diff --git a/doc/hooks/index.xml b/doc/hooks/index.xml index 6a046eae2885..ed703c03d8b0 100644 --- a/doc/hooks/index.xml +++ b/doc/hooks/index.xml @@ -6,5 +6,31 @@ Nixpkgs has several hook packages that augment the stdenv phases. + + The stdenv built-in hooks are documented in . + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md new file mode 100644 index 000000000000..d27527503fed --- /dev/null +++ b/doc/hooks/installShellFiles.section.md @@ -0,0 +1,26 @@ + +### `installShellFiles` {#installshellfiles} + +This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook. + +The `installManPage` function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with `.gz` suffix). This function will place them into the correct directory. + +The `installShellCompletion` function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of `--bash`, `--fish`, or `--zsh`. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag `--name NAME` before the path. If this flag is not provided, zsh completions will be renamed automatically such that `foobar.zsh` becomes `_foobar`. A root name may be provided for all paths using the flag `--cmd NAME`; this synthesizes the appropriate name depending on the shell (e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for zsh). The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which case the shell and name must be provided. + +```nix +nativeBuildInputs = [ installShellFiles ]; +postInstall = '' + installManPage doc/foobar.1 doc/barfoo.3 + # explicit behavior + installShellCompletion --bash --name foobar.bash share/completions.bash + installShellCompletion --fish --name foobar.fish share/completions.fish + installShellCompletion --zsh --name _foobar share/completions.zsh + # implicit behavior + installShellCompletion share/completions/foobar.{bash,fish,zsh} + # using named fd + installShellCompletion --cmd foobar \ + --bash <($out/bin/foobar --bash-completion) \ + --fish <($out/bin/foobar --fish-completion) \ + --zsh <($out/bin/foobar --zsh-completion) +''; +``` diff --git a/doc/hooks/libiconv.section.md b/doc/hooks/libiconv.section.md new file mode 100644 index 000000000000..c228fe339e14 --- /dev/null +++ b/doc/hooks/libiconv.section.md @@ -0,0 +1,4 @@ + +### libiconv, libintl {#libiconv-libintl} + +A few libraries automatically add to `NIX_LDFLAGS` their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set `dontAddExtraLibs`. diff --git a/doc/hooks/libxml2.section.md b/doc/hooks/libxml2.section.md new file mode 100644 index 000000000000..770ef9ff3ffe --- /dev/null +++ b/doc/hooks/libxml2.section.md @@ -0,0 +1,4 @@ + +### libxml2 {#setup-hook-libxml2} + +Adds every file named `catalog.xml` found under the `xml/dtd` and `xml/xsl` subdirectories of each build input to the `XML_CATALOG_FILES` environment variable. diff --git a/doc/hooks/meson.section.md b/doc/hooks/meson.section.md new file mode 100644 index 000000000000..32804b5e32f2 --- /dev/null +++ b/doc/hooks/meson.section.md @@ -0,0 +1,26 @@ + +### Meson {#meson} + +Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere. + +#### Variables controlling Meson {#variables-controlling-meson} + +##### `mesonFlags` {#mesonflags} + +Controls the flags passed to meson. + +##### `mesonBuildType` {#mesonbuildtype} + +Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`. + +##### `mesonAutoFeatures` {#mesonautofeatures} + +What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`. + +##### `mesonWrapMode` {#mesonwrapmode} + +What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access. + +##### `dontUseMesonConfigure` {#dontusemesonconfigure} + +Disables using Meson’s `configurePhase`. diff --git a/doc/hooks/ninja.section.md b/doc/hooks/ninja.section.md new file mode 100644 index 000000000000..5ea1ee87070a --- /dev/null +++ b/doc/hooks/ninja.section.md @@ -0,0 +1,4 @@ + +### ninja {#ninja} + +Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja. diff --git a/doc/hooks/perl.section.md b/doc/hooks/perl.section.md new file mode 100644 index 000000000000..403227a9bf18 --- /dev/null +++ b/doc/hooks/perl.section.md @@ -0,0 +1,4 @@ + +### Perl {#setup-hook-perl} + +Adds the `lib/site_perl` subdirectory of each build input to the `PERL5LIB` environment variable. For instance, if `buildInputs` contains Perl, then the `lib/site_perl` subdirectory of each input is added to the `PERL5LIB` environment variable. diff --git a/doc/hooks/pkg-config.section.md b/doc/hooks/pkg-config.section.md new file mode 100644 index 000000000000..969c81f6d18a --- /dev/null +++ b/doc/hooks/pkg-config.section.md @@ -0,0 +1,4 @@ + +### pkg-config {#setup-hook-pkg-config} + +Adds the `lib/pkgconfig` and `share/pkgconfig` subdirectories of each build input to the `PKG_CONFIG_PATH` environment variable. diff --git a/doc/hooks/python.section.md b/doc/hooks/python.section.md new file mode 100644 index 000000000000..a46a727e95b1 --- /dev/null +++ b/doc/hooks/python.section.md @@ -0,0 +1,4 @@ + +### Python {#setup-hook-python} + +Adds the `lib/${python.libPrefix}/site-packages` subdirectory of each build input to the `PYTHONPATH` environment variable. diff --git a/doc/hooks/qt-4.section.md b/doc/hooks/qt-4.section.md new file mode 100644 index 000000000000..f15d858e2377 --- /dev/null +++ b/doc/hooks/qt-4.section.md @@ -0,0 +1,4 @@ + +### Qt 4 {#qt-4} + +Sets the `QTDIR` environment variable to Qt’s path. diff --git a/doc/hooks/scons.section.md b/doc/hooks/scons.section.md new file mode 100644 index 000000000000..1392269e5d55 --- /dev/null +++ b/doc/hooks/scons.section.md @@ -0,0 +1,4 @@ + +### scons {#scons} + +Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time. diff --git a/doc/hooks/tetex-tex-live.section.md b/doc/hooks/tetex-tex-live.section.md new file mode 100644 index 000000000000..0ecdcc12e45a --- /dev/null +++ b/doc/hooks/tetex-tex-live.section.md @@ -0,0 +1,4 @@ + +### teTeX / TeX Live {#tetex-tex-live} + +Adds the `share/texmf-nix` subdirectory of each build input to the `TEXINPUTS` environment variable. diff --git a/doc/hooks/unzip.section.md b/doc/hooks/unzip.section.md new file mode 100644 index 000000000000..91dc072de662 --- /dev/null +++ b/doc/hooks/unzip.section.md @@ -0,0 +1,4 @@ + +### unzip {#unzip} + +This setup hook will allow you to unzip .zip files specified in `$src`. There are many similar packages like `unrar`, `undmg`, etc. diff --git a/doc/hooks/validatePkgConfig.section.md b/doc/hooks/validatePkgConfig.section.md new file mode 100644 index 000000000000..8719ae930fcb --- /dev/null +++ b/doc/hooks/validatePkgConfig.section.md @@ -0,0 +1,4 @@ + +### validatePkgConfig {#validatepkgconfig} + +The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables. diff --git a/doc/hooks/waf.section.md b/doc/hooks/waf.section.md new file mode 100644 index 000000000000..de65abde4502 --- /dev/null +++ b/doc/hooks/waf.section.md @@ -0,0 +1,4 @@ + +### wafHook {#wafhook} + +Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script. diff --git a/doc/hooks/xcbuild.section.md b/doc/hooks/xcbuild.section.md new file mode 100644 index 000000000000..1426431f6dce --- /dev/null +++ b/doc/hooks/xcbuild.section.md @@ -0,0 +1,4 @@ + +### xcbuildHook {#xcbuildhook} + +Overrides the build and install phases to run the "xcbuild" command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index a304c0e14657..12213d7ca5de 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1010,19 +1010,19 @@ The *existence* of setups hooks has long been documented and packages inside Nix First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation` or when using a custom builder that has `source $stdenv/setup`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. -### Default hook `move-docs.sh` {#move-docs.sh} +### `move-docs.sh` {#move-docs.sh} This setup hook moves any installed documentation to the `/share` subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the `share` subdirectory. -### Default hook `compress-man-pages.sh` {#compress-man-pages.sh} +### `compress-man-pages.sh` {#compress-man-pages.sh} This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages. -### Default hook `strip.sh` {#strip.sh} +### `strip.sh` {#strip.sh} This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages. -### Default hook `patch-shebangs.sh` {#patch-shebangs.sh} +### `patch-shebangs.sh` {#patch-shebangs.sh} This setup hook patches installed scripts to add Nix store paths to their shebang interpreter as found in the build environment. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system which interpreter to use to execute the script's contents. @@ -1089,32 +1089,37 @@ If you need to run `patchShebangs` at build time, it must be called explicitly w [patchShebangs]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh#L24-L105 [patchShebangsAuto]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh#L107-L119 -### Default hook `audit-tmpdir.sh` {#audit-tmpdir.sh} +### `audit-tmpdir.sh` {#audit-tmpdir.sh} This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only. -### Default hook `multiple-outputs.sh` {#multiple-outputs.sh} +### `multiple-outputs.sh` {#multiple-outputs.sh} This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in `outputs`. This behavior can be turned off by setting `setOutputFlags` to false in the derivation environment. See [](#chap-multiple-output) for more information. -### Default hook `move-sbin.sh` {#move-sbin.sh} +### `move-sbin.sh` {#move-sbin.sh} This setup hook moves any binaries installed in the `sbin/` subdirectory into `bin/`. In addition, a link is provided from `sbin/` to `bin/` for compatibility. -### Default hook `move-lib64.sh` {#move-lib64.sh} +### `move-lib64.sh` {#move-lib64.sh} This setup hook moves any libraries installed in the `lib64/` subdirectory into `lib/`. In addition, a link is provided from `lib64/` to `lib/` for compatibility. -### Default hook `move-systemd-user-units.sh` {#move-systemd-user-units.sh} +### `move-systemd-user-units.sh` {#move-systemd-user-units.sh} This setup hook moves any systemd user units installed in the `lib/` subdirectory into `share/`. In addition, a link is provided from `share/` to `lib/` for compatibility. This is needed for systemd to find user services when installed into the user profile. This hook only runs when compiling for Linux. -### Default hook `set-source-date-epoch-to-latest.sh` {#set-source-date-epoch-to-latest.sh} +### `set-source-date-epoch-to-latest.sh` {#set-source-date-epoch-to-latest.sh} This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file. +### Other hooks + +Many other packages provide hooks, that are not part of `stdenv`. You can find +these in the [Hooks Reference](#chap-hooks). + ### Bintools Wrapper {#bintools-wrapper} The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. @@ -1135,164 +1140,6 @@ Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard envi Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses. -### Optional hook Perl {#setup-hook-perl} - -Adds the `lib/site_perl` subdirectory of each build input to the `PERL5LIB` environment variable. For instance, if `buildInputs` contains Perl, then the `lib/site_perl` subdirectory of each input is added to the `PERL5LIB` environment variable. - -### Optional hook Python {#setup-hook-python} - -Adds the `lib/${python.libPrefix}/site-packages` subdirectory of each build input to the `PYTHONPATH` environment variable. - -### Optional hook pkg-config {#setup-hook-pkg-config} - -Adds the `lib/pkgconfig` and `share/pkgconfig` subdirectories of each build input to the `PKG_CONFIG_PATH` environment variable. - -### Optional hook Automake {#setup-hook-automake} - -Adds the `share/aclocal` subdirectory of each build input to the `ACLOCAL_PATH` environment variable. - -### Optional hook Autoconf {#setup-hook-autoconf} - -The `autoreconfHook` derivation adds `autoreconfPhase`, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts. - -### Optional hook libxml2 {#setup-hook-libxml2} - -Adds every file named `catalog.xml` found under the `xml/dtd` and `xml/xsl` subdirectories of each build input to the `XML_CATALOG_FILES` environment variable. - -### Optional hook teTeX / TeX Live {#tetex-tex-live} - -Adds the `share/texmf-nix` subdirectory of each build input to the `TEXINPUTS` environment variable. - -### Optional hook Qt 4 {#qt-4} - -Sets the `QTDIR` environment variable to Qt’s path. - -### Optional hook gdk-pixbuf {#setup-hook-gdk-pixbuf} - -Exports `GDK_PIXBUF_MODULE_FILE` environment variable to the builder. Add librsvg package to `buildInputs` to get svg support. See also the [setup hook description in GNOME platform docs](#ssec-gnome-hooks-gdk-pixbuf). - -### Optional hook GHC {#ghc} - -Creates a temporary package database and registers every Haskell build input in it (TODO: how?). - -### Optional hook GNOME platform {#gnome-platform} - -Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in [](#sec-language-gnome). - -### Optional hook autoPatchelfHook {#setup-hook-autopatchelfhook} - -This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given `buildInputs` and `nativeBuildInputs`. - -You can also specify a `runtimeDependencies` variable which lists dependencies to be unconditionally added to rpath of all executables. This is useful for programs that use dlopen 3 to load libraries at runtime. - -In certain situations you may want to run the main command (`autoPatchelf`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchelf` environment variable to a non-empty value. - -By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchelfIgnoreMissingDeps` can be set to a list like `autoPatchelfIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to simply `[ "*" ]` to ignore all missing dependencies. - -The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. - -### Optional hook breakpointHook {#breakpointhook} - -This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the `cntr` command. Upon build error it will print instructions on how to use `cntr`, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At `/var/lib/cntr` the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. `cntr` is only supported on Linux-based platforms. To use it first add `cntr` to your `environment.systemPackages` on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add `breakpointHook` to `nativeBuildInputs`. - -```nix -nativeBuildInputs = [ breakpointHook ]; -``` - -When a build failure happens there will be an instruction printed that shows how to attach with `cntr` to the build sandbox. - -::: {.note} -::: {.title} -Caution with remote builds -::: - -This won’t work with remote builds as the build environment is on a different machine and can’t be accessed by `cntr`. Remote builds can be turned off by setting `--option builders ''` for `nix-build` or `--builders ''` for `nix build`. -::: - -### Optional hook `installShellFiles` {#installshellfiles} - -This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook. - -The `installManPage` function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with `.gz` suffix). This function will place them into the correct directory. - -The `installShellCompletion` function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of `--bash`, `--fish`, or `--zsh`. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag `--name NAME` before the path. If this flag is not provided, zsh completions will be renamed automatically such that `foobar.zsh` becomes `_foobar`. A root name may be provided for all paths using the flag `--cmd NAME`; this synthesizes the appropriate name depending on the shell (e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for zsh). The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which case the shell and name must be provided. - -```nix -nativeBuildInputs = [ installShellFiles ]; -postInstall = '' - installManPage doc/foobar.1 doc/barfoo.3 - # explicit behavior - installShellCompletion --bash --name foobar.bash share/completions.bash - installShellCompletion --fish --name foobar.fish share/completions.fish - installShellCompletion --zsh --name _foobar share/completions.zsh - # implicit behavior - installShellCompletion share/completions/foobar.{bash,fish,zsh} - # using named fd - installShellCompletion --cmd foobar \ - --bash <($out/bin/foobar --bash-completion) \ - --fish <($out/bin/foobar --fish-completion) \ - --zsh <($out/bin/foobar --zsh-completion) -''; -``` - -### Optional hook libiconv, libintl {#libiconv-libintl} - -A few libraries automatically add to `NIX_LDFLAGS` their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set `dontAddExtraLibs`. - -### Optional hook validatePkgConfig {#validatepkgconfig} - -The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables. - -### Optional hook cmake {#cmake} - -Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. `cmakeFlags` controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. - -### Optional hook xcbuildHook {#xcbuildhook} - -Overrides the build and install phases to run the "xcbuild" command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild. - -### Optional hook Meson {#meson} - -Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere. - -#### Variables controlling Meson {#variables-controlling-meson} - -##### `mesonFlags` {#mesonflags} - -Controls the flags passed to meson. - -##### `mesonBuildType` {#mesonbuildtype} - -Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`. - -##### `mesonAutoFeatures` {#mesonautofeatures} - -What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`. - -##### `mesonWrapMode` {#mesonwrapmode} - -What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access. - -##### `dontUseMesonConfigure` {#dontusemesonconfigure} - -Disables using Meson’s `configurePhase`. - -### Optional hook ninja {#ninja} - -Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja. - -### Optional hook unzip {#unzip} - -This setup hook will allow you to unzip .zip files specified in `$src`. There are many similar packages like `unrar`, `undmg`, etc. - -### Optional hook wafHook {#wafhook} - -Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script. - -### Optional hook scons {#scons} - -Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time. - ## Purity in Nixpkgs {#sec-purity-in-nixpkgs} *Measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them.* From 34a497196e1bf16f97b72ef736ce6565787cc0e7 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 13 Oct 2022 22:00:36 +0800 Subject: [PATCH 479/505] go-2fa: use buildGoModule (#193459) --- pkgs/tools/security/2fa/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index b06454e736c8..6de513ec92b4 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - version = "1.2.0"; +buildGoModule rec { pname = "2fa"; - - goPackagePath = "rsc.io/2fa"; + version = "1.2.0"; src = fetchFromGitHub { owner = "rsc"; @@ -13,10 +11,15 @@ buildGoPackage rec { sha256 = "sha256-cB5iADZwvJQwwK1GockE2uicFlqFMEAY6xyeXF5lnUY="; }; + deleteVendor = true; + vendorSha256 = "sha256-4h/+ZNxlJPYY0Kyu2vDE1pDXxC/kGE5JdnagWVOGzAE="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://rsc.io/2fa"; description = "Two-factor authentication on the command line"; - maintainers = with maintainers; [ rvolosatovs ]; license = licenses.bsd3; + maintainers = with maintainers; [ rvolosatovs ]; }; } From 87a16031f3925290825bf08121ef5a5521653666 Mon Sep 17 00:00:00 2001 From: Joachim Schmidt Date: Thu, 13 Oct 2022 16:21:57 +0200 Subject: [PATCH 480/505] mopidy-mpd: 3.2.0 -> 3.3.0 (#191907) --- pkgs/applications/audio/mopidy/mpd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index ab7e33ea3e37..2c4f8eaa5a99 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; - version = "3.2.0"; + version = "3.3.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-oZvKr61lyu7CmXP2A/xtYng1FIUPyveVJMqUuv6UnaM="; + sha256 = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; }; - propagatedBuildInputs = [mopidy]; + propagatedBuildInputs = [ mopidy ]; # no tests implemented doCheck = false; From 2f5fcda329757f9a3d58dca4842e075c7f14ee2d Mon Sep 17 00:00:00 2001 From: Koen Wilde Date: Wed, 12 Oct 2022 23:46:01 +0200 Subject: [PATCH 481/505] build-support: Fix error when building images with many layers When building a docker image using `dockertools.buildLayeredImage`, the resulting image layers are passed to `jq` through the command line. When building an image with too many layers this would exceed the maximum command line argument length. Hence, we store the list of layers in the Nix store and pass them to `jq` as a file argument using `--slurpfile`. Fixes #140908. --- pkgs/build-support/docker/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 47fd99c12f8e..7eb81623046a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -935,33 +935,34 @@ rec { # following lines, double-check that your code behaves properly # when the number of layers equals: # maxLayers-1, maxLayers, and maxLayers+1, 0 - store_layers="$( - paths | - jq -sR ' - rtrimstr("\n") | split("\n") - | (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ] - | map(select(length > 0)) + paths | + jq -sR ' + rtrimstr("\n") | split("\n") + | (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ] + | map(select(length > 0)) ' \ - --argjson maxLayers "$availableLayers" - )" + --argjson maxLayers "$availableLayers" > store_layers.json + # The index on $store_layers is necessary because the --slurpfile + # automatically reads the file as an array. cat ${baseJson} | jq ' . + { "store_dir": $store_dir, "from_image": $from_image, - "store_layers": $store_layers, + "store_layers": $store_layers[0], "customisation_layer", $customisation_layer, "repo_tag": $repo_tag, "created": $created } ' --arg store_dir "${storeDir}" \ --argjson from_image ${if fromImage == null then "null" else "'\"${fromImage}\"'"} \ - --argjson store_layers "$store_layers" \ + --slurpfile store_layers store_layers.json \ --arg customisation_layer ${customisationLayer} \ --arg repo_tag "$imageName:$imageTag" \ --arg created "$created" | tee $out ''; + result = runCommand "stream-${baseName}" { inherit (conf) imageName; From da2258f9127392462f49ebd4f950c36124a63607 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 13 Oct 2022 14:56:23 +0000 Subject: [PATCH 482/505] vscode: 1.71.2 -> 1.72.1 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1ae65c1cbf4b..4c154ebf9cbe 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0ar8gpklaa0aa3k1934jyg2vh65hzncx0awl1f0wz8n4fjasfrpc"; - x86_64-darwin = "0jkpzyg2pk2d88w2ffrp2lr0qadss7ccycx4vpmjmw62d3sap8n1"; - aarch64-linux = "1g7lzqghagz63pljg4wy34z706j70vjmk49cl8v27jbnsgnva56a"; - aarch64-darwin = "132ml95xlyv5c343bfv0gpgr8rmk85xspsy9baninlmhnmy7mivv"; - armv7l-linux = "04anb6r7hkk3y3vahx32nxj5dz2i66rrnl0561xkcjr4cqvxykiw"; + x86_64-linux = "0hj6rpg65ivnnvzfjm16vjpjzzqbabpw5ldrr78x7ddrr06h02z6"; + x86_64-darwin = "01gskihfp5s0j4dw8nxmfsp0sav1zqlmylmvwhi1y2qqq4y9c3w9"; + aarch64-linux = "07n1svlkd2ji4b6yvhci6qvx429xipp8y418cqq3173gw8v59lws"; + aarch64-darwin = "0gr94l7lk54fhhhqbiv23hd7d25xilqlwla2dbs5c171nj9pz325"; + armv7l-linux = "0nxnjrzwfvma9zl4x11r45qwqq8mk91cxg47mg33qgr22lvbgz63"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.71.2"; + version = "1.72.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From eb0fda661d3965ded241ce9616b57cfd35a19903 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 12 Oct 2022 20:23:17 +0200 Subject: [PATCH 483/505] offpunk: 1.5 -> 1.6 --- pkgs/applications/networking/browsers/offpunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index cb11708fbee0..98a5b1cf50f8 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -31,14 +31,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "offpunk"; - version = "1.5"; + version = "1.6"; src = fetchFromGitea { domain = "notabug.org"; owner = "ploum"; repo = "offpunk"; rev = "v${finalAttrs.version}"; - sha256 = "1zg13wajsfrl3hli6sihn47db08w037jjq9vgr6m5sjh8r1jb9iy"; + sha256 = "1pfafb96xk7vis26zhfq254waz1ic9p0zdkxwpqs84p3vsmny775"; }; nativeBuildInputs = [ makeWrapper ]; From 7b30788245205f5e53543d6bfb315ea22b80b68e Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 13 Oct 2022 18:15:01 +0200 Subject: [PATCH 484/505] qemu: add patch improving 9p performance This patch has been accepted by the upstream 9p subsystem maintainer and should improve the performance of NixOS tests massively. --- .../9pfs-use-GHashTable-for-fid-table.patch | 371 ++++++++++++++++++ .../virtualization/qemu/default.nix | 1 + 2 files changed, 372 insertions(+) create mode 100644 pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch diff --git a/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch b/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch new file mode 100644 index 000000000000..2e6f1699637b --- /dev/null +++ b/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch @@ -0,0 +1,371 @@ +From 8ab70b8958a8f9cb9bd316eecd3ccbcf05c06614 Mon Sep 17 00:00:00 2001 +From: Linus Heckemann +Date: Tue, 4 Oct 2022 12:41:21 +0200 +Subject: [PATCH] 9pfs: use GHashTable for fid table +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The previous implementation would iterate over the fid table for +lookup operations, resulting in an operation with O(n) complexity on +the number of open files and poor cache locality -- for every open, +stat, read, write, etc operation. + +This change uses a hashtable for this instead, significantly improving +the performance of the 9p filesystem. The runtime of NixOS's simple +installer test, which copies ~122k files totalling ~1.8GiB from 9p, +decreased by a factor of about 10. + +Signed-off-by: Linus Heckemann +Reviewed-by: Philippe Mathieu-Daudé +Reviewed-by: Greg Kurz +[CS: - Retain BUG_ON(f->clunked) in get_fid(). + - Add TODO comment in clunk_fid(). ] +Message-Id: <20221004104121.713689-1-git@sphalerite.org> +[CS: - Drop unnecessary goto and out: label. ] +Signed-off-by: Christian Schoenebeck +--- + hw/9pfs/9p.c | 194 +++++++++++++++++++++++++++++---------------------- + hw/9pfs/9p.h | 2 +- + 2 files changed, 112 insertions(+), 84 deletions(-) + +diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c +index aebadeaa03..9bf13133e5 100644 +--- a/hw/9pfs/9p.c ++++ b/hw/9pfs/9p.c +@@ -256,7 +256,8 @@ static size_t v9fs_string_size(V9fsString *str) + } + + /* +- * returns 0 if fid got re-opened, 1 if not, < 0 on error */ ++ * returns 0 if fid got re-opened, 1 if not, < 0 on error ++ */ + static int coroutine_fn v9fs_reopen_fid(V9fsPDU *pdu, V9fsFidState *f) + { + int err = 1; +@@ -282,33 +283,32 @@ static V9fsFidState *coroutine_fn get_fid(V9fsPDU *pdu, int32_t fid) + V9fsFidState *f; + V9fsState *s = pdu->s; + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (f) { + BUG_ON(f->clunked); +- if (f->fid == fid) { +- /* +- * Update the fid ref upfront so that +- * we don't get reclaimed when we yield +- * in open later. +- */ +- f->ref++; +- /* +- * check whether we need to reopen the +- * file. We might have closed the fd +- * while trying to free up some file +- * descriptors. +- */ +- err = v9fs_reopen_fid(pdu, f); +- if (err < 0) { +- f->ref--; +- return NULL; +- } +- /* +- * Mark the fid as referenced so that the LRU +- * reclaim won't close the file descriptor +- */ +- f->flags |= FID_REFERENCED; +- return f; ++ /* ++ * Update the fid ref upfront so that ++ * we don't get reclaimed when we yield ++ * in open later. ++ */ ++ f->ref++; ++ /* ++ * check whether we need to reopen the ++ * file. We might have closed the fd ++ * while trying to free up some file ++ * descriptors. ++ */ ++ err = v9fs_reopen_fid(pdu, f); ++ if (err < 0) { ++ f->ref--; ++ return NULL; + } ++ /* ++ * Mark the fid as referenced so that the LRU ++ * reclaim won't close the file descriptor ++ */ ++ f->flags |= FID_REFERENCED; ++ return f; + } + return NULL; + } +@@ -317,12 +317,11 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) + { + V9fsFidState *f; + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (f) { + /* If fid is already there return NULL */ + BUG_ON(f->clunked); +- if (f->fid == fid) { +- return NULL; +- } ++ return NULL; + } + f = g_new0(V9fsFidState, 1); + f->fid = fid; +@@ -333,7 +332,7 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) + * reclaim won't close the file descriptor + */ + f->flags |= FID_REFERENCED; +- QSIMPLEQ_INSERT_TAIL(&s->fid_list, f, next); ++ g_hash_table_insert(s->fids, GINT_TO_POINTER(fid), f); + + v9fs_readdir_init(s->proto_version, &f->fs.dir); + v9fs_readdir_init(s->proto_version, &f->fs_reclaim.dir); +@@ -424,12 +423,12 @@ static V9fsFidState *clunk_fid(V9fsState *s, int32_t fid) + { + V9fsFidState *fidp; + +- QSIMPLEQ_FOREACH(fidp, &s->fid_list, next) { +- if (fidp->fid == fid) { +- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); +- fidp->clunked = true; +- return fidp; +- } ++ /* TODO: Use g_hash_table_steal_extended() instead? */ ++ fidp = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (fidp) { ++ g_hash_table_remove(s->fids, GINT_TO_POINTER(fid)); ++ fidp->clunked = true; ++ return fidp; + } + return NULL; + } +@@ -439,10 +438,15 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) + int reclaim_count = 0; + V9fsState *s = pdu->s; + V9fsFidState *f; ++ GHashTableIter iter; ++ gpointer fid; ++ ++ g_hash_table_iter_init(&iter, s->fids); ++ + QSLIST_HEAD(, V9fsFidState) reclaim_list = + QSLIST_HEAD_INITIALIZER(reclaim_list); + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &f)) { + /* + * Unlink fids cannot be reclaimed. Check + * for them and skip them. Also skip fids +@@ -514,72 +518,85 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) + } + } + ++/* ++ * This is used when a path is removed from the directory tree. Any ++ * fids that still reference it must not be closed from then on, since ++ * they cannot be reopened. ++ */ + static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path) + { +- int err; ++ int err = 0; + V9fsState *s = pdu->s; +- V9fsFidState *fidp, *fidp_next; ++ V9fsFidState *fidp; ++ gpointer fid; ++ GHashTableIter iter; ++ /* ++ * The most common case is probably that we have exactly one ++ * fid for the given path, so preallocate exactly one. ++ */ ++ g_autoptr(GArray) to_reopen = g_array_sized_new(FALSE, FALSE, ++ sizeof(V9fsFidState *), 1); ++ gint i; + +- fidp = QSIMPLEQ_FIRST(&s->fid_list); +- if (!fidp) { +- return 0; +- } ++ g_hash_table_iter_init(&iter, s->fids); + + /* +- * v9fs_reopen_fid() can yield : a reference on the fid must be held +- * to ensure its pointer remains valid and we can safely pass it to +- * QSIMPLEQ_NEXT(). The corresponding put_fid() can also yield so +- * we must keep a reference on the next fid as well. So the logic here +- * is to get a reference on a fid and only put it back during the next +- * iteration after we could get a reference on the next fid. Start with +- * the first one. ++ * We iterate over the fid table looking for the entries we need ++ * to reopen, and store them in to_reopen. This is because ++ * v9fs_reopen_fid() and put_fid() yield. This allows the fid table ++ * to be modified in the meantime, invalidating our iterator. + */ +- for (fidp->ref++; fidp; fidp = fidp_next) { ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &fidp)) { + if (fidp->path.size == path->size && + !memcmp(fidp->path.data, path->data, path->size)) { +- /* Mark the fid non reclaimable. */ +- fidp->flags |= FID_NON_RECLAIMABLE; +- +- /* reopen the file/dir if already closed */ +- err = v9fs_reopen_fid(pdu, fidp); +- if (err < 0) { +- put_fid(pdu, fidp); +- return err; +- } +- } +- +- fidp_next = QSIMPLEQ_NEXT(fidp, next); +- +- if (fidp_next) { + /* +- * Ensure the next fid survives a potential clunk request during +- * put_fid() below and v9fs_reopen_fid() in the next iteration. ++ * Ensure the fid survives a potential clunk request during ++ * v9fs_reopen_fid or put_fid. + */ +- fidp_next->ref++; ++ fidp->ref++; ++ fidp->flags |= FID_NON_RECLAIMABLE; ++ g_array_append_val(to_reopen, fidp); + } ++ } + +- /* We're done with this fid */ +- put_fid(pdu, fidp); ++ for (i = 0; i < to_reopen->len; i++) { ++ fidp = g_array_index(to_reopen, V9fsFidState*, i); ++ /* reopen the file/dir if already closed */ ++ err = v9fs_reopen_fid(pdu, fidp); ++ if (err < 0) { ++ break; ++ } + } + +- return 0; ++ for (i = 0; i < to_reopen->len; i++) { ++ put_fid(pdu, g_array_index(to_reopen, V9fsFidState*, i)); ++ } ++ return err; + } + + static void coroutine_fn virtfs_reset(V9fsPDU *pdu) + { + V9fsState *s = pdu->s; + V9fsFidState *fidp; ++ GList *freeing; ++ /* ++ * Get a list of all the values (fid states) in the table, which ++ * we then... ++ */ ++ g_autoptr(GList) fids = g_hash_table_get_values(s->fids); + +- /* Free all fids */ +- while (!QSIMPLEQ_EMPTY(&s->fid_list)) { +- /* Get fid */ +- fidp = QSIMPLEQ_FIRST(&s->fid_list); +- fidp->ref++; ++ /* ... remove from the table, taking over ownership. */ ++ g_hash_table_steal_all(s->fids); + +- /* Clunk fid */ +- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); ++ /* ++ * This allows us to release our references to them asynchronously without ++ * iterating over the hash table and risking iterator invalidation ++ * through concurrent modifications. ++ */ ++ for (freeing = fids; freeing; freeing = freeing->next) { ++ fidp = freeing->data; ++ fidp->ref++; + fidp->clunked = true; +- + put_fid(pdu, fidp); + } + } +@@ -3205,6 +3222,8 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, + V9fsFidState *tfidp; + V9fsState *s = pdu->s; + V9fsFidState *dirfidp = NULL; ++ GHashTableIter iter; ++ gpointer fid; + + v9fs_path_init(&new_path); + if (newdirfid != -1) { +@@ -3238,11 +3257,13 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, + if (err < 0) { + goto out; + } ++ + /* + * Fixup fid's pointing to the old name to + * start pointing to the new name + */ +- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { ++ g_hash_table_iter_init(&iter, s->fids); ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { + if (v9fs_path_is_ancestor(&fidp->path, &tfidp->path)) { + /* replace the name */ + v9fs_fix_path(&tfidp->path, &new_path, strlen(fidp->path.data)); +@@ -3320,6 +3341,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, + V9fsPath oldpath, newpath; + V9fsState *s = pdu->s; + int err; ++ GHashTableIter iter; ++ gpointer fid; + + v9fs_path_init(&oldpath); + v9fs_path_init(&newpath); +@@ -3336,7 +3359,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, + * Fixup fid's pointing to the old name to + * start pointing to the new name + */ +- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { ++ g_hash_table_iter_init(&iter, s->fids); ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { + if (v9fs_path_is_ancestor(&oldpath, &tfidp->path)) { + /* replace the name */ + v9fs_fix_path(&tfidp->path, &newpath, strlen(oldpath.data)); +@@ -4226,7 +4250,7 @@ int v9fs_device_realize_common(V9fsState *s, const V9fsTransport *t, + s->ctx.fmode = fse->fmode; + s->ctx.dmode = fse->dmode; + +- QSIMPLEQ_INIT(&s->fid_list); ++ s->fids = g_hash_table_new(NULL, NULL); + qemu_co_rwlock_init(&s->rename_lock); + + if (s->ops->init(&s->ctx, errp) < 0) { +@@ -4286,6 +4310,10 @@ void v9fs_device_unrealize_common(V9fsState *s) + if (s->ctx.fst) { + fsdev_throttle_cleanup(s->ctx.fst); + } ++ if (s->fids) { ++ g_hash_table_destroy(s->fids); ++ s->fids = NULL; ++ } + g_free(s->tag); + qp_table_destroy(&s->qpd_table); + qp_table_destroy(&s->qpp_table); +diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h +index 994f952600..10fd2076c2 100644 +--- a/hw/9pfs/9p.h ++++ b/hw/9pfs/9p.h +@@ -339,7 +339,7 @@ typedef struct { + struct V9fsState { + QLIST_HEAD(, V9fsPDU) free_list; + QLIST_HEAD(, V9fsPDU) active_list; +- QSIMPLEQ_HEAD(, V9fsFidState) fid_list; ++ GHashTable *fids; + FileOperations *ops; + FsContext ctx; + char *tag; +-- +2.36.2 + diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4f55b48bc540..5873c24f15a2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -111,6 +111,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) + ./9pfs-use-GHashTable-for-fid-table.patch ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; From 989e8d85685e3a1d3d3aee1b74f3651c130bbd56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Oct 2022 18:21:29 +0200 Subject: [PATCH 485/505] nss: 3.83 -> 3.84 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/uV-FYp6SUr8/m/M5TvBj0eAQAJ --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 825694aad889..09eaa64e600a 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.83"; - hash = "sha256-qyPqZ/lkCQuLc8gKZ0CCVxw25fTrqSBXrGSMnB3vASg="; + version = "3.84"; + hash = "sha256-mjh//jUP8U8AHZQ/lswMBkiRVR1x4al6Xdv/5/EgeiU="; } From 1383ef43760e29c2f84f4d69c3916dbe1bd4e717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 17:08:36 +0000 Subject: [PATCH 486/505] linuxkit: 0.8 -> 1.0.0 --- pkgs/development/tools/misc/linuxkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index da608ba5a061..94ae7f527125 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "linuxkit"; - version = "0.8"; + version = "1.0.0"; goPackagePath = "github.com/linuxkit/linuxkit"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "15jj60k8wz9cahjbdscnwyyfb1k1grjh7yrilb1cj4r8mby4sp2g"; + sha256 = "sha256-y/jsMr7HmrHjVMn4fyQ3MPHION8hQO2G4udX1AMx8bk="; }; subPackages = [ "src/cmd/linuxkit" ]; From 7d44e664ca57801509881a165e8b7ac2ce0c2c23 Mon Sep 17 00:00:00 2001 From: Jules Lamur Date: Wed, 5 Oct 2022 12:18:40 +0200 Subject: [PATCH 487/505] widevine-cdm: init at 4.10.2449.0 --- maintainers/maintainer-list.nix | 9 +++++++ .../networking/browsers/misc/widevine-cdm.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/applications/networking/browsers/misc/widevine-cdm.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6019bf4d7117..3e5cefc356cd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6397,6 +6397,15 @@ githubId = 1204734; name = "Emil Karlson"; }; + jlamur = { + email = "contact@juleslamur.fr"; + github = "jlamur"; + githubId = 7054317; + name = "Jules Lamur"; + keys = [{ + fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762"; + }]; + }; jlesquembre = { email = "jl@lafuente.me"; github = "jlesquembre"; diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix new file mode 100644 index 000000000000..41021cfdaa7c --- /dev/null +++ b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchzip +}: + +stdenv.mkDerivation rec { + pname = "widevine-cdm"; + version = "4.10.2449.0"; + + src = fetchzip { + url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; + sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE="; + stripRoot = false; + }; + + installPhase = '' + install -vD libwidevinecdm.so $out/libwidevinecdm.so + ''; + + meta = with lib; { + description = "Widevine CDM"; + homepage = "https://www.widevine.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ jlamur ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55321d2458e8..cb963aee7d16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37651,4 +37651,6 @@ with pkgs; swaysettings = callPackage ../applications/misc/swaysettings { }; aitrack = libsForQt5.callPackage ../applications/misc/aitrack { }; + + widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { }; } From ae83ba7b41afb0b193926d6795981c91602d114a Mon Sep 17 00:00:00 2001 From: Jules Lamur Date: Tue, 4 Oct 2022 19:03:11 +0200 Subject: [PATCH 488/505] qutebrowser: enable support for widevine-cdm --- .../applications/networking/browsers/qutebrowser/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 27dd55fc787f..4f10e76d0e4f 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -12,6 +12,8 @@ , qtbase ? null , qtwebengine ? null , wrapGAppsHook ? null +, enableWideVine ? false +, widevine-cdm }: let isQt6 = mkDerivationWith == null; @@ -149,6 +151,7 @@ buildPythonApplication { --add-flags '--backend ${backend}' --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" ${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/libwidevinecdm.so"''} ) ''; @@ -157,6 +160,6 @@ buildPythonApplication { description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ]; - inherit (backendPackage.meta) platforms; + platforms = if enableWideVine then [ "x86_64-linux" ] else backendPackage.meta.platforms; }; } From b0171888fbf267342b59f79e03659ae315311f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 13 Oct 2022 20:26:46 +0200 Subject: [PATCH 489/505] perlPackages.perlldap: 0.66 -> 0.68 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 538488115928..6a1821896662 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19411,10 +19411,10 @@ let perlldap = buildPerlPackage { pname = "perl-ldap"; - version = "0.66"; + version = "0.68"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.66.tar.gz"; - hash = "sha256-CSY85hZugMmNaJ1B0JmVuBM4n9Bpt4RgH23Ff44rQQI="; + url = "mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.68.tar.gz"; + hash = "sha256-4vOJ/j56nkthSIaSkZrXI7mPO0ebUoj2ENqownmVs1E="; }; # ldapi socket location should match the one compiled into the openldap package postPatch = '' From 5353c753884c20cc007f62eb477e567621fd32ba Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Oct 2022 04:45:41 +0200 Subject: [PATCH 490/505] qemu: add vmnet support --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 5873c24f15a2..410c3bf2d9e2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -3,7 +3,7 @@ , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat -, CoreServices, Cocoa, Hypervisor, rez, setfile +, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet , guestAgentSupport ? with stdenv.hostPlatform; isLinux || isSunOS || isWindows , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { gnutls nettle curl ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile vmnet ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55321d2458e8..fd300e1e66cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31057,7 +31057,7 @@ with pkgs; qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {}; qemu = callPackage ../applications/virtualization/qemu { - inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor; + inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor vmnet; inherit (darwin.stubs) rez setfile; inherit (darwin) sigtool; }; From f4c6286284caed47d8d18bdf3102674a14120070 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 13 Oct 2022 21:14:04 +0200 Subject: [PATCH 491/505] doc/stdenv: Improve language a bit --- doc/stdenv/stdenv.chapter.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 12213d7ca5de..c19d25683295 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1122,7 +1122,7 @@ these in the [Hooks Reference](#chap-hooks). ### Bintools Wrapper {#bintools-wrapper} -The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. +The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targeting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. The Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. For example, it shouldn’t care about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. It is currently accomplished by collecting directories of host-platform dependencies (i.e. `buildInputs` and `nativeBuildInputs`) in environment variables. The Bintools Wrapper’s setup hook causes any `lib` and `lib64` subdirectories to be added to `NIX_LDFLAGS`. Since the CC Wrapper and the Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to the CC Wrapper. But the CC Wrapper’s code, by contrast, has quite lengthy comments. The Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync. @@ -1134,7 +1134,7 @@ A problem with this final task is that the Bintools Wrapper is honest and define The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper. -Dependency finding is undoubtedly the main task of the CC Wrapper. This works just like the Bintools Wrapper, except that any `include` subdirectory of any relevant dependency is added to `NIX_CFLAGS_COMPILE`. The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. +Dependency finding is undoubtedly the main task of the CC Wrapper. This works just like the Bintools Wrapper, except that any `include` subdirectory of any relevant dependency is added to `NIX_CFLAGS_COMPILE`. The setup hook itself contains elaborate comments describing the exact mechanism by which this is accomplished. Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard environment variables with the names of the tools it wraps, for the same reasons described above. Importantly, while it includes a `cc` symlink to the c compiler for portability, the `CC` will be defined using the compiler’s “real name” (i.e. `gcc` or `clang`). This helps lousy build systems that inspect on the name of the compiler rather than run it. From 53088569de3a7b06b06f6ef2bd40cf0daa8272d2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 13 Oct 2022 21:14:21 +0200 Subject: [PATCH 492/505] doc/stdenv: Clarify that the wrappers come with hooks --- doc/stdenv/stdenv.chapter.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index c19d25683295..8059fca5e5a7 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1120,7 +1120,7 @@ This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file. Many other packages provide hooks, that are not part of `stdenv`. You can find these in the [Hooks Reference](#chap-hooks). -### Bintools Wrapper {#bintools-wrapper} +### Bintools Wrapper and hook {#bintools-wrapper} The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targeting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. @@ -1130,7 +1130,7 @@ A final task of the setup hook is defining a number of standard environment vari A problem with this final task is that the Bintools Wrapper is honest and defines `LD` as `ld`. Most packages, however, firstly use the C compiler for linking, secondly use `LD` anyways, defining it as the C compiler, and thirdly, only so define `LD` when it is undefined as a fallback. This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won’t override yet doesn’t want to use. The workaround is to define, just for the problematic package, `LD` as the C compiler. A good way to do this would be `preConfigure = "LD=$CC"`. -### CC Wrapper {#cc-wrapper} +### CC Wrapper and hook {#cc-wrapper} The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper. From c1311d12237247e01b092e020563f34cfac8aa86 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 13 Oct 2022 21:14:53 +0200 Subject: [PATCH 493/505] doc/stdenv: Move Other hooks after all hooks --- doc/stdenv/stdenv.chapter.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 8059fca5e5a7..166587d3284c 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1115,11 +1115,6 @@ This hook only runs when compiling for Linux. This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file. -### Other hooks - -Many other packages provide hooks, that are not part of `stdenv`. You can find -these in the [Hooks Reference](#chap-hooks). - ### Bintools Wrapper and hook {#bintools-wrapper} The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targeting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. @@ -1140,6 +1135,11 @@ Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard envi Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses. +### Other hooks + +Many other packages provide hooks, that are not part of `stdenv`. You can find +these in the [Hooks Reference](#chap-hooks). + ## Purity in Nixpkgs {#sec-purity-in-nixpkgs} *Measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them.* From 272da6f68adb194362e2715ccd055f6b89a05b92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 19:51:44 +0000 Subject: [PATCH 494/505] oh-my-posh: 12.1.0 -> 12.2.0 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 832cfb102231..72d501935be0 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.1.0"; + version = "12.2.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kVhdOx4+S0GLYcOIYMN9yzvDDL+/8oke69wqYJ/s5+Q="; + sha256 = "sha256-zWoM9STdyJbgNqX5FQ70T+0dbENW7aOjHV+BShAHi8I="; }; vendorSha256 = "sha256-zL5tkBkZa2Twc2FNNNUIycd/QvkpR1XEntpJ0j4z/xo="; From 5b8ac1bbdc94f2b3909e27f4bd1e20465e436f25 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 7 Oct 2022 09:37:29 +0200 Subject: [PATCH 495/505] coqPackages.relation-algebra: init at 1.7.8 for Coq 8.16 --- pkgs/development/coq-modules/relation-algebra/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/relation-algebra/default.nix b/pkgs/development/coq-modules/relation-algebra/default.nix index 204be2931a50..d2124d56f3f5 100644 --- a/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/pkgs/development/coq-modules/relation-algebra/default.nix @@ -10,6 +10,7 @@ mkCoqDerivation { then "v.${v}" else "v${v}"; + release."1.7.8".sha256 = "sha256-RITFd3G5TjY+rFzW073Ao1AGU+u6OGQyQeGHVodAXnA="; release."1.7.7".sha256 = "sha256:1dff3id6nypl2alhk9rcifj3dab0j78dym05blc525lawsmc26l2"; release."1.7.6".sha256 = "sha256:02gsj06zcy9zgd0h1ibqspwfiwm36pkkgg9cz37k4bxzcapxcr6w"; release."1.7.5".sha256 = "sha256-XdO8agoJmNXPv8Ho+KTlLCB4oRlQsb0w06aM9M16ZBU="; @@ -20,6 +21,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = isEq "8.16"; out = "1.7.8"; } { case = isEq "8.15"; out = "1.7.7"; } { case = isEq "8.14"; out = "1.7.6"; } { case = isEq "8.13"; out = "1.7.5"; } From 19f91b13e52b47ccf5c9c53c62d0dd9fb7e2b98c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 20:06:38 +0000 Subject: [PATCH 496/505] opentelemetry-collector: 0.61.0 -> 0.62.0 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 5e8a08b71013..4fcc1d1a6a5e 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.61.0"; + version = "0.62.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-NwkQDqacH1vZNkHy3OzvR1wmwxO2dAPXa/OkiNMcrjs="; + sha256 = "sha256-0algZcP8KfqLsAoKkDuYdlq+tMG0K3bb0G/z0lqM+iE="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-AFizQKKIMveCI9OiJ6wPxsNwDVn9XEWuPzyIqQSXbd4="; + vendorSha256 = "sha256-G+xbkPeD0F32Zngp/u3gALBR1tJ/moNzTZ6vCBTyUoY="; preBuild = '' # set the build version, can't be done via ldflags From 3187ac92bbb85b72c7529b3d99e593706cb11d9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 20:26:25 +0000 Subject: [PATCH 497/505] opentelemetry-collector-contrib: 0.61.0 -> 0.62.0 --- pkgs/tools/misc/opentelemetry-collector/contrib.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 83585f41149e..f60ba249e87e 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.61.0"; + version = "0.62.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-xJCxMWAp5qg00kUWssVyy+uLpDQ/CZjO4TXXoDosXxA="; + sha256 = "sha256-pNpCh2oe8hptXlDJsrfJOae8s6K4101lUFXFpXMdEmY="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-aEhNq/e3erW2e5tHMtoePiVFpIY6Mb25k+SVRhIWTr0="; + vendorSha256 = "sha256-sNJOPHGyppdoqYeiBL9LdC5UWHw50CWWp3FS9JlIM+4="; subPackages = [ "cmd/otelcontribcol" ]; From e31262c3eef88eee80d950f0fd604f4ecaa634bb Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 13 Oct 2022 21:41:13 +0200 Subject: [PATCH 498/505] at-spi2-core: make introspection unconditional We don't need to make it conditional anymore, this added line broke the gtk3 build. With this the (cross) gtk3 build is working again. --- pkgs/development/libraries/at-spi2-core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 766877645869..3a2f446cf84f 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = false; mesonFlags = [ - "-Dintrospection=${if stdenv.buildPlatform == stdenv.hostPlatform then "yes" else "no"}" + "-Dintrospection=yes" # 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 From 0e7bc616d1735016fb90fed03336dca1220dc624 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 21:37:21 +0000 Subject: [PATCH 499/505] python310Packages.ansible-later: 2.0.21 -> 2.0.22 --- pkgs/development/python-modules/ansible-later/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 9c4cfcc93a38..964a00841291 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.21"; + version = "2.0.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WObnE5/xOtbX0c3VjVQbec2TDSDKoUe68GFax7dt7WY="; + hash = "sha256-RFyQvg7CF5Fa+DnOo0PoDtGPJMOx0Md8I+gshMH2Fvs="; }; postPatch = '' From 9711a52b3d1b41ddf11282fa5cd4ba15a5352d05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 21:37:22 +0000 Subject: [PATCH 500/505] python310Packages.ansible-lint: 6.8.1 -> 6.8.2 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 46522ea9d6a9..a2f58dba048c 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.8.1"; + version = "6.8.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-E/ci0+AyOwzjoQc1jA4eIWnbWpO2j/zyDhAwu6Fv1w0="; + sha256 = "sha256-F9+ssNkTmkNczyCVI04gSR1Vb3rbl97diRtAVm4xZVM="; }; postPatch = '' From 648fa5e8f79fb8832529a1f57d46579d918ff9db Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 12 Oct 2022 13:56:18 -0700 Subject: [PATCH 501/505] nodejs-16_x-openssl_1_1: Use openssl 1.1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ae4bd698fd0..8bf589bfa543 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8622,7 +8622,9 @@ with pkgs; nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { }; + nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { + openssl = openssl_1_1; + }; nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; From 11fc4b7005b843e6a10d32060c919f96ec1ba86f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 21:38:21 +0000 Subject: [PATCH 502/505] python310Packages.ansible: 6.3.0 -> 6.5.0 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index f90085431718..bd435fc617e6 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.3.0"; + version = "6.5.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-1fqfwVqNRcjVJHqWRbC0j5ldc1sSxNplVmbUhQYnNSY="; + sha256 = "sha256-fAzc0RIaXxKrLaS90uFMLBU+ASFL/GprwVa2G9dAHFs="; }; postPatch = '' From c4b5c2574b6877d84a7bf5c2e57c85fc6cdd41bb Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 1 Apr 2022 04:27:53 +0200 Subject: [PATCH 503/505] lua: test the interpreter Test with: nix-build -A lua.tests pass Tests are very limited for now, goal is mostly to put the infra into place and enrich the tests when dealing with lua issues. add luaPath/luaCpath as passthrough makes it easier to generate LUA_PATH/LUA_CPATH --- .../interpreters/lua-5/default.nix | 2 + .../interpreters/lua-5/tests/assert.sh | 16 ++++++ .../interpreters/lua-5/tests/default.nix | 50 +++++++++++++++++++ .../interpreters/lua-5/wrapper.nix | 2 + 4 files changed, 70 insertions(+) create mode 100644 pkgs/development/interpreters/lua-5/tests/assert.sh create mode 100644 pkgs/development/interpreters/lua-5/tests/default.nix diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index d236252e5bc7..478c5bdb34db 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -69,6 +69,8 @@ let inherit executable luaversion sourceVersion; luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; }; + tests = callPackage ./tests { inherit (luaPackages) wrapLua; }; + inherit luaAttr; }; diff --git a/pkgs/development/interpreters/lua-5/tests/assert.sh b/pkgs/development/interpreters/lua-5/tests/assert.sh new file mode 100644 index 000000000000..fe5582a0b062 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/tests/assert.sh @@ -0,0 +1,16 @@ +# Always failing assertion with a message. +# +# Example: +# fail "It should have been but it wasn't to be" +function fail() { + echo "$1" + exit 1 +} + + +function assertStringEqual { + + if ! diff <(echo "$1") <(echo "$2") ; then + fail "Strings differ" + fi +} diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix new file mode 100644 index 000000000000..38479af5f207 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -0,0 +1,50 @@ +{ lua +, hello +, wrapLua +, lib, fetchFromGitHub +, fetchFromGitLab +, pkgs +}: +let + + runTest = lua: { name, command }: + pkgs.runCommandLocal "test-${lua.name}" ({ + nativeBuildInputs = [lua]; + meta.platforms = lua.meta.platforms; + }) ('' + source ${./assert.sh} + '' + + command + + "touch $out" + ); + + wrappedHello = hello.overrideAttrs(oa: { + propagatedBuildInputs = [ + wrapLua + lua.pkgs.cjson + ]; + postFixup = '' + wrapLuaPrograms + ''; + }); +in + pkgs.recurseIntoAttrs ({ + + checkAliases = runTest lua { + name = "check-aliases"; + command = '' + generated=$(lua -e 'print(package.path)') + golden_LUA_PATH='./share/lua/${lua.luaversion}/?.lua;./?.lua;./?/init.lua' + + assertStringEqual "$generated" "$golden_LUA_PATH" + ''; + }; + + checkWrapping = pkgs.runCommandLocal "test-${lua.name}" ({ + }) ('' + grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello + touch $out + ''); + +}) + diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index b9ac255d2432..9431522b71e5 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -60,6 +60,8 @@ let passthru = lua.passthru // { interpreter = "${env}/bin/lua"; inherit lua; + luaPath = lua.pkgs.lib.genLuaPathAbsStr env; + luaCpath = lua.pkgs.lib.genLuaCPathAbsStr env; env = stdenv.mkDerivation { name = "interactive-${lua.name}-environment"; nativeBuildInputs = [ env ]; From 9b71b34f53ebc95845cf2144a18a20d624952db2 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Fri, 14 Oct 2022 00:15:02 +0200 Subject: [PATCH 504/505] salt: 3005 -> 3005.1 --- pkgs/tools/admin/salt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 9d636d0bae61..bed3e93b3101 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -9,16 +9,17 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3005"; + version = "3005.1"; src = python3.pkgs.fetchPypi { inherit pname version; - hash = "sha256-HSAMRbiARheOpW+1p1cm3GIMxeUUEQdqBN+A/1L3nNQ="; + hash = "sha256-+hTF2HP4Y7UJUBIdfiOiRJUCdFSQx8SMDPBFQGz+V8E="; }; propagatedBuildInputs = with python3.pkgs; [ distro jinja2 + jmespath markupsafe msgpack psutil From ae24d583aefba3220fe20f92adcf7b39bdacb5bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 06:45:45 +0000 Subject: [PATCH 505/505] vscodium: 1.71.2.22258 -> 1.72.1.22284 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 49c5cf000440..ea081382b51a 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ajls31iqvrcnydwdn2fhajz76j60vsqhn343237jgwfbvaklvav"; - x86_64-darwin = "100p494k1gfzhd86nj9hvh0w73i4wjn2vy6jdpb66rrmswy2hr40"; - aarch64-linux = "066g825s79hmwl5yl7yl0yf6vzr3nagb44bcqw1zp1iqv54f40c6"; - aarch64-darwin = "02aln53zcjp689ivq3ypid2gk9pwbqs24n1ay0hibvrpkx3v4y8k"; - armv7l-linux = "1qvz1233k31baw09p45x67cfadsgm1jnnfc4r8yvrh75iplcspgl"; + x86_64-linux = "01b6w97miai191b2d1lr7cwv36vjvwv1hjggr0g9gfr5j99yzdw3"; + x86_64-darwin = "1vf6sdm19r1d6a6ljz3jlvqddgyrdqcxpha4x80ar3kwddy254kb"; + aarch64-linux = "1i48lck395i6lzcxwzfhijs5d141wnxbxg5rzgprm2hgkqx836nr"; + aarch64-darwin = "02xvb41i8ri8l9w8cxxviz63mkskkmxn6rwprpbglpbpxncsxgbn"; + armv7l-linux = "0s0zlql652fwfz94bqmnrl77agd8gf6i5w1y09jpvcc33wv0zlgw"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.71.2.22258"; + version = "1.72.1.22284"; pname = "vscodium"; executableName = "codium";