From cd78ec13ab828d0cda1e533e035c2d0948a9eaa4 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sun, 2 Jan 2022 00:55:27 +0100 Subject: [PATCH 01/59] nixos/lightdm: changed minimum-uid to 1000 This is done to reflect changes in 0e23a175de3687df8232fe118cbe87f04228ff28 --- nixos/modules/services/x11/display-managers/lightdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 84b75c83aeab..c0b5e3ff13da 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -32,7 +32,7 @@ let usersConf = writeText "users.conf" '' [UserList] - minimum-uid=500 + minimum-uid=1000 hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} hidden-shells=/run/current-system/sw/bin/nologin ''; From db74bf537556218e7fe48c03729b6ab9bff26b6c Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sun, 2 Jan 2022 00:57:13 +0100 Subject: [PATCH 02/59] nixos/users: isSystemUser below 1000 above 400 To reflect changes done in 23d920c8f0d8d790fc69e155acbe9342853cc46a --- nixos/modules/config/users-groups.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index a34d28143418..19efad4b9ce6 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -96,7 +96,7 @@ let only has an effect if is , in which case it determines whether the user's UID is allocated in the range for system users - (below 500) or in the range for normal users (starting at + (below 1000) or in the range for normal users (starting at 1000). Exactly one of isNormalUser and isSystemUser must be true. @@ -635,7 +635,7 @@ in { { assertion = let xor = a: b: a && !b || b && !a; - isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 500); + isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 1000); in xor isEffectivelySystemUser user.isNormalUser; message = '' Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set. From 387e803f3071c0ef35d919a85f8574dd11eb3d09 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 29 Dec 2022 11:21:17 +0100 Subject: [PATCH 03/59] yewtube: init at 2.9.0 --- pkgs/applications/misc/yewtube/default.nix | 48 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/misc/yewtube/default.nix diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix new file mode 100644 index 000000000000..f217c7b0e9a5 --- /dev/null +++ b/pkgs/applications/misc/yewtube/default.nix @@ -0,0 +1,48 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "yewtube"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "iamtalhaasghar"; + repo = "yewtube"; + rev = "v${version}"; + hash = "sha256-8GL2ZvRHtnnLZ07nQk3irJUj+XLL+pyUUA+JJPICPRA="; + }; + + postPatch = '' + # Don't try to detect the version at runtime with pip + substituteInPlace mps_youtube/__init__.py \ + --replace "from pip._vendor import pkg_resources" "" \ + --replace "__version__ =" "__version__ = '${version}' #" + # https://github.com/iamtalhaasghar/yewtube/pull/105 + sed -ie '/pyreadline/d' requirements.txt + ''; + + propagatedBuildInputs = with python3Packages; [ + pyperclip + requests + youtube-search-python + yt-dlp + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + dbus-python + pygobject3 + ]; + + preCheck = '' + export XDG_CONFIG_HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "mps_youtube" ]; + + meta = with lib; { + description = "Terminal based YouTube player and downloader, forked from mps-youtube"; + homepage = "https://github.com/iamtalhaasghar/yewtube"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz koral ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61a8fa4bc024..90ebe7d81cd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33880,6 +33880,8 @@ with pkgs; yelp-tools = callPackage ../development/misc/yelp-tools { }; + yewtube = callPackage ../applications/misc/yewtube { }; + yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; yoshimi = callPackage ../applications/audio/yoshimi { }; From e6f7cba33a64a89c76416041d2a614da40b33d93 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 29 Dec 2022 11:27:18 +0100 Subject: [PATCH 04/59] mps-youtube: remove in favor of yewtube --- .../applications/misc/mps-youtube/default.nix | 34 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/applications/misc/mps-youtube/default.nix diff --git a/pkgs/applications/misc/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix deleted file mode 100644 index b1118cfc5977..000000000000 --- a/pkgs/applications/misc/mps-youtube/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -with python3Packages; - -buildPythonApplication rec { - pname = "mps-youtube"; - version = "unstable-2020-01-28"; - - src = fetchFromGitHub { - owner = "mps-youtube"; - repo = "mps-youtube"; - rev = "b808697133ec2ad7654953232d1e841b20aa7cc3"; - sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; - }; - - propagatedBuildInputs = [ pafy ]; - - # disabled due to error in loading unittest - # don't know how to make test from: - doCheck = false; - - # before check create a directory and redirect XDG_CONFIG_HOME to it - preCheck = '' - mkdir -p check-phase - export XDG_CONFIG_HOME=$(pwd)/check-phase - ''; - - meta = with lib; { - description = "Terminal based YouTube player and downloader"; - homepage = "https://github.com/mps-youtube/mps-youtube"; - license = licenses.gpl3; - maintainers = with maintainers; [ koral odi ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ef36289e05c1..a9974b93964b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -976,6 +976,7 @@ mapAliases ({ mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 + mps-youtube = throw "'mps-youtube' has been removed as it's unmaintained and stopped working. Use 'yewtube', a maintained fork"; # Added 2022-12-29 mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 multimc = throw "multimc was removed from nixpkgs; use prismlauncher instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90ebe7d81cd5..e8e487d98fed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31089,8 +31089,6 @@ with pkgs; mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; - mps-youtube = callPackage ../applications/misc/mps-youtube { }; - mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); From 703b1c17a5f5777a93e4230d2b41fd66b6a57ad7 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 29 Dec 2022 11:36:39 +0100 Subject: [PATCH 05/59] python3Packages.pafy: remove All its reverse dependencies were removed --- .../python-modules/pafy/default.nix | 23 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/development/python-modules/pafy/default.nix diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix deleted file mode 100644 index c657a2fa1b12..000000000000 --- a/pkgs/development/python-modules/pafy/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, youtube-dl, fetchPypi }: -buildPythonPackage rec { - pname = "pafy"; - version = "0.5.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "364f1d1312c89582d97dc7225cf6858cde27cb11dfd64a9c2bab1a2f32133b1e"; - }; - - # No tests included in archive - doCheck = false; - - propagatedBuildInputs = [ youtube-dl ]; - - meta = with lib; { - description = "A library to download YouTube content and retrieve metadata"; - homepage = "https://github.com/mps-youtube/pafy"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ odi ]; - }; -} - diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 84b81abbd981..930a73733ccd 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -129,6 +129,7 @@ mapAliases ({ nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 + pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4b340a42ba5..5e163e6bcd46 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6738,8 +6738,6 @@ self: super: with self; { packvers = callPackage ../development/python-modules/packvers { }; - pafy = callPackage ../development/python-modules/pafy { }; - pagelabels = callPackage ../development/python-modules/pagelabels { }; paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; From 596d123cbb148271b0bbf85c6f48ceaf1f77a21f Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Sun, 27 Nov 2022 22:03:17 +0000 Subject: [PATCH 06/59] pianoteq: fix fetchers --- pkgs/applications/audio/pianoteq/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 308d5b65f3e5..0cb5dea39b7f 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -93,14 +93,11 @@ let fetchWithCurlScript { inherit name sha256; script = '' - "''${curl[@]}" --silent --request POST \ + "''${curl[@]}" --silent --request GET \ --cookie cookies \ - --header "modartt-json: request" \ - --header "origin: https://www.modartt.com" \ - --header "content-type: application/json; charset=UTF-8" \ - --header "accept: application/json, text/javascript, */*" \ - --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download -o /dev/null + --header "accept: */*" \ + https://www.modartt.com/ -o /dev/null + json=$( "''${curl[@]}" --silent --request POST \ --cookie cookies \ @@ -109,8 +106,9 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; @@ -140,7 +138,7 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data @login.json \ - https://www.modartt.com/json/session + https://www.modartt.com/api/0/session json=$( "''${curl[@]}" --silent --request POST \ @@ -150,10 +148,10 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) - url=$(echo $json | ${jq}/bin/jq -r .url) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; }; From f867378f0872ebade7ac067e5fe5acae0e38424e Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Sun, 27 Nov 2022 22:03:41 +0000 Subject: [PATCH 07/59] pianoteq.{stage-trial,standard-trial}: 7.5.4 -> 8.0.5 --- pkgs/applications/audio/pianoteq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 0cb5dea39b7f..55ab6261aa9e 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -160,20 +160,20 @@ in { # TODO currently can't install more than one because `lame` clashes stage-trial = mkPianoteq rec { name = "stage-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc="; + sha256 = "sha256-9Lo4e1SM1gw2/+TmpDUdZCOQcHEpT/aaG6P80/GRPQY="; }; }; standard-trial = mkPianoteq rec { name = "standard-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ="; + sha256 = "sha256-qxViVIbld8zTMj1+TIfOsIOhmujOGJux2/u2J4hvsqw="; }; }; stage-6 = mkPianoteq rec { From 146f9c8de6e8c00f450cc0c01bb216c77a60720d Mon Sep 17 00:00:00 2001 From: Guangqing Chen Date: Wed, 25 Jan 2023 17:35:47 +0800 Subject: [PATCH 08/59] globalprotect-openconnect: 1.4.8 -> 1.4.9 --- .../globalprotect-openconnect/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index 6558d72ecd93..0d2fd4fac042 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -1,22 +1,19 @@ { stdenv, lib, fetchFromGitHub -, cmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect +, cmake, qtwebsockets, qtwebengine, qtkeychain, wrapQtAppsHook, openconnect }: stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; - version = "1.4.8"; + version = "1.4.9"; - src = fetchFromGitHub { - owner = "yuezk"; - repo = "GlobalProtect-openconnect"; - fetchSubmodules = true; - rev = "v${version}"; - sha256 = "sha256-PQAlGeHVayImKalCNv2SwPcxD0ts4BVSqeo1hKYmnMA="; + src = builtins.fetchTarball { + url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; + sha256 = "0b7s3gf0gznlpmf9dxfq77254zlxmpajhzzn3scrdrvf413sjl0f"; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ openconnect qtwebsockets qtwebengine ]; + buildInputs = [ openconnect qtwebsockets qtwebengine qtkeychain ]; patchPhase = '' substituteInPlace GPService/gpservice.h \ From 0e31d244c414fae6fdb3edca8ebc4cb2d15e3475 Mon Sep 17 00:00:00 2001 From: Guangqing Chen Date: Wed, 25 Jan 2023 20:14:10 +0800 Subject: [PATCH 09/59] use fetchurl instead Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/tools/networking/globalprotect-openconnect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index 0d2fd4fac042..d93413668dc4 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; version = "1.4.9"; - src = builtins.fetchTarball { + src = fetchurl { url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; sha256 = "0b7s3gf0gznlpmf9dxfq77254zlxmpajhzzn3scrdrvf413sjl0f"; }; From 464e87c40d8acfa9fa51199a42c1888d887e51c1 Mon Sep 17 00:00:00 2001 From: Guangqing Chen Date: Wed, 25 Jan 2023 20:14:10 +0800 Subject: [PATCH 10/59] address comments Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/tools/networking/globalprotect-openconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index d93413668dc4..5b00de2fda85 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchurl , cmake, qtwebsockets, qtwebengine, qtkeychain, wrapQtAppsHook, openconnect }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; - sha256 = "0b7s3gf0gznlpmf9dxfq77254zlxmpajhzzn3scrdrvf413sjl0f"; + hash = "sha256-vhvVKESLbqHx3XumxbIWOXIreDkW3yONDMXMHxhjsvk="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; From 550f0267a882981867b36e6933f6a369cebf7456 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 11/59] docker-slim: 1.39.0 -> 1.40.0 https://github.com/slimtoolkit/slim/releases/tag/1.40.0 --- .../virtualization/docker-slim/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index c116a581103b..bbefed66fae3 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,21 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper }: buildGoModule rec { pname = "docker-slim"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { - owner = "docker-slim"; - repo = "docker-slim"; + owner = "slimtoolkit"; + repo = "slim"; rev = version; - sha256 = "sha256-CN3mvXjI6c10yvXM2owWASngsU2PjgLhd1N55vxubw0="; + sha256 = "sha256-KbwkZIGkAdzPPo5CrWKnKzFsD8OUONk6JWo1wzwti3s="; }; vendorSha256 = null; - subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; + subPackages = [ "cmd/slim" "cmd/slim-sensor" ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; ldflags = [ "-s" @@ -27,13 +27,13 @@ buildGoModule rec { # docker-slim tries to create its state dir next to the binary (inside the nix # store), so we set it to use the working directory at the time of invocation postInstall = '' - wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"' + wrapProgram "$out/bin/slim" --add-flags '--state-path "$(pwd)"' ''; meta = with lib; { description = "Minify and secure Docker containers"; - homepage = "https://dockersl.im/"; - changelog = "https://github.com/docker-slim/docker-slim/raw/${version}/CHANGELOG.md"; + homepage = "https://slimtoolkit.org/"; + changelog = "https://github.com/slimtoolkit/slim/raw/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; }; From 801d887751a01eba5142fb212c75692308cb5aa9 Mon Sep 17 00:00:00 2001 From: R-VdP <141248+R-VdP@users.noreply.github.com> Date: Fri, 27 Jan 2023 15:43:52 +0100 Subject: [PATCH 12/59] fwupd: 1.8.9 -> 1.8.10 --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 457160879871..4b02872cfddc 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -54,6 +54,7 @@ , libmbim , libcbor , xz +, enableFlashrom ? false }: let @@ -76,7 +77,7 @@ let # # Currently broken on Aarch64 # haveFlashrom = isx86; # Experimental - haveFlashrom = false; + haveFlashrom = isx86 && enableFlashrom; runPythonCommand = name: buildCommandPython: runCommand name { nativeBuildInputs = [ python3 ]; @@ -116,7 +117,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.9"; + version = "1.8.10"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -125,7 +126,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - hash = "sha256-cZp5GsS6WYiuuT7EJ3i9ZdM8sHXQwJO1wE5eFoK+Uoo="; + hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow="; }; patches = [ From d0a7702b8fbc078e83c40160d469f27a0dd9d5c1 Mon Sep 17 00:00:00 2001 From: R-VdP <141248+R-VdP@users.noreply.github.com> Date: Fri, 27 Jan 2023 17:42:20 +0100 Subject: [PATCH 13/59] fwupd: thunderbolt plugin only enabled upstream for x86. --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 4b02872cfddc..8939aef06c54 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -333,7 +333,6 @@ let "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor-directory.conf" - "fwupd/thunderbolt.conf" "fwupd/uefi_capsule.conf" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" @@ -348,6 +347,8 @@ let "fwupd/redfish.conf" ] ++ lib.optionals haveMSR [ "fwupd/msr.conf" + ] ++ lib.optionals isx86 [ + "fwupd/thunderbolt.conf" ]; # DisabledPlugins key in fwupd/daemon.conf From 3d0313845640e075d01ebe2a0d84eef949bf09c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 19:06:53 +0000 Subject: [PATCH 14/59] gerrit: 3.6.2 -> 3.7.0 --- pkgs/applications/version-management/gerrit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 335a899b4da1..f505ebdfeb86 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.6.2"; + version = "3.7.0"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "sha256-/OckQD6r9WSMx9Vt44eFpzsacH6VMa6NJX6sj2HBQSs="; + sha256 = "sha256-pbOe7ZN0IM4PTdRywGCyGJ7GIyPudbVJ3QokVP1bazo="; }; buildCommand = '' From 7790eafbdcbc85a8e48912189400565dd039cb64 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 23 Apr 2022 23:37:49 +0200 Subject: [PATCH 15/59] pkg-configPackages: init --- pkgs/test/default.nix | 2 + pkgs/test/pkg-config-packages.nix | 34 +++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/pkg-config-packages.nix | 199 +++++++++++++++++++++++++ 4 files changed, 237 insertions(+) create mode 100644 pkgs/test/pkg-config-packages.nix create mode 100644 pkgs/top-level/pkg-config-packages.nix diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 818001018b3a..8ff0e163395f 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -51,6 +51,8 @@ with pkgs; php = recurseIntoAttrs (callPackages ./php {}); + pkg-configPackages = callPackage ./pkg-config-packages.nix { }; + rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; diff --git a/pkgs/test/pkg-config-packages.nix b/pkgs/test/pkg-config-packages.nix new file mode 100644 index 000000000000..d61902cf1f46 --- /dev/null +++ b/pkgs/test/pkg-config-packages.nix @@ -0,0 +1,34 @@ +{ lib, pkg-config, pkg-configPackages, runCommand }: +let + allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTest k v) pkg-configPackages; + + # nix-build rejects attribute names with periods + # This will build those regardless. + tests-combined = runCommand "pkg-config-checks" { + allTests = lib.attrValues allTests; + } '' + touch $out + ''; + + makePkgConfigTest = moduleName: pkg: runCommand "check-pkg-config-${moduleName}" { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pkg ]; + inherit moduleName; + } '' + echo "checking pkg-config module $moduleName in $buildInputs" + set +e + version="$(pkg-config --modversion $moduleName)" + r=$? + set -e + if [[ $r = 0 ]]; then + echo "✅ pkg-config module $moduleName exists and has version $version" + echo "$version" > $out + else + echo "These modules were available in the input propagation closure:" + pkg-config --list-all + echo "❌ pkg-config module $moduleName was not found" + false + fi + ''; +in + allTests // { inherit tests-combined; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1463780e90b6..6b61bcccee60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -112,6 +112,8 @@ with pkgs; tests = callPackages ../test {}; + pkg-configPackages = import ./pkg-config-packages.nix pkgs; + ### Nixpkgs maintainer tools nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; diff --git a/pkgs/top-level/pkg-config-packages.nix b/pkgs/top-level/pkg-config-packages.nix new file mode 100644 index 000000000000..41613e20caf4 --- /dev/null +++ b/pkgs/top-level/pkg-config-packages.nix @@ -0,0 +1,199 @@ +/* A set of aliases to be used in generated expressions. + + In case of ambiguity, this will pick a sensible default. + + This was initially based on cabal2nix's mapping. + + It'd be nice to generate this mapping, based on a set of derivations. + It can not be fully automated, so it should be a expression or tool + that makes suggestions about which pkg-config module names can be added. + */ +pkgs: { + inherit (pkgs) + bzip2 + freealut + libb2 + libsass + taglib + zlib + ; + alsa = pkgs.alsa-lib; + alsa-topology = pkgs.alsa-lib; + "appindicator-0.1" = pkgs.libappindicator-gtk2; + "appindicator3-0.1" = pkgs.libappindicator-gtk3; + cairo-gobject = pkgs.cairo; + cairo-pdf = pkgs.cairo; + cairo-ps = pkgs.cairo; + cairo-svg = pkgs.cairo; + + "ncurses++" = pkgs.ncurses; + "ncurses++w" = pkgs.ncurses; + form = pkgs.ncurses; + formw = pkgs.ncurses; + menu = pkgs.ncurses; + menuw = pkgs.ncurses; + ncurses = pkgs.ncurses; + ncursesw = pkgs.ncurses; + panel = pkgs.ncurses; + panelw = pkgs.ncurses; + + "dbusmenu-glib-0.4" = pkgs.libdbusmenu; + "dbusmenu-gtk3-0.4" = pkgs.libdbusmenu-gtk3; # TODO: also needs gtk3. Use build propagation? + fftw3 = pkgs.fftw; + fftw3f = pkgs.fftwFloat; + freetype2 = pkgs.freetype; + "gdk-2.0" = pkgs.gtk2; + "gdk-3.0" = pkgs.gtk3; + "gdk-pixbuf-2.0" = pkgs.gdk-pixbuf; + "gdk-x11-2.0" = pkgs.gtk2-x11; + "gdk-x11-3.0" = pkgs.gtk3-x11; + geos = pkgs.geos; + "gio-2.0" = pkgs.glib; + gl = pkgs.libGL; + glew = pkgs.glew; + glu = pkgs.libGLU; + glut = pkgs.freeglut; + gnome-keyring-1 = pkgs.libgnome-keyring; + "gnome-vfs-2.0" = pkgs.gnome2.gnome_vfs; + "gnome-vfs-module-2.0" = pkgs.gnome2.gnome_vfs; + "gobject-2.0" = pkgs.glib; + "gobject-introspection-1.0" = pkgs.gobject-introspection; + "gstreamer-audio-1.0" = pkgs.gst_all_1.gst-plugins-base; + "gstreamer-base-1.0" = pkgs.gst_all_1.gst-plugins-base; + "gstreamer-controller-1.0" = pkgs.gst_all_1.gstreamer; + "gstreamer-net-1.0" = pkgs.gst_all_1.gst-plugins-base; + "gstreamer-video-1.0" = pkgs.gst_all_1.gst-plugins-base; + "gthread-2.0" = pkgs.glib; + "gtk+-2.0" = pkgs.gtk2; + "gtk+-3.0" = pkgs.gtk3; + "gtk+-x11-2.0" = pkgs.gtk2-x11; + "gtksourceview-3.0" = pkgs.gtksourceview3; + hidapi-libusb = pkgs.hidapi; + icu-i18n = pkgs.icu; + icu-uc = pkgs.icu; + icu-io = pkgs.icu; + libidn = pkgs.libidn; + IL = pkgs.libdevil; + ImageMagick = pkgs.imagemagick; + imlib2 = pkgs.imlib2; + jack = pkgs.libjack2; + "javascriptcoregtk-4.0" = pkgs.webkitgtk; + libjpeg = pkgs.libjpeg; + libturbojpeg = pkgs.libjpeg; + lapack = pkgs.liblapack; + libavutil = pkgs.ffmpeg; + libbrotlienc = pkgs.brotli; + libbrotlidec = pkgs.brotli; + libgsasl = pkgs.gsasl; + libpcre = pkgs.pcre; + libpcre2-8 = pkgs.pcre2; + libpcre2-16 = pkgs.pcre2; + libpcre2-32 = pkgs.pcre2; + libpcre2-posix = pkgs.pcre2; + libqrencode = pkgs.qrencode; + libR = pkgs.R; + libsecp256k1 = pkgs.secp256k1; + "libsoup-gnome-2.4" = pkgs.libsoup; + libsystemd = pkgs.systemd; + libudev = pkgs.systemd; + "libxml-2.0" = pkgs.libxml2; + libzip = pkgs.libzip; + libzmq = pkgs.zeromq; + liblzma = pkgs.xz; + m = null; # in stdenv + libmagic = pkgs.file; + MagickWand = pkgs.imagemagick; + libmnl = pkgs.libmnl; + + ompi = pkgs.openmpi; + ompi-c = pkgs.openmpi; + ompi-cxx = pkgs.openmpi; + ompi-fort = pkgs.openmpi; + ompi-f77 = pkgs.openmpi; + ompi-f90 = pkgs.openmpi; + orte = pkgs.openmpi; + + netsnmp = pkgs.net_snmp; + nix-cmd = pkgs.nix; + nix-expr = pkgs.nix; + nix-main = pkgs.nix; + nix-store = pkgs.nix; + libnotify = pkgs.libnotify; + odbc = pkgs.unixODBC; + openblas = pkgs.openblasCompat; + pangocairo = pkgs.pango; + libpcap = pkgs.libpcap; + libpng = pkgs.libpng; + poppler-glib = pkgs.poppler_gi; + libpq = pkgs.postgresql; + libpgtypes = pkgs.postgresql; + libecpg = pkgs.postgresql; + libecpg_compat = pkgs.postgresql; + pthread = null; # in stdenv + libpulse = pkgs.libpulseaudio; + libpulse-simple = pkgs.libpulseaudio; + libpulse-mainloop-glib = pkgs.libpulseaudio; + python = pkgs.python3; + + Qt5Concurrent = pkgs.qt5.qtbase; + Qt5Core = pkgs.qt5.qtbase; + Qt5DBus = pkgs.qt5.qtbase; + Qt5Gui = pkgs.qt5.qtbase; + Qt5Network = pkgs.qt5.qtbase; + Qt5OpenGL = pkgs.qt5.qtbase; + Qt5OpenGLExtensions = pkgs.qt5.qtbase; + Qt5PrintSupport = pkgs.qt5.qtbase; + Qt5Sql = pkgs.qt5.qtbase; + Qt5Test = pkgs.qt5.qtbase; + Qt5Widgets = pkgs.qt5.qtbase; + Qt5Xml = pkgs.qt5.qtbase; + + Qt5Qml = pkgs.qt5.qtdeclarative; + Qt5QmlModels = pkgs.qt5.qtdeclarative; + Qt5Quick = pkgs.qt5.qtdeclarative; + Qt5QuickTest = pkgs.qt5.qtdeclarative; + Qt5QuickWidgets = pkgs.qt5.qtdeclarative; + + librtlsdr = pkgs.rtl-sdr; + "ruby-2.7" = pkgs.ruby_2_7; + "ruby-3.0" = pkgs.ruby_3_0; + "ruby-3.1" = pkgs.ruby_3_1; + libsctp = pkgs.lksctp-tools; # This is linux-specific, we should create a common attribute if we add sctp support for other systems. + sdl2 = pkgs.SDL2; + sndfile = pkgs.libsndfile; + SoapySDR = pkgs.soapysdr; + libsodium = pkgs.libsodium; + sqlite3 = pkgs.sqlite; + libssh2 = pkgs.libssh2; + openssl = pkgs.openssl; + libssl = pkgs.openssl; + libcrypto = pkgs.openssl; + libstatgrab = pkgs.libstatgrab; + taglib_c = pkgs.taglib; + tdjson = pkgs.tdlib; + tensorflow = pkgs.libtensorflow; + uuid = pkgs.libossp_uuid; + "vte-2.91" = pkgs.vte; + wayland-client = pkgs.wayland; + wayland-cursor = pkgs.wayland; + egl = pkgs.libGL; + wayland-server = pkgs.wayland; + "webkit2gtk-4.0" = pkgs.webkitgtk; + "webkit2gtk-web-extension-4.0" = pkgs.webkitgtk; + x11 = pkgs.xorg.libX11; + xau = pkgs.xorg.libXau; + xcursor = pkgs.xorg.libXcursor; + xerces-c = pkgs.xercesc; + xext = pkgs.xorg.libXext; + xft = pkgs.xorg.libXft; + xi = pkgs.xorg.libXi; + xinerama = pkgs.xorg.libXinerama; + xkbcommon = pkgs.libxkbcommon; + xpm = pkgs.xorg.libXpm; + xrandr = pkgs.xorg.libXrandr; + xrender = pkgs.xorg.libXrender; + xscrnsaver = pkgs.xorg.libXScrnSaver; + xtst = pkgs.xorg.libXtst; + xxf86vm = pkgs.xorg.libXxf86vm; + "yaml-0.1" = pkgs.libyaml; +} From e93cfb250b683f3ffd9adc957c14b5b3b2e108ae Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 23 Jan 2023 19:08:46 +0100 Subject: [PATCH 16/59] tests.pkg-configPackages: Filter out unsupported packages --- pkgs/test/default.nix | 17 ++++++++++++++++- pkgs/test/pkg-config-packages.nix | 24 +++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 8ff0e163395f..82134b051d4e 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -51,7 +51,22 @@ with pkgs; php = recurseIntoAttrs (callPackages ./php {}); - pkg-configPackages = callPackage ./pkg-config-packages.nix { }; + pkg-configPackages = + let + # pkg-configPackages test needs a Nixpkgs with allowUnsupportedPlatform + # in order to filter out the unsupported packages without throwing any errors + # tryEval would be too fragile, masking different problems as if they're + # unsupported platform problems. + allPkgs = import ../top-level { + system = pkgs.stdenv.hostPlatform.system; + localSystem = pkgs.stdenv.hostPlatform.system; + config = { + allowUnsupportedSystem = true; + }; + overlays = []; + }; + in + allPkgs.callPackage ./pkg-config-packages.nix { }; rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; diff --git a/pkgs/test/pkg-config-packages.nix b/pkgs/test/pkg-config-packages.nix index d61902cf1f46..8e4e5253f9b1 100644 --- a/pkgs/test/pkg-config-packages.nix +++ b/pkgs/test/pkg-config-packages.nix @@ -1,6 +1,8 @@ { lib, pkg-config, pkg-configPackages, runCommand }: let - allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTest k v) pkg-configPackages; + inherit (lib.strings) escapeNixIdentifier; + + allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) pkg-configPackages; # nix-build rejects attribute names with periods # This will build those regardless. @@ -10,6 +12,26 @@ let touch $out ''; + makePkgConfigTestMaybe = moduleName: pkg: + if ! lib.isDerivation pkg + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` is not defined to be a derivation. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config-packages.nix` in Nixpkgs." + + else if ! pkg?meta.unsupported + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` does not have a `meta.unsupported` attribute. This can't be right. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config-packages.nix` in Nixpkgs." + + else if pkg.meta.unsupported + then + # We return `null` instead of doing a `filterAttrs`, because with + # `filterAttrs` the evaluator would not be able to return the attribute + # set without first evaluating all of the attribute _values_. This would + # be rather expensive, and severly slow down the use case of getting a + # single test, which we want to do in `passthru.tests`, or interactively. + null + + else makePkgConfigTest moduleName pkg; + makePkgConfigTest = moduleName: pkg: runCommand "check-pkg-config-${moduleName}" { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pkg ]; From 04b06e83dc3438512896abdb38b7d6a8dd8adb26 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 23 Jan 2023 19:11:20 +0100 Subject: [PATCH 17/59] tests.pkg-configPackages: Filter out broken packages Some packages are only marked broken on specific platforms, so we filter those out as well. Consequently, this might not raise an error if the attribute value needs to point to a different pkgs attribute, but this is not something we can detect. For now, we'll have to rely on users of such pkg-config packages to report that kind of error. There's really not much we can do about this here. --- pkgs/test/pkg-config-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/test/pkg-config-packages.nix b/pkgs/test/pkg-config-packages.nix index 8e4e5253f9b1..2d14d9402f0e 100644 --- a/pkgs/test/pkg-config-packages.nix +++ b/pkgs/test/pkg-config-packages.nix @@ -30,6 +30,13 @@ let # single test, which we want to do in `passthru.tests`, or interactively. null + else if ! pkg?meta.broken + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` does not have a `meta.broken` attribute. This can't be right. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config.packages.nix` in Nixpkgs." + + else if pkg.meta.broken + then null + else makePkgConfigTest moduleName pkg; makePkgConfigTest = moduleName: pkg: runCommand "check-pkg-config-${moduleName}" { From b576b17fb00af05968a0ccaddf7ee63857d8d5e2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 23 Jan 2023 19:42:24 +0100 Subject: [PATCH 18/59] zlib: Add tests.pkg-configPackages --- pkgs/development/libraries/zlib/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 52654b6541e3..0aa37c86b795 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -8,6 +8,7 @@ # the `.pc` file lists only the main output's lib dir. # If false, and if `{ static = true; }`, the .a stays in the main output. , splitStaticOutput ? shared && static +, tests }: # Without either the build will actually still succeed because the build @@ -125,6 +126,14 @@ stdenv.mkDerivation rec { "SHARED_MODE=1" ]; + passthru = { + tests = { + # NB: this may test a different variant of zlib than the package that + # carries this `tests` attribute, due to overriding. + pkg-configPackages = tests.pkg-configPackages.zlib; + }; + }; + meta = with lib; { homepage = "https://zlib.net"; description = "Lossless data-compression library"; From 2d4e78fb8bd3420d31879f5669160b1a62d47fb0 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Jan 2023 11:54:02 +0100 Subject: [PATCH 19/59] tests.pkg-configPackages: Copy meta attributes for licensing concerns --- pkgs/test/pkg-config-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/test/pkg-config-packages.nix b/pkgs/test/pkg-config-packages.nix index 2d14d9402f0e..be046c8cacca 100644 --- a/pkgs/test/pkg-config-packages.nix +++ b/pkgs/test/pkg-config-packages.nix @@ -43,6 +43,24 @@ let nativeBuildInputs = [ pkg-config ]; buildInputs = [ pkg ]; inherit moduleName; + meta = { + description = "Test whether ${pkg.name} exposes pkg-config module ${moduleName}"; + } + # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org, + # as hydra can't check this meta info in dependencies. + # The test itself is just Nixpkgs, with MIT license. + // builtins.intersectAttrs + { + available = throw "unused"; + broken = throw "unused"; + insecure = throw "unused"; + license = throw "unused"; + maintainers = throw "unused"; + platforms = throw "unused"; + unfree = throw "unused"; + unsupported = throw "unused"; + } + pkg.meta; } '' echo "checking pkg-config module $moduleName in $buildInputs" set +e From 75a70ff129f6442ee8554470d71ce48fab00a527 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Jan 2023 12:08:50 +0100 Subject: [PATCH 20/59] pkg-configPackages: Fixes for darwin --- pkgs/top-level/pkg-config-packages.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/pkg-config-packages.nix b/pkgs/top-level/pkg-config-packages.nix index 41613e20caf4..e30b6cc45509 100644 --- a/pkgs/top-level/pkg-config-packages.nix +++ b/pkgs/top-level/pkg-config-packages.nix @@ -68,7 +68,9 @@ pkgs: { "gtk+-3.0" = pkgs.gtk3; "gtk+-x11-2.0" = pkgs.gtk2-x11; "gtksourceview-3.0" = pkgs.gtksourceview3; - hidapi-libusb = pkgs.hidapi; + hidapi = if pkgs.stdenv.isDarwin then pkgs.hidapi else null; + hidapi-hidraw = if pkgs.stdenv.isDarwin then null else pkgs.hidapi; + hidapi-libusb = if pkgs.stdenv.isDarwin then null else pkgs.hidapi; icu-i18n = pkgs.icu; icu-uc = pkgs.icu; icu-io = pkgs.icu; @@ -132,7 +134,7 @@ pkgs: { pthread = null; # in stdenv libpulse = pkgs.libpulseaudio; libpulse-simple = pkgs.libpulseaudio; - libpulse-mainloop-glib = pkgs.libpulseaudio; + libpulse-mainloop-glib = if pkgs.stdenv.isDarwin then null else pkgs.libpulseaudio; python = pkgs.python3; Qt5Concurrent = pkgs.qt5.qtbase; @@ -174,10 +176,11 @@ pkgs: { tensorflow = pkgs.libtensorflow; uuid = pkgs.libossp_uuid; "vte-2.91" = pkgs.vte; - wayland-client = pkgs.wayland; - wayland-cursor = pkgs.wayland; - egl = pkgs.libGL; - wayland-server = pkgs.wayland; + wayland-client = if pkgs.stdenv.isDarwin then null else pkgs.wayland; + wayland-cursor = if pkgs.stdenv.isDarwin then null else pkgs.wayland; + egl = if pkgs.stdenv.isDarwin then null else pkgs.libGL; + wayland-scanner = pkgs.wayland; + wayland-server = if pkgs.stdenv.isDarwin then null else pkgs.wayland; "webkit2gtk-4.0" = pkgs.webkitgtk; "webkit2gtk-web-extension-4.0" = pkgs.webkitgtk; x11 = pkgs.xorg.libX11; From 159ad20b894a9af2893cacfcca19fcec7f21fa06 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Jan 2023 12:59:38 +0100 Subject: [PATCH 21/59] doc: Add pkg-config section --- doc/languages-frameworks/index.xml | 1 + doc/languages-frameworks/pkg-config.section.md | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 doc/languages-frameworks/pkg-config.section.md diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 7d404643d369..3774924c0be4 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -32,6 +32,7 @@ + diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md new file mode 100644 index 000000000000..f19f56840345 --- /dev/null +++ b/doc/languages-frameworks/pkg-config.section.md @@ -0,0 +1,9 @@ +# pkg-config {#sec-pkg-config} + +*pkg-config* is a unified interface for declaring and querying built C/C++ libraries. + +Nixpkgs provides a couple of facilities for working with this tool. + + - A [setup hook](#setup-hook-pkg-config) bundled with in the `pkg-config` package, to bring a derivation's declared build inputs into the environment. + - The [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), for packages that provide pkg-config modules. + - The `pkg-configPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead. From 90fdbf5f394f3bb7d49992702157df7d93056055 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Jan 2023 17:07:12 +0100 Subject: [PATCH 22/59] Revert "zlib: Add tests.pkg-configPackages" `passthru.tests` is an interesting addition, but it is too manual of a solution, and is unlikely to be as useful as it needs to be to cover its cost of adding this to a ton of packages. This reverts commit c25dd2f01e93d79237c56b61f51c034616be0a11. --- pkgs/development/libraries/zlib/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 0aa37c86b795..52654b6541e3 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -8,7 +8,6 @@ # the `.pc` file lists only the main output's lib dir. # If false, and if `{ static = true; }`, the .a stays in the main output. , splitStaticOutput ? shared && static -, tests }: # Without either the build will actually still succeed because the build @@ -126,14 +125,6 @@ stdenv.mkDerivation rec { "SHARED_MODE=1" ]; - passthru = { - tests = { - # NB: this may test a different variant of zlib than the package that - # carries this `tests` attribute, due to overriding. - pkg-configPackages = tests.pkg-configPackages.zlib; - }; - }; - meta = with lib; { homepage = "https://zlib.net"; description = "Lossless data-compression library"; From a010129bf87c2afcb2f60db410cc535fef299f8c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Jan 2023 17:09:33 +0100 Subject: [PATCH 23/59] pkg-configPackages -> defaultPkgConfigPackages This better reflects the purpose of the package set, while leaving room for a fancier, more complete implementation of the concept, with a nicer name. --- doc/languages-frameworks/pkg-config.section.md | 2 +- pkgs/test/default.nix | 4 ++-- pkgs/test/pkg-config-packages.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md index f19f56840345..ee0a471be3e5 100644 --- a/doc/languages-frameworks/pkg-config.section.md +++ b/doc/languages-frameworks/pkg-config.section.md @@ -6,4 +6,4 @@ Nixpkgs provides a couple of facilities for working with this tool. - A [setup hook](#setup-hook-pkg-config) bundled with in the `pkg-config` package, to bring a derivation's declared build inputs into the environment. - The [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), for packages that provide pkg-config modules. - - The `pkg-configPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead. + - The `defaultPkgConfigPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead. diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 82134b051d4e..72b22f7f6865 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -51,9 +51,9 @@ with pkgs; php = recurseIntoAttrs (callPackages ./php {}); - pkg-configPackages = + defaultPkgConfigPackages = let - # pkg-configPackages test needs a Nixpkgs with allowUnsupportedPlatform + # defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform # in order to filter out the unsupported packages without throwing any errors # tryEval would be too fragile, masking different problems as if they're # unsupported platform problems. diff --git a/pkgs/test/pkg-config-packages.nix b/pkgs/test/pkg-config-packages.nix index be046c8cacca..8cb6cc57753f 100644 --- a/pkgs/test/pkg-config-packages.nix +++ b/pkgs/test/pkg-config-packages.nix @@ -1,8 +1,8 @@ -{ lib, pkg-config, pkg-configPackages, runCommand }: +{ lib, pkg-config, defaultPkgConfigPackages, runCommand }: let inherit (lib.strings) escapeNixIdentifier; - allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) pkg-configPackages; + allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) defaultPkgConfigPackages; # nix-build rejects attribute names with periods # This will build those regardless. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b61bcccee60..cde388312abf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -112,7 +112,7 @@ with pkgs; tests = callPackages ../test {}; - pkg-configPackages = import ./pkg-config-packages.nix pkgs; + defaultPkgConfigPackages = import ./pkg-config-packages.nix pkgs; ### Nixpkgs maintainer tools From 81a541e6b657cb6dd1943079da48a550b89b87ba Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 29 Jan 2023 08:18:21 +0100 Subject: [PATCH 24/59] defaultPkgConfigPackages: Make it JSON With a bit of help from: ``` nix-repl> :b (formats.json {}).generate "hi" { modules = lib.mapAttrs (k: v: { attrPath = v; }) (p (paths [] pkgs // { stdenv = { isDarwin = false; isLinux = false; };})); } ``` --- pkgs/top-level/pkg-config-packages.nix | 216 +--- .../top-level/pkg-config/pkg-config-data.json | 940 ++++++++++++++++++ 2 files changed, 970 insertions(+), 186 deletions(-) create mode 100644 pkgs/top-level/pkg-config/pkg-config-data.json diff --git a/pkgs/top-level/pkg-config-packages.nix b/pkgs/top-level/pkg-config-packages.nix index e30b6cc45509..8d428cfb2182 100644 --- a/pkgs/top-level/pkg-config-packages.nix +++ b/pkgs/top-level/pkg-config-packages.nix @@ -8,195 +8,39 @@ It can not be fully automated, so it should be a expression or tool that makes suggestions about which pkg-config module names can be added. */ -pkgs: { - inherit (pkgs) - bzip2 - freealut - libb2 - libsass - taglib - zlib +pkgs: + +let + inherit (pkgs) lib; + inherit (lib) + flip + mapAttrs + getAttrFromPath + importJSON ; - alsa = pkgs.alsa-lib; - alsa-topology = pkgs.alsa-lib; - "appindicator-0.1" = pkgs.libappindicator-gtk2; - "appindicator3-0.1" = pkgs.libappindicator-gtk3; - cairo-gobject = pkgs.cairo; - cairo-pdf = pkgs.cairo; - cairo-ps = pkgs.cairo; - cairo-svg = pkgs.cairo; - "ncurses++" = pkgs.ncurses; - "ncurses++w" = pkgs.ncurses; - form = pkgs.ncurses; - formw = pkgs.ncurses; - menu = pkgs.ncurses; - menuw = pkgs.ncurses; - ncurses = pkgs.ncurses; - ncursesw = pkgs.ncurses; - panel = pkgs.ncurses; - panelw = pkgs.ncurses; + result = modulePkgs // overrides; - "dbusmenu-glib-0.4" = pkgs.libdbusmenu; - "dbusmenu-gtk3-0.4" = pkgs.libdbusmenu-gtk3; # TODO: also needs gtk3. Use build propagation? - fftw3 = pkgs.fftw; - fftw3f = pkgs.fftwFloat; - freetype2 = pkgs.freetype; - "gdk-2.0" = pkgs.gtk2; - "gdk-3.0" = pkgs.gtk3; - "gdk-pixbuf-2.0" = pkgs.gdk-pixbuf; - "gdk-x11-2.0" = pkgs.gtk2-x11; - "gdk-x11-3.0" = pkgs.gtk3-x11; - geos = pkgs.geos; - "gio-2.0" = pkgs.glib; - gl = pkgs.libGL; - glew = pkgs.glew; - glu = pkgs.libGLU; - glut = pkgs.freeglut; - gnome-keyring-1 = pkgs.libgnome-keyring; - "gnome-vfs-2.0" = pkgs.gnome2.gnome_vfs; - "gnome-vfs-module-2.0" = pkgs.gnome2.gnome_vfs; - "gobject-2.0" = pkgs.glib; - "gobject-introspection-1.0" = pkgs.gobject-introspection; - "gstreamer-audio-1.0" = pkgs.gst_all_1.gst-plugins-base; - "gstreamer-base-1.0" = pkgs.gst_all_1.gst-plugins-base; - "gstreamer-controller-1.0" = pkgs.gst_all_1.gstreamer; - "gstreamer-net-1.0" = pkgs.gst_all_1.gst-plugins-base; - "gstreamer-video-1.0" = pkgs.gst_all_1.gst-plugins-base; - "gthread-2.0" = pkgs.glib; - "gtk+-2.0" = pkgs.gtk2; - "gtk+-3.0" = pkgs.gtk3; - "gtk+-x11-2.0" = pkgs.gtk2-x11; - "gtksourceview-3.0" = pkgs.gtksourceview3; - hidapi = if pkgs.stdenv.isDarwin then pkgs.hidapi else null; - hidapi-hidraw = if pkgs.stdenv.isDarwin then null else pkgs.hidapi; - hidapi-libusb = if pkgs.stdenv.isDarwin then null else pkgs.hidapi; - icu-i18n = pkgs.icu; - icu-uc = pkgs.icu; - icu-io = pkgs.icu; - libidn = pkgs.libidn; - IL = pkgs.libdevil; - ImageMagick = pkgs.imagemagick; - imlib2 = pkgs.imlib2; - jack = pkgs.libjack2; - "javascriptcoregtk-4.0" = pkgs.webkitgtk; - libjpeg = pkgs.libjpeg; - libturbojpeg = pkgs.libjpeg; - lapack = pkgs.liblapack; - libavutil = pkgs.ffmpeg; - libbrotlienc = pkgs.brotli; - libbrotlidec = pkgs.brotli; - libgsasl = pkgs.gsasl; - libpcre = pkgs.pcre; - libpcre2-8 = pkgs.pcre2; - libpcre2-16 = pkgs.pcre2; - libpcre2-32 = pkgs.pcre2; - libpcre2-posix = pkgs.pcre2; - libqrencode = pkgs.qrencode; - libR = pkgs.R; - libsecp256k1 = pkgs.secp256k1; - "libsoup-gnome-2.4" = pkgs.libsoup; - libsystemd = pkgs.systemd; - libudev = pkgs.systemd; - "libxml-2.0" = pkgs.libxml2; - libzip = pkgs.libzip; - libzmq = pkgs.zeromq; - liblzma = pkgs.xz; - m = null; # in stdenv - libmagic = pkgs.file; - MagickWand = pkgs.imagemagick; - libmnl = pkgs.libmnl; + data = importJSON ./pkg-config/pkg-config-data.json; + inherit (data) modules; - ompi = pkgs.openmpi; - ompi-c = pkgs.openmpi; - ompi-cxx = pkgs.openmpi; - ompi-fort = pkgs.openmpi; - ompi-f77 = pkgs.openmpi; - ompi-f90 = pkgs.openmpi; - orte = pkgs.openmpi; + modulePkgs = flip mapAttrs modules (_moduleName: moduleData: + if moduleData?attrPath then + getAttrFromPath moduleData.attrPath pkgs + else + null + ); - netsnmp = pkgs.net_snmp; - nix-cmd = pkgs.nix; - nix-expr = pkgs.nix; - nix-main = pkgs.nix; - nix-store = pkgs.nix; - libnotify = pkgs.libnotify; - odbc = pkgs.unixODBC; - openblas = pkgs.openblasCompat; - pangocairo = pkgs.pango; - libpcap = pkgs.libpcap; - libpng = pkgs.libpng; - poppler-glib = pkgs.poppler_gi; - libpq = pkgs.postgresql; - libpgtypes = pkgs.postgresql; - libecpg = pkgs.postgresql; - libecpg_compat = pkgs.postgresql; - pthread = null; # in stdenv - libpulse = pkgs.libpulseaudio; - libpulse-simple = pkgs.libpulseaudio; - libpulse-mainloop-glib = if pkgs.stdenv.isDarwin then null else pkgs.libpulseaudio; - python = pkgs.python3; + overrides = { + hidapi = if pkgs.stdenv.isDarwin then pkgs.hidapi else null; + hidapi-hidraw = if pkgs.stdenv.isDarwin then null else pkgs.hidapi; + hidapi-libusb = if pkgs.stdenv.isDarwin then null else pkgs.hidapi; + libpulse-mainloop-glib = if pkgs.stdenv.isDarwin then null else pkgs.libpulseaudio; + wayland-client = if pkgs.stdenv.isDarwin then null else pkgs.wayland; + wayland-cursor = if pkgs.stdenv.isDarwin then null else pkgs.wayland; + egl = if pkgs.stdenv.isDarwin then null else pkgs.libGL; + wayland-server = if pkgs.stdenv.isDarwin then null else pkgs.wayland; + }; - Qt5Concurrent = pkgs.qt5.qtbase; - Qt5Core = pkgs.qt5.qtbase; - Qt5DBus = pkgs.qt5.qtbase; - Qt5Gui = pkgs.qt5.qtbase; - Qt5Network = pkgs.qt5.qtbase; - Qt5OpenGL = pkgs.qt5.qtbase; - Qt5OpenGLExtensions = pkgs.qt5.qtbase; - Qt5PrintSupport = pkgs.qt5.qtbase; - Qt5Sql = pkgs.qt5.qtbase; - Qt5Test = pkgs.qt5.qtbase; - Qt5Widgets = pkgs.qt5.qtbase; - Qt5Xml = pkgs.qt5.qtbase; - - Qt5Qml = pkgs.qt5.qtdeclarative; - Qt5QmlModels = pkgs.qt5.qtdeclarative; - Qt5Quick = pkgs.qt5.qtdeclarative; - Qt5QuickTest = pkgs.qt5.qtdeclarative; - Qt5QuickWidgets = pkgs.qt5.qtdeclarative; - - librtlsdr = pkgs.rtl-sdr; - "ruby-2.7" = pkgs.ruby_2_7; - "ruby-3.0" = pkgs.ruby_3_0; - "ruby-3.1" = pkgs.ruby_3_1; - libsctp = pkgs.lksctp-tools; # This is linux-specific, we should create a common attribute if we add sctp support for other systems. - sdl2 = pkgs.SDL2; - sndfile = pkgs.libsndfile; - SoapySDR = pkgs.soapysdr; - libsodium = pkgs.libsodium; - sqlite3 = pkgs.sqlite; - libssh2 = pkgs.libssh2; - openssl = pkgs.openssl; - libssl = pkgs.openssl; - libcrypto = pkgs.openssl; - libstatgrab = pkgs.libstatgrab; - taglib_c = pkgs.taglib; - tdjson = pkgs.tdlib; - tensorflow = pkgs.libtensorflow; - uuid = pkgs.libossp_uuid; - "vte-2.91" = pkgs.vte; - wayland-client = if pkgs.stdenv.isDarwin then null else pkgs.wayland; - wayland-cursor = if pkgs.stdenv.isDarwin then null else pkgs.wayland; - egl = if pkgs.stdenv.isDarwin then null else pkgs.libGL; - wayland-scanner = pkgs.wayland; - wayland-server = if pkgs.stdenv.isDarwin then null else pkgs.wayland; - "webkit2gtk-4.0" = pkgs.webkitgtk; - "webkit2gtk-web-extension-4.0" = pkgs.webkitgtk; - x11 = pkgs.xorg.libX11; - xau = pkgs.xorg.libXau; - xcursor = pkgs.xorg.libXcursor; - xerces-c = pkgs.xercesc; - xext = pkgs.xorg.libXext; - xft = pkgs.xorg.libXft; - xi = pkgs.xorg.libXi; - xinerama = pkgs.xorg.libXinerama; - xkbcommon = pkgs.libxkbcommon; - xpm = pkgs.xorg.libXpm; - xrandr = pkgs.xorg.libXrandr; - xrender = pkgs.xorg.libXrender; - xscrnsaver = pkgs.xorg.libXScrnSaver; - xtst = pkgs.xorg.libXtst; - xxf86vm = pkgs.xorg.libXxf86vm; - "yaml-0.1" = pkgs.libyaml; -} +in + result diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json new file mode 100644 index 000000000000..55036d91fce8 --- /dev/null +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -0,0 +1,940 @@ +{ + "modules": { + "IL": { + "attrPath": [ + "libdevil" + ] + }, + "ImageMagick": { + "attrPath": [ + "imagemagick" + ] + }, + "MagickWand": { + "attrPath": [ + "imagemagick" + ] + }, + "Qt5Concurrent": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Core": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5DBus": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Gui": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Network": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5OpenGL": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5OpenGLExtensions": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5PrintSupport": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Qml": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QmlModels": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5Quick": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QuickTest": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QuickWidgets": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5Sql": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Test": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Widgets": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Xml": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "SoapySDR": { + "attrPath": [ + "soapysdr" + ] + }, + "alsa": { + "attrPath": [ + "alsa-lib" + ] + }, + "alsa-topology": { + "attrPath": [ + "alsa-lib" + ] + }, + "appindicator-0.1": { + "attrPath": [ + "libappindicator-gtk2" + ] + }, + "appindicator3-0.1": { + "attrPath": [ + "libappindicator-gtk3" + ] + }, + "bzip2": { + "attrPath": [ + "bzip2" + ] + }, + "cairo-gobject": { + "attrPath": [ + "cairo" + ] + }, + "cairo-pdf": { + "attrPath": [ + "cairo" + ] + }, + "cairo-ps": { + "attrPath": [ + "cairo" + ] + }, + "cairo-svg": { + "attrPath": [ + "cairo" + ] + }, + "dbusmenu-glib-0.4": { + "attrPath": [ + "libdbusmenu" + ] + }, + "dbusmenu-gtk3-0.4": { + "attrPath": [ + "libdbusmenu-gtk3" + ] + }, + "egl": { + "attrPath": [ + "libGL" + ] + }, + "fftw3": { + "attrPath": [ + "fftw" + ] + }, + "fftw3f": { + "attrPath": [ + "fftwFloat" + ] + }, + "form": { + "attrPath": [ + "ncurses" + ] + }, + "formw": { + "attrPath": [ + "ncurses" + ] + }, + "freealut": { + "attrPath": [ + "freealut" + ] + }, + "freetype2": { + "attrPath": [ + "freetype" + ] + }, + "gdk-2.0": { + "attrPath": [ + "gtk2" + ] + }, + "gdk-3.0": { + "attrPath": [ + "gtk3" + ] + }, + "gdk-pixbuf-2.0": { + "attrPath": [ + "gdk-pixbuf" + ] + }, + "gdk-x11-2.0": { + "attrPath": [ + "gtk2-x11" + ] + }, + "gdk-x11-3.0": { + "attrPath": [ + "gtk3-x11" + ] + }, + "geos": { + "attrPath": [ + "geos" + ] + }, + "gio-2.0": { + "attrPath": [ + "glib" + ] + }, + "gl": { + "attrPath": [ + "libGL" + ] + }, + "glew": { + "attrPath": [ + "glew" + ] + }, + "glu": { + "attrPath": [ + "libGLU" + ] + }, + "glut": { + "attrPath": [ + "freeglut" + ] + }, + "gnome-keyring-1": { + "attrPath": [ + "libgnome-keyring" + ] + }, + "gnome-vfs-2.0": { + "attrPath": [ + "gnome2", + "gnome_vfs" + ] + }, + "gnome-vfs-module-2.0": { + "attrPath": [ + "gnome2", + "gnome_vfs" + ] + }, + "gobject-2.0": { + "attrPath": [ + "glib" + ] + }, + "gobject-introspection-1.0": { + "attrPath": [ + "gobject-introspection" + ] + }, + "gstreamer-audio-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-base-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-controller-1.0": { + "attrPath": [ + "gst_all_1", + "gstreamer" + ] + }, + "gstreamer-net-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-video-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gthread-2.0": { + "attrPath": [ + "glib" + ] + }, + "gtk+-2.0": { + "attrPath": [ + "gtk2" + ] + }, + "gtk+-3.0": { + "attrPath": [ + "gtk3" + ] + }, + "gtk+-x11-2.0": { + "attrPath": [ + "gtk2-x11" + ] + }, + "gtksourceview-3.0": { + "attrPath": [ + "gtksourceview3" + ] + }, + "hidapi": { + "attrPath": null + }, + "hidapi-hidraw": { + "attrPath": [ + "hidapi" + ] + }, + "hidapi-libusb": { + "attrPath": [ + "hidapi" + ] + }, + "icu-i18n": { + "attrPath": [ + "icu" + ] + }, + "icu-io": { + "attrPath": [ + "icu" + ] + }, + "icu-uc": { + "attrPath": [ + "icu" + ] + }, + "imlib2": { + "attrPath": [ + "imlib2" + ] + }, + "jack": { + "attrPath": [ + "libjack2" + ] + }, + "javascriptcoregtk-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "lapack": { + "attrPath": [ + "liblapack" + ] + }, + "libR": { + "attrPath": [ + "R" + ] + }, + "libavutil": { + "attrPath": [ + "ffmpeg" + ] + }, + "libb2": { + "attrPath": [ + "libb2" + ] + }, + "libbrotlidec": { + "attrPath": [ + "brotli" + ] + }, + "libbrotlienc": { + "attrPath": [ + "brotli" + ] + }, + "libcrypto": { + "attrPath": [ + "openssl" + ] + }, + "libecpg": { + "attrPath": [ + "postgresql" + ] + }, + "libecpg_compat": { + "attrPath": [ + "postgresql" + ] + }, + "libgsasl": { + "attrPath": [ + "gsasl" + ] + }, + "libidn": { + "attrPath": [ + "libidn" + ] + }, + "libjpeg": { + "attrPath": [ + "libjpeg" + ] + }, + "liblzma": { + "attrPath": [ + "xz" + ] + }, + "libmagic": { + "attrPath": [ + "file" + ] + }, + "libmnl": { + "attrPath": [ + "libmnl" + ] + }, + "libnotify": { + "attrPath": [ + "libnotify" + ] + }, + "libpcap": { + "attrPath": [ + "libpcap" + ] + }, + "libpcre": { + "attrPath": [ + "pcre" + ] + }, + "libpcre2-16": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-32": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-8": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-posix": { + "attrPath": [ + "pcre2" + ] + }, + "libpgtypes": { + "attrPath": [ + "postgresql" + ] + }, + "libpng": { + "attrPath": [ + "libpng" + ] + }, + "libpq": { + "attrPath": [ + "postgresql" + ] + }, + "libpulse": { + "attrPath": [ + "libpulseaudio" + ] + }, + "libpulse-mainloop-glib": { + "attrPath": [ + "libpulseaudio" + ] + }, + "libpulse-simple": { + "attrPath": [ + "libpulseaudio" + ] + }, + "libqrencode": { + "attrPath": [ + "qrencode" + ] + }, + "librtlsdr": { + "attrPath": [ + "rtl-sdr" + ] + }, + "libsass": { + "attrPath": [ + "libsass" + ] + }, + "libsctp": { + "attrPath": [ + "lksctp-tools" + ] + }, + "libsecp256k1": { + "attrPath": [ + "secp256k1" + ] + }, + "libsodium": { + "attrPath": [ + "libsodium" + ] + }, + "libsoup-gnome-2.4": { + "attrPath": [ + "libsoup" + ] + }, + "libssh2": { + "attrPath": [ + "libssh2" + ] + }, + "libssl": { + "attrPath": [ + "openssl" + ] + }, + "libstatgrab": { + "attrPath": [ + "libstatgrab" + ] + }, + "libsystemd": { + "attrPath": [ + "systemd" + ] + }, + "libturbojpeg": { + "attrPath": [ + "libjpeg" + ] + }, + "libudev": { + "attrPath": [ + "systemd" + ] + }, + "libxml-2.0": { + "attrPath": [ + "libxml2" + ] + }, + "libzip": { + "attrPath": [ + "libzip" + ] + }, + "libzmq": { + "attrPath": [ + "zeromq" + ] + }, + "m": { + "attrPath": null + }, + "menu": { + "attrPath": [ + "ncurses" + ] + }, + "menuw": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses++": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses++w": { + "attrPath": [ + "ncurses" + ] + }, + "ncursesw": { + "attrPath": [ + "ncurses" + ] + }, + "netsnmp": { + "attrPath": [ + "net_snmp" + ] + }, + "nix-cmd": { + "attrPath": [ + "nix" + ] + }, + "nix-expr": { + "attrPath": [ + "nix" + ] + }, + "nix-main": { + "attrPath": [ + "nix" + ] + }, + "nix-store": { + "attrPath": [ + "nix" + ] + }, + "odbc": { + "attrPath": [ + "unixODBC" + ] + }, + "ompi": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-c": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-cxx": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-f77": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-f90": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-fort": { + "attrPath": [ + "openmpi" + ] + }, + "openblas": { + "attrPath": [ + "openblasCompat" + ] + }, + "openssl": { + "attrPath": [ + "openssl" + ] + }, + "orte": { + "attrPath": [ + "openmpi" + ] + }, + "panel": { + "attrPath": [ + "ncurses" + ] + }, + "panelw": { + "attrPath": [ + "ncurses" + ] + }, + "pangocairo": { + "attrPath": [ + "pango" + ] + }, + "poppler-glib": { + "attrPath": [ + "poppler_gi" + ] + }, + "pthread": { + "attrPath": null + }, + "python": { + "attrPath": [ + "python3" + ] + }, + "ruby-2.7": { + "attrPath": [ + "ruby_2_7" + ] + }, + "ruby-3.0": { + "attrPath": [ + "ruby_3_0" + ] + }, + "ruby-3.1": { + "attrPath": [ + "ruby_3_1" + ] + }, + "sdl2": { + "attrPath": [ + "SDL2" + ] + }, + "sndfile": { + "attrPath": [ + "libsndfile" + ] + }, + "sqlite3": { + "attrPath": [ + "sqlite" + ] + }, + "taglib": { + "attrPath": [ + "taglib" + ] + }, + "taglib_c": { + "attrPath": [ + "taglib" + ] + }, + "tdjson": { + "attrPath": [ + "tdlib" + ] + }, + "tensorflow": { + "attrPath": [ + "libtensorflow" + ] + }, + "uuid": { + "attrPath": [ + "libossp_uuid" + ] + }, + "vte-2.91": { + "attrPath": [ + "vte" + ] + }, + "wayland-client": { + "attrPath": [ + "wayland" + ] + }, + "wayland-cursor": { + "attrPath": [ + "wayland" + ] + }, + "wayland-scanner": { + "attrPath": [ + "wayland" + ] + }, + "wayland-server": { + "attrPath": [ + "wayland" + ] + }, + "webkit2gtk-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "webkit2gtk-web-extension-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "x11": { + "attrPath": [ + "xorg", + "libX11" + ] + }, + "xau": { + "attrPath": [ + "xorg", + "libXau" + ] + }, + "xcursor": { + "attrPath": [ + "xorg", + "libXcursor" + ] + }, + "xerces-c": { + "attrPath": [ + "xercesc" + ] + }, + "xext": { + "attrPath": [ + "xorg", + "libXext" + ] + }, + "xft": { + "attrPath": [ + "xorg", + "libXft" + ] + }, + "xi": { + "attrPath": [ + "xorg", + "libXi" + ] + }, + "xinerama": { + "attrPath": [ + "xorg", + "libXinerama" + ] + }, + "xkbcommon": { + "attrPath": [ + "libxkbcommon" + ] + }, + "xpm": { + "attrPath": [ + "xorg", + "libXpm" + ] + }, + "xrandr": { + "attrPath": [ + "xorg", + "libXrandr" + ] + }, + "xrender": { + "attrPath": [ + "xorg", + "libXrender" + ] + }, + "xscrnsaver": { + "attrPath": [ + "xorg", + "libXScrnSaver" + ] + }, + "xtst": { + "attrPath": [ + "xorg", + "libXtst" + ] + }, + "xxf86vm": { + "attrPath": [ + "xorg", + "libXxf86vm" + ] + }, + "yaml-0.1": { + "attrPath": [ + "libyaml" + ] + }, + "zlib": { + "attrPath": [ + "zlib" + ] + } + } +} From 09eb09b9c50d4f44082a7843b1222bfbaa2d7887 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 29 Jan 2023 08:37:51 +0100 Subject: [PATCH 25/59] pkg-config-data.json: Encode platform support --- pkgs/top-level/pkg-config-packages.nix | 29 +++++++------ .../top-level/pkg-config/pkg-config-data.json | 42 +++++++++++++++---- 2 files changed, 48 insertions(+), 23 deletions(-) diff --git a/pkgs/top-level/pkg-config-packages.nix b/pkgs/top-level/pkg-config-packages.nix index 8d428cfb2182..b5cda4939156 100644 --- a/pkgs/top-level/pkg-config-packages.nix +++ b/pkgs/top-level/pkg-config-packages.nix @@ -13,34 +13,33 @@ pkgs: let inherit (pkgs) lib; inherit (lib) + all flip mapAttrs + mapAttrsToList getAttrFromPath importJSON ; - result = modulePkgs // overrides; - data = importJSON ./pkg-config/pkg-config-data.json; inherit (data) modules; + platform = pkgs.stdenv.hostPlatform; + + isSupported = moduleData: + moduleData?supportedWhenPlatformAttrsEqual -> + all (x: x) ( + mapAttrsToList + (k: v: platform?${k} && platform.${k} == v) + moduleData.supportedWhenPlatformAttrsEqual + ); + modulePkgs = flip mapAttrs modules (_moduleName: moduleData: - if moduleData?attrPath then + if moduleData?attrPath && isSupported moduleData then getAttrFromPath moduleData.attrPath pkgs else null ); - overrides = { - hidapi = if pkgs.stdenv.isDarwin then pkgs.hidapi else null; - hidapi-hidraw = if pkgs.stdenv.isDarwin then null else pkgs.hidapi; - hidapi-libusb = if pkgs.stdenv.isDarwin then null else pkgs.hidapi; - libpulse-mainloop-glib = if pkgs.stdenv.isDarwin then null else pkgs.libpulseaudio; - wayland-client = if pkgs.stdenv.isDarwin then null else pkgs.wayland; - wayland-cursor = if pkgs.stdenv.isDarwin then null else pkgs.wayland; - egl = if pkgs.stdenv.isDarwin then null else pkgs.libGL; - wayland-server = if pkgs.stdenv.isDarwin then null else pkgs.wayland; - }; - in - result + modulePkgs diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 55036d91fce8..c0b6e49b48a0 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -180,7 +180,10 @@ "egl": { "attrPath": [ "libGL" - ] + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } }, "fftw3": { "attrPath": [ @@ -350,17 +353,28 @@ ] }, "hidapi": { - "attrPath": null + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": true + } }, "hidapi-hidraw": { "attrPath": [ "hidapi" - ] + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } }, "hidapi-libusb": { "attrPath": [ "hidapi" - ] + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } }, "icu-i18n": { "attrPath": [ @@ -525,7 +539,10 @@ "libpulse-mainloop-glib": { "attrPath": [ "libpulseaudio" - ] + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } }, "libpulse-simple": { "attrPath": [ @@ -811,12 +828,18 @@ "wayland-client": { "attrPath": [ "wayland" - ] + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } }, "wayland-cursor": { "attrPath": [ "wayland" - ] + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } }, "wayland-scanner": { "attrPath": [ @@ -826,7 +849,10 @@ "wayland-server": { "attrPath": [ "wayland" - ] + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } }, "webkit2gtk-4.0": { "attrPath": [ From 811bf8ade022b34148a5b71242ca1a713865c7fa Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 29 Jan 2023 08:41:23 +0100 Subject: [PATCH 26/59] pkg-config-data.json: Add version --- pkgs/top-level/pkg-config/pkg-config-data.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index c0b6e49b48a0..ba8d6e7b821e 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -1,4 +1,8 @@ { + "version": { + "major": 0, + "minor": 1 + }, "modules": { "IL": { "attrPath": [ From 3be7ea8c891b3209e92e961fe689649fb0333bcc Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 29 Jan 2023 08:54:13 +0100 Subject: [PATCH 27/59] top-level/pkg-config: Make tests easy to find --- pkgs/test/default.nix | 17 +-------------- pkgs/top-level/all-packages.nix | 2 +- .../defaultPkgConfigPackages.nix} | 2 +- .../test-defaultPkgConfigPackages.nix} | 2 ++ pkgs/top-level/pkg-config/tests.nix | 21 +++++++++++++++++++ 5 files changed, 26 insertions(+), 18 deletions(-) rename pkgs/top-level/{pkg-config-packages.nix => pkg-config/defaultPkgConfigPackages.nix} (95%) rename pkgs/{test/pkg-config-packages.nix => top-level/pkg-config/test-defaultPkgConfigPackages.nix} (97%) create mode 100644 pkgs/top-level/pkg-config/tests.nix diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 72b22f7f6865..39039c5950e4 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -51,22 +51,7 @@ with pkgs; php = recurseIntoAttrs (callPackages ./php {}); - defaultPkgConfigPackages = - let - # defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform - # in order to filter out the unsupported packages without throwing any errors - # tryEval would be too fragile, masking different problems as if they're - # unsupported platform problems. - allPkgs = import ../top-level { - system = pkgs.stdenv.hostPlatform.system; - localSystem = pkgs.stdenv.hostPlatform.system; - config = { - allowUnsupportedSystem = true; - }; - overlays = []; - }; - in - allPkgs.callPackage ./pkg-config-packages.nix { }; + pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }); rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cde388312abf..1638192c33df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -112,7 +112,7 @@ with pkgs; tests = callPackages ../test {}; - defaultPkgConfigPackages = import ./pkg-config-packages.nix pkgs; + defaultPkgConfigPackages = import ./pkg-config/defaultPkgConfigPackages.nix pkgs; ### Nixpkgs maintainer tools diff --git a/pkgs/top-level/pkg-config-packages.nix b/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix similarity index 95% rename from pkgs/top-level/pkg-config-packages.nix rename to pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix index b5cda4939156..b3cf3cdca2fc 100644 --- a/pkgs/top-level/pkg-config-packages.nix +++ b/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix @@ -21,7 +21,7 @@ let importJSON ; - data = importJSON ./pkg-config/pkg-config-data.json; + data = importJSON ./pkg-config-data.json; inherit (data) modules; platform = pkgs.stdenv.hostPlatform; diff --git a/pkgs/test/pkg-config-packages.nix b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix similarity index 97% rename from pkgs/test/pkg-config-packages.nix rename to pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix index 8cb6cc57753f..e34e1435c3c5 100644 --- a/pkgs/test/pkg-config-packages.nix +++ b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -1,3 +1,5 @@ +# cd nixpkgs +# nix-build -A tests.pkg-config.defaultPkgConfigPackages { lib, pkg-config, defaultPkgConfigPackages, runCommand }: let inherit (lib.strings) escapeNixIdentifier; diff --git a/pkgs/top-level/pkg-config/tests.nix b/pkgs/top-level/pkg-config/tests.nix new file mode 100644 index 000000000000..bcc8e7b4ee3e --- /dev/null +++ b/pkgs/top-level/pkg-config/tests.nix @@ -0,0 +1,21 @@ +# cd nixpkgs +# nix-build -A tests.pkg-config +{ lib, stdenv, ... }: + +let + # defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform + # in order to filter out the unsupported packages without throwing any errors + # tryEval would be too fragile, masking different problems as if they're + # unsupported platform problems. + allPkgs = import ../default.nix { + system = stdenv.hostPlatform.system; + localSystem = stdenv.hostPlatform.system; + config = { + allowUnsupportedSystem = true; + }; + overlays = []; + }; +in +lib.recurseIntoAttrs { + defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { }; +} From 974d331e14318ba27a37874763db0bf32162f1aa Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 29 Jan 2023 08:56:14 +0100 Subject: [PATCH 28/59] pkg-config-data.json: Remove m and pthread These aren't actually pkg-config packages, but packages that happen to be in cabal2nix's mapping for cabal reasons. They do not belong in this file. --- pkgs/top-level/pkg-config/pkg-config-data.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index ba8d6e7b821e..61ed9098b919 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -633,9 +633,6 @@ "zeromq" ] }, - "m": { - "attrPath": null - }, "menu": { "attrPath": [ "ncurses" @@ -761,9 +758,6 @@ "poppler_gi" ] }, - "pthread": { - "attrPath": null - }, "python": { "attrPath": [ "python3" From 18cc5e1818f205ffa857eac684dedce10bce575f Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 29 Jan 2023 17:00:15 +0100 Subject: [PATCH 29/59] ddcutil: 1.3.2 -> 1.4.1 --- pkgs/tools/misc/ddcutil/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 7bf751652d4e..898f7aefabfe 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , autoreconfHook , pkg-config , glib @@ -15,11 +15,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.3.2"; + version = "1.4.1"; - src = fetchurl { - url = "http://www.ddcutil.com/tarballs/${pname}-${version}.tar.gz"; - sha256 = "sha256-vZI7OquGjZ0koArdOWKkfFtfRzCvtXm8lGFCUklloEI="; + src = fetchFromGitHub { + owner = "rockowitz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-y3mubdInYa4gpxhdw2JcRhnhd12O7jNq/oF3qoP82LU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 6b4b96e68589414dee2724e14ebc352954c86616 Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:26:57 -0800 Subject: [PATCH 30/59] craftos-pc: 2.6.6 -> 2.7.3 Changelog: https://github.com/MCJack123/craftos2/releases/tag/v2.7.3 --- pkgs/applications/emulators/craftos-pc/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index d2668c473a62..1de8fd3c3a3d 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -14,29 +14,30 @@ }: let + version = "2.7.3"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; - rev = "v2.6.6"; - sha256 = "cCXH1GTRqJQ57/6sWIxik366YBx/ii3nzQwx4YpEh1w="; + rev = "v${version}"; + sha256 = "sha256-lMqYfSA3sI7+glRE+eUf03uLfbf7lipmoqgt74FUaJQ="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v2.6.6"; - sha256 = "VzIqvf83k121DxuH5zgZfFS9smipDonyqqhVgj2kgYw="; + rev = "v${version}"; + sha256 = "sha256-t76Yltx7vHNoAAFvNpYLKuwFja4On6M20upmG6w3C1M="; }; in stdenv.mkDerivation rec { pname = "craftos-pc"; - version = "2.6.6"; + inherit version; src = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "9lpAWYFli3/OBfmu2dQxKi+/TaHaBQNpZsCURvl0h/E="; + sha256 = "sha256-a7oMLfjZUkEWPjxDDywlSW4qLhcQrCXPPY2BEOgiafU="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; From fb8cf494a107f4a899cc3fd2aee054317bd0336c Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:30:05 -0800 Subject: [PATCH 31/59] craftos-pc: Add tomodachi94 to maintainers --- pkgs/applications/emulators/craftos-pc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 1de8fd3c3a3d..202d49c19add 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://www.craftos-pc.cc"; license = with licenses; [ mit free ]; platforms = platforms.linux; - maintainers = [ maintainers.siraben ]; + maintainers = with maintainers; [ siraben tomodachi94 ]; mainProgram = "craftos"; }; } From 89a0a924743ec4b7de365ab1e03fc0520ecaa0a2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 29 Jan 2023 23:14:26 +0100 Subject: [PATCH 32/59] mpich: 4.0.3 -> 4.1 --- pkgs/development/libraries/mpich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 14dddf1f29fd..c4d26e009275 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.0.3"; + version = "4.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-F0BuqQpu1OzVvjnJ3cv6yTQ+arT3esToxevko+O2xQE="; + sha256 = "sha256-ix7GO8RMfKoq+7RXvFs81KcNvka6unABI9Z8SNxatqA="; }; configureFlags = [ From e81afd887eff1be3648ed051ceced90792728ed7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 22:37:35 +0000 Subject: [PATCH 33/59] python310Packages.getmac: 0.8.3 -> 0.9.1 --- pkgs/development/python-modules/getmac/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 96f540088dc6..ecc9760ae36e 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "getmac"; - version = "0.8.3"; + version = "0.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "GhostofGoes"; repo = pname; - rev = version; - sha256 = "sha256-X4uuYisyobCxhoywaSXBZjVxrPAbBiZrWUJAi2/P5mw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-U04mtg7DCC78X5Fd0wGaHrf8XkUpDLi4+ctKCyR4dKg="; }; nativeCheckInputs = [ From 473ac9692e09451ef6025e50ccfa19efe5ae69a9 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 29 Jan 2023 23:39:27 +0100 Subject: [PATCH 34/59] lib.hydraJob: Tolerate null By allowing null, we allow code to avoid filterAttrs, improving laziness in real world use cases. Specifically, this strategy prevents infinite recursion errors, performance issues and possibly other errors that are unrelated to the user's code. --- lib/customisation.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 101c9e62b9e6..42d711cf5fb9 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -252,7 +252,8 @@ rec { outputsList = map makeOutput outputs; drv' = (lib.head outputsList).value; - in lib.deepSeq drv' drv'; + in if drv == null then null else + lib.deepSeq drv' drv'; /* Make a set of packages with a common scope. All packages called with the provided `callPackage` will be evaluated with the same From f192e96d0771a9c8fa8e8c73e6ef66af56a548f8 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 29 Jan 2023 09:01:14 +0100 Subject: [PATCH 35/59] tests.defaultPkgConfigPackages: Add recurseIntoAttrs --- pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix index e34e1435c3c5..ba0e89438089 100644 --- a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix +++ b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -80,4 +80,4 @@ let fi ''; in - allTests // { inherit tests-combined; } + lib.recurseIntoAttrs allTests // { inherit tests-combined; } From b6bec17eb9b8f256151c396282ad76db255fff91 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 29 Jan 2023 09:27:29 +0100 Subject: [PATCH 36/59] testers.hasPkgConfigModule: Extract and add tests, docs --- doc/builders/testers.chapter.md | 13 +++++ pkgs/build-support/testers/default.nix | 2 + .../testers/hasPkgConfigModule/tester.nix | 47 +++++++++++++++++++ .../testers/hasPkgConfigModule/tests.nix | 36 ++++++++++++++ pkgs/build-support/testers/test/default.nix | 2 + .../test-defaultPkgConfigPackages.nix | 42 +---------------- 6 files changed, 102 insertions(+), 40 deletions(-) create mode 100644 pkgs/build-support/testers/hasPkgConfigModule/tester.nix create mode 100644 pkgs/build-support/testers/hasPkgConfigModule/tests.nix diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index 3d91f096051e..a0f0f97f9d53 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -1,6 +1,19 @@ # Testers {#chap-testers} This chapter describes several testing builders which are available in the testers namespace. +## `hasPkgConfigModule` {#tester-hasPkgConfigModule} + +Checks whether a package exposes a certain `pkg-config` module. + +Example: + +```nix +passthru.tests.pkg-config = testers.hasPkgConfigModule { + package = finalAttrs.finalPackage; + moduleName = "libfoo"; +} +``` + ## `testVersion` {#tester-testVersion} Checks the command output contains the specified version diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 6ab0ee843cb0..15694162edde 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -121,4 +121,6 @@ in nixosTesting.simpleTest calledTest; + hasPkgConfigModule = callPackage ./hasPkgConfigModule/tester.nix { }; + } diff --git a/pkgs/build-support/testers/hasPkgConfigModule/tester.nix b/pkgs/build-support/testers/hasPkgConfigModule/tester.nix new file mode 100644 index 000000000000..c8342cdd5c3b --- /dev/null +++ b/pkgs/build-support/testers/hasPkgConfigModule/tester.nix @@ -0,0 +1,47 @@ +# Static arguments +{ runCommand, pkg-config }: + +# Tester arguments +{ package, + moduleName, + testName ? "check-pkg-config-${moduleName}", +}: + +runCommand testName { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ package ]; + inherit moduleName; + meta = { + description = "Test whether ${package.name} exposes pkg-config module ${moduleName}"; + } + # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org, + # as hydra can't check this meta info in dependencies. + # The test itself is just Nixpkgs, with MIT license. + // builtins.intersectAttrs + { + available = throw "unused"; + broken = throw "unused"; + insecure = throw "unused"; + license = throw "unused"; + maintainers = throw "unused"; + platforms = throw "unused"; + unfree = throw "unused"; + unsupported = throw "unused"; + } + package.meta; + } '' + echo "checking pkg-config module $moduleName in $buildInputs" + set +e + version="$(pkg-config --modversion $moduleName)" + r=$? + set -e + if [[ $r = 0 ]]; then + echo "✅ pkg-config module $moduleName exists and has version $version" + echo "$version" > $out + else + echo "These modules were available in the input propagation closure:" + pkg-config --list-all + echo "❌ pkg-config module $moduleName was not found" + false + fi + '' diff --git a/pkgs/build-support/testers/hasPkgConfigModule/tests.nix b/pkgs/build-support/testers/hasPkgConfigModule/tests.nix new file mode 100644 index 000000000000..8005c3f93709 --- /dev/null +++ b/pkgs/build-support/testers/hasPkgConfigModule/tests.nix @@ -0,0 +1,36 @@ +# cd nixpkgs +# nix-build -A tests.testers.hasPkgConfigModule +{ lib, testers, zlib, runCommand }: + +lib.recurseIntoAttrs { + + zlib-has-zlib = testers.hasPkgConfigModule { + package = zlib; + moduleName = "zlib"; + }; + + zlib-does-not-have-ylib = runCommand "zlib-does-not-have-ylib" { + failed = testers.testBuildFailure ( + testers.hasPkgConfigModule { + package = zlib; + moduleName = "ylib"; + } + ); + } '' + echo 'it logs a relevant error message' + { + grep -F "pkg-config module ylib was not found" $failed/testBuildFailure.log + } + + echo 'it logs which pkg-config modules are available, to be helpful' + { + # grep -v: the string zlib does also occur in a store path in an earlier message, which isn't particularly helpful + grep -v "checking pkg-config module" < $failed/testBuildFailure.log \ + | grep -F "zlib" + } + + # done + touch $out + ''; + +} diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index 0a5381b2b738..313c556737fb 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -12,6 +12,8 @@ let in lib.recurseIntoAttrs { + hasPkgConfigModule = pkgs.callPackage ../hasPkgConfigModule/tests.nix { }; + # Check that the wiring of nixosTest is correct. # Correct operation of the NixOS test driver should be asserted elsewhere. nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, pkgs, figlet, ... }: { diff --git a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix index ba0e89438089..37687117987d 100644 --- a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix +++ b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -1,6 +1,6 @@ # cd nixpkgs # nix-build -A tests.pkg-config.defaultPkgConfigPackages -{ lib, pkg-config, defaultPkgConfigPackages, runCommand }: +{ lib, pkg-config, defaultPkgConfigPackages, runCommand, testers }: let inherit (lib.strings) escapeNixIdentifier; @@ -39,45 +39,7 @@ let else if pkg.meta.broken then null - else makePkgConfigTest moduleName pkg; + else testers.hasPkgConfigModule { inherit moduleName; package = pkg; }; - makePkgConfigTest = moduleName: pkg: runCommand "check-pkg-config-${moduleName}" { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pkg ]; - inherit moduleName; - meta = { - description = "Test whether ${pkg.name} exposes pkg-config module ${moduleName}"; - } - # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org, - # as hydra can't check this meta info in dependencies. - # The test itself is just Nixpkgs, with MIT license. - // builtins.intersectAttrs - { - available = throw "unused"; - broken = throw "unused"; - insecure = throw "unused"; - license = throw "unused"; - maintainers = throw "unused"; - platforms = throw "unused"; - unfree = throw "unused"; - unsupported = throw "unused"; - } - pkg.meta; - } '' - echo "checking pkg-config module $moduleName in $buildInputs" - set +e - version="$(pkg-config --modversion $moduleName)" - r=$? - set -e - if [[ $r = 0 ]]; then - echo "✅ pkg-config module $moduleName exists and has version $version" - echo "$version" > $out - else - echo "These modules were available in the input propagation closure:" - pkg-config --list-all - echo "❌ pkg-config module $moduleName was not found" - false - fi - ''; in lib.recurseIntoAttrs allTests // { inherit tests-combined; } From d8a217801e21d561e47a91ea60ec086397fc7466 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 30 Jan 2023 00:38:16 +0100 Subject: [PATCH 37/59] defaultPkgConfigPackages: Add dontRecurseIntoAttrs --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1638192c33df..e9347a08d646 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -112,7 +112,11 @@ with pkgs; tests = callPackages ../test {}; - defaultPkgConfigPackages = import ./pkg-config/defaultPkgConfigPackages.nix pkgs; + defaultPkgConfigPackages = + # We don't want nix-env -q to enter this, because all of these are aliases. + dontRecurseIntoAttrs ( + import ./pkg-config/defaultPkgConfigPackages.nix pkgs + ); ### Nixpkgs maintainer tools From 6109617190bcd944636ab9b52f8d9741be8ac8d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Jan 2023 00:25:43 +0000 Subject: [PATCH 38/59] firefox-beta-bin-unwrapped: 110.0b5 -> 110.0b7 --- .../browsers/firefox-bin/beta_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 28e84e2b3421..5c987bb22543 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "110.0b5"; + version = "110.0b7"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ach/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ach/firefox-110.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "5faba52087f38e86cade09d6565892e3f152af90e5dabc7e38ac0cf1eca0b373"; + sha256 = "92b620e6ab603758a48f1ebb1a860675f4034e994e15c8eb260f838f65eef0b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/af/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/af/firefox-110.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "43503068dc19572d95db53fabea57866375aa820f5bfb2575faf0a0a512f8ce7"; + sha256 = "f20e60796b489b2a4755708fdebf430e4d436ff9710ac5bbb0f7311b8b3479f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/an/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/an/firefox-110.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "17f2a72a9c053c734b047cdad54da987e0a6a1261182b67ea9ac3bf45fbe1379"; + sha256 = "087a34a9354d6150f0fd4363a3b848389f5f069b57bdb0314f6c588e111abadf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ar/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ar/firefox-110.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "78d6e0416d43dfc810ad86e1ba09adf49c0f256f0989400a51579c3f1b209bb7"; + sha256 = "bb3146c66f6ce2850cb987495f83b606bda37d60f6426485d7fe495070e79a15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ast/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ast/firefox-110.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "cc0ce2c002104e58a388ebdf040b3eb3fa14ac5d99500a4e552c19b6084b8e45"; + sha256 = "93e455dcaf9b03b427035a9f0d0bee7806c2497896bac44605eddb60c759881e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/az/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/az/firefox-110.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "7d40a1bd08a46933bcb9a9078f345a70229fbf95fc8401475ad4226428a2dd11"; + sha256 = "7b557d4ebf83e252aaf19e70fea793d3cc4bf73c9f2510bd2a2abe3a63440b40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/be/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/be/firefox-110.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "43cf22f0ba69b95b546e59b624bc131c90a3486685970ca86c967f96f6c10f16"; + sha256 = "f8b8e8fe66d5cf2d747e331b2d0b1fd2720c7bebcf3dbd6142e3efbde0ea8acf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/bg/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/bg/firefox-110.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "4a18ebe443058330656224082276e0f55593b00c7c7c06fc705d5d70dada4c1f"; + sha256 = "fda68c558eb5f70ff7ac0f5cb564c7492144b779b9eb94cdbf550c70542e3496"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/bn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/bn/firefox-110.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "d0daabd0d00bbdbd61abf5c83a16ca27a696b2a1270c568008965b16b9aaa382"; + sha256 = "4c1b0b87706625cc65c2d060c04eed441f009f75ebe6f6c781f935caf191983e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/br/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/br/firefox-110.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2331eb31f1946e6f24de07c00731a6cd4fead2bbb8cc5f284b53f865d51b7319"; + sha256 = "ccd26c778dbe49ad3d63d4ae9e36f9476e046e57d29478bc6c5fd4459949ad3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/bs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/bs/firefox-110.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "4c5d13bc01951bcb2b449401fe4e162d1a1ac2c9fce2f67bd1b7f6d31a7de7a3"; + sha256 = "7528eb97210348d167c11ef7816c12f1324f11d3f2109c96a6be908442d5b186"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ca-valencia/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ca-valencia/firefox-110.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "86852bce8c63622fa496aa91bb552bf8534e5480e12b51fb464e77ed72ece3aa"; + sha256 = "ca2f352ff998355404dd21c45478257e481fc25ae5490060c781181bc260f60d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ca/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ca/firefox-110.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "417d3c22d17f6d26513628d481bc59bc0301d41f9f2a1da4164faa8e5233e6ef"; + sha256 = "4b8c2be81e6aee03987a126d44f647d7d681d53190d61c9dd6199323f6d4414c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/cak/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/cak/firefox-110.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "13d31e6c75fcf72d6c0febe984288dd2b6846ca3e8bab12b302f490b35bb5c64"; + sha256 = "f44cabf1d06ecd47b49e071cbe9be1863ca9e171c5d45ccc37e45ff741d26336"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/cs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/cs/firefox-110.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "9b1637f815fb2edfc4c240d562624934375c45ae3d990d6de1b3606282e42406"; + sha256 = "424c4bcf3a61799f9f5218e44621ed1c910895126538177a572302fdbae01635"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/cy/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/cy/firefox-110.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "16c75ccf745f27df957b106e1c606994526e95b5b413d96766896a47ad96b043"; + sha256 = "471a1ab92ec953428b24f7136ce065fac53ed91df00b9d762116d7d2959ed9c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/da/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/da/firefox-110.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "531f8a44b40b93d8e0f988c9e654e67045683e330a826531dad1867e4e6efdc2"; + sha256 = "ec86bd2ccabc745749f13aa5125411347279db84f275870e606f83afe3c9a32b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/de/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/de/firefox-110.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b3ca2487ebac8be1553ad1a17cf59ae68872a86b7e864a8e06b9dd91267909a3"; + sha256 = "323d3ae9bfe4c14a7e1bfc93ceb6416e7716583d9556848b9a9a88730e085f86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/dsb/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/dsb/firefox-110.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e406e570d40156d30662f02589962304ee03b6ea2e6455e5522186d98085b592"; + sha256 = "04392a0ce88feb26e2447d013c8504ed228ca77aeaf4909e2cb38a70998ad576"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/el/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/el/firefox-110.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "bb90e349c3faf700626052109c2407e23f06ca60c00c37d2ae903e6bd7675b52"; + sha256 = "7dac7a1393def3a3e24ef5f1c51c40d226cf77b9a1f77b33bcae39ad4b422db4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/en-CA/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/en-CA/firefox-110.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "445e3b76d018094303fc0ef1ec53d0c53f9d792a0d7e62284734a9555afa5664"; + sha256 = "baa9a459c7686ea2c6ed74d976fef6bf00af83fa2ad71c0b644a60cb8c5db2ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/en-GB/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/en-GB/firefox-110.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f4acb943b8afe0d0ae302a918b2cfafac83474a46b6fde40ddc01d6470016316"; + sha256 = "54b25f31e8292b56a360cf36550d7263c916adbe835c831434f11ed931e0d5d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/en-US/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/en-US/firefox-110.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "8f9587d6a66ba0f20f0b47e148990fcce40bfc0fba45a484404636f80ca8fd71"; + sha256 = "ffd6f0fe0cd9dceeeff8b5a7373de41849896706d2856a8c89d39e546594fb8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/eo/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/eo/firefox-110.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "4bf28f6b65949df3cd977c235cfadac83a976ace0dea490e69074ace18ecddb8"; + sha256 = "ea02d09fc67b6bd3468c04a8d72b9927f905a396211b584203530847bca57540"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/es-AR/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/es-AR/firefox-110.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3e038bb8e6a2ab714babe0e399a6b4f2a9b86cd981af184cc7edc8e49a2b2019"; + sha256 = "651111ca6dd6b83fc10d5d72d17144b1ba496531b4fa5820bed51af344b6aff8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/es-CL/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/es-CL/firefox-110.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3de9bed4ee2c8fb0977adcf0f426fb4aa274f197d963424d81a079fa9feece2f"; + sha256 = "45a45b30dd8b4a2edf7f0b497a47dfdb3b0e07aa8aa59d8be77d1a1a398f2147"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/es-ES/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/es-ES/firefox-110.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "01309cf1f4281ccb0a6165e95e46d2177d953298493e65266c5f8846b54b82f1"; + sha256 = "f6fdbf3e3feb70e3e69f19645544726e79a50462040ab91892c18522d41c1c42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/es-MX/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/es-MX/firefox-110.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "76904d409670943141977850bcc3c5aba346295cf5b351b8216cf7da9c3f7f3a"; + sha256 = "77ce45e0cfe689de99fc91d4a16e0fd442a42b19fd3606fb67b1213050686fe3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/et/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/et/firefox-110.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e24aced26a31f26aa6bd6527f9f454aefeaf08b77dab3436c051753b4dc8a50d"; + sha256 = "56a0d02ce080d1e3dc67a44f39cd96f8aa8238077482dd52a8e3d6648c8acb4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/eu/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/eu/firefox-110.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "458b90ecf2d8f82a776a39e3148b1e03800e3769e22cfb6d936ea97ca4691b24"; + sha256 = "340e9353f49de3ea88da3e861f184a2d4ebb6aae6031b0b475afd6bcecc0157e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/fa/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/fa/firefox-110.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ef96d01db6c973c7923b5062004ef78f73a5b9284bacd0f7c952b80ad9d21572"; + sha256 = "d2588f3ea6d97253f1a8718cc95399ec1222fef5826547522846c01023616ea1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ff/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ff/firefox-110.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b22e267c88159fd2dac1899e5f8e89109ab856852bcd14a4b0559d66df0e52ec"; + sha256 = "c469ec84c739b7e865a116a3a3ad746c165eac531cb0c18c203fc1c634e66cac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/fi/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/fi/firefox-110.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "bfa55a101712a9f4d4b350c9adaddd9e840645b10eb7364ffbec7a82108f5a98"; + sha256 = "a4efd03aa334b2d52ce7c504c5a83f7ed3fde2bfa79783e09aeea77ef4b4e032"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/fr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/fr/firefox-110.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "908683b1a4ae48d071c9f31bb3a35cd6db2bc9bcba1bdc7e41836e977701ac2d"; + sha256 = "bb721c623fde67a8438694066301fd2823b56930b0e8972a116c599fdf472e9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/fy-NL/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/fy-NL/firefox-110.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d2829fc8a7c27efc8e4000a9db73a9cb73d3795badde462e0afd129b0a6be15a"; + sha256 = "f9eb091431be5dee981377c6c7d97559f5cfceb2202b46f4f3baa37701c54088"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ga-IE/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ga-IE/firefox-110.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "608addc863b2d83406622f9a184e7fbfe6c3f478f4c73f4f24f6161153b194ea"; + sha256 = "9a99e94cd50ec52d16c777de65b992992f70916a7a188918d942d89afbbf3668"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/gd/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/gd/firefox-110.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4ea66f7148370590fdbffa0b245f0050c895cf3474d35ca0dfde235f9e519cbe"; + sha256 = "2ed55b6dc2f4a24f4bb78ead431652dcd9049ae9907ac37bd8025eca62241a08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/gl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/gl/firefox-110.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ac02858be7499f652831b03a97356007c2881a9bf38bd0a87da3cd36a044e2c8"; + sha256 = "5aa8cb191c29d134d19baa1e3bc4d26d4bcfe7778bcb895f7612165ee74197e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/gn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/gn/firefox-110.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "854480c0026c38f02b14a4c282ed511cc0402afb61d079ca0d9ba81220cd0210"; + sha256 = "94dfa7584da128d2e79c9d4156b24e229cd1146509192b177693e9d315935f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/gu-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/gu-IN/firefox-110.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ec0ae524f8325e1748906be463a5ebb574c557d7e6867a8029c9123b90483604"; + sha256 = "60669f8b91b050d605e80ac2185fda57a8d374c92c30e6dc4281bf7f3b815b25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/he/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/he/firefox-110.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8a4fed02aac861844953e53eba95ab1084fca69410e15537851fd77cc17e8cdd"; + sha256 = "1c34580e1e058a6a3969c000eeb5718895cb74f48de5f8dde78bd9b38c7647f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hi-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hi-IN/firefox-110.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b3c9b57be4b1087a1a1a88aafaef25ca93563eec3788d28783166e2c50433cd2"; + sha256 = "05ae118bcd2ecc6993ef9122b4417c3563713cb2eb217218ddfce97839ae8595"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hr/firefox-110.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ef21e486b5031f6a9eb6d6a61c31447e1a840608bc5c0af824d2f83f567a9e19"; + sha256 = "f46d78482713a7cb29bd8ef33307a3aad5eca15b7c3fb0836b5b8085431daf45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hsb/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hsb/firefox-110.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2a4a2e4994106fb37ed8905c3d996385c595d5cd53781a0e25498756e5a3b497"; + sha256 = "12067c08e4b9f34f58195d1a0ffd7977db696c95990bedc8ea34f67e3fbadcc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hu/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hu/firefox-110.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "cf940a4b06b3405fe90fe93a91cf6ac56e040bdbd16dddc2d4568e32b53846b9"; + sha256 = "1515f75f0219b988e9c78d581179a175e699da6e7706fc8cef730f17acd62397"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hy-AM/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hy-AM/firefox-110.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "68a9fa5a4f50224d275584fcf1a099d4edc6ebf953a945754077c4fc7b573413"; + sha256 = "f8194fed507e073ba5d1bd9988a538f7023c95964e78e742780541ba2a6a8c93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ia/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ia/firefox-110.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "53cfbba2fde705143612f1e55c55635bb559a52f5d0d1010f1984be3bf85c485"; + sha256 = "ee8bba43ce0d4206bec6f418b47375a87d4212a7b8d5d87424561130a6bfe655"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/id/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/id/firefox-110.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6b0169bedea193730b7ca81acc4b9c61ecdc97caf6c047b731e6704146cb271a"; + sha256 = "329f87790197514b1a7b702b55fa0bc851b444f771f8eb573461fce54f83a496"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/is/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/is/firefox-110.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c65ff5834eb4fd15f4230ca161ab1c3ef87c01a3e7481958ae3a18654a21573a"; + sha256 = "940f6e07ea316f1354d032ea49f9d24dd128f3fcb16276427ce0828d01b2bbc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/it/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/it/firefox-110.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "83d35c158003f8b23ecaae75ecd023e17899dfdfca6f237f67564b134c870065"; + sha256 = "cd77be4ab24dd05e32004df01761d61897cc8b873349344fb6e8cba33a9f1c50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ja/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ja/firefox-110.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e8fd34dfb536adde41fb79e9aa47c1c6e74a6e8a74bc654f103a236051cea6b6"; + sha256 = "05ea39fbf1f8f961210d7c0edaa0fcb6906ab5d2adad58e9018e95d1d9b30bd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ka/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ka/firefox-110.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b2163ca337067880a2c063c33f0d98c5e6e807d73d4e227f2bb881f55e1293cb"; + sha256 = "0bdac10f673a073e39e14b2d85cab7047c9e20415ad6747244e62de9389f04f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/kab/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/kab/firefox-110.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "348818c66666d64bfe97c63fe1c2e4581e690e5ba86518b61b46e7884b211e4d"; + sha256 = "3601101bd8b4106609d59ab843a6a55b04c46ad3811ba4e08adb425228ce90ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/kk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/kk/firefox-110.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4730c46c538419c7b1ceaffc201b96d417741f656ea4fe27f600a9ba7223aa4d"; + sha256 = "e131df51351beeec1cebbe06da1a6293d4c6bff33eb75d0d9ae40d01ca486f45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/km/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/km/firefox-110.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "e4e4656c099533585969e300aa142b30768c218f519901098c30757a3f6cc511"; + sha256 = "3bbd68a9dac8a5949daaf98556d4d0a1c2948f932e3f6eae04cc6cbb3d1539c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/kn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/kn/firefox-110.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c19003aac7906191f505bbb9c88ac445be10dd36ca85a20cdb64b271047d33b3"; + sha256 = "7d680235f84143dd580f80349761963b3dbccc31bc1e38c5dc8df8a8210409ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ko/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ko/firefox-110.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "76c33115944c1c4ced46be24fb6abd4831dfd196a0a8c2106bc05199a4b9efa0"; + sha256 = "ef80407630660ca8ab9f0d0406b46c755d0cf78e996ba2f69abbb90b996026fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/lij/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/lij/firefox-110.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "1f2f8475f83b174c7111a8c17c51b24376ed3fdab8ab1b36cbce6f98a3861225"; + sha256 = "d9d2525745a262300f7d650e28e0bf1ea22aea28c6359f5d0af093ee8a4e3ab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/lt/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/lt/firefox-110.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1327ef1d3304ef21cd7ad7b1ba15e302999ebac6615d34b600d77d1e9d5d2593"; + sha256 = "5020f41d503258fe25cba1feba4ce079b365cc05446bec561083507599f08127"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/lv/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/lv/firefox-110.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "fd0f80a932e58f4ea45cb4e847c9d4afcb519fa354bccba3862f937d74a77d1d"; + sha256 = "4b88c5fecbc4cab7f741b55cec75cf6442b142632469efe8e00a424a4d86695e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/mk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/mk/firefox-110.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "f0826813288a764460a403e512d9f4b25d5d3c23069e0ae6e5abc2f04a69c966"; + sha256 = "10f54c0c1ac4df041fec2f1f014491eb18e564dac4226127bf699b49ee2f1a18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/mr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/mr/firefox-110.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "6659308b97de101a7264d867e165d63044e8dff6009e472dddf41f32757f5ce8"; + sha256 = "3666ba4c4662d07cae1fff56da955990c64b8569066e15bca1323598099d4648"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ms/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ms/firefox-110.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0274ea11012c19d2b36ad8106457ce3c35fb6b52d305d659a9c05991e6463a5d"; + sha256 = "436263d531bba64f556f38afd86468adb4e496611504f5a3698cc5b2febf430e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/my/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/my/firefox-110.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "05035a9d31dab8069743b052cbb02807398b08719de321f09048255e9bde3de2"; + sha256 = "54f399a622cb8273fdb32b53b759f3b4465a4bd81ca89e5810315846c8443e23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/nb-NO/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/nb-NO/firefox-110.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "98ed94dd476474afc6aa45932236c41c5349c766ffca48dd109bb3235c586551"; + sha256 = "3e5392688830c8fa7c129c79619efc8da24dc6ed98708f019c1c66fc8dd29a12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ne-NP/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ne-NP/firefox-110.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "9091b6d5e2aa5d494dfaccc3b18b116fbf4452235e638db73350847c880afbbe"; + sha256 = "adebf0d50f0829d872b6072d6e004fbef29e0433674ad51d9f4dc589bb8d8df3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/nl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/nl/firefox-110.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "87cef9ce2532b86a9a65738bd8ddd3c748d1ab45a5da8014edccc1f68a479b64"; + sha256 = "66b2db5baef45dc7db2a8b8561913e8efc052ff1370da778f714d4d14da1acf7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/nn-NO/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/nn-NO/firefox-110.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "97fc45ffd9f4f4d0e63ff32459465f760fe69cc81ca1cbca05b909f480cc1acd"; + sha256 = "3421744a83f405e528190596c3ae3abeaa43bf4a1b59e33246783c1ef9a9ab70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/oc/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/oc/firefox-110.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9644f2ddc7339a502dcf87fb12034d770e7be3befae95f82ef814f3a90093545"; + sha256 = "ae30959bfea5d80701e666bb6960ed1550046e4da36ebf8fa136db0021ef6021"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/pa-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/pa-IN/firefox-110.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a6bb7be95f0043bd387c9bc1a4e2587d5ad2d7960c67b96a198bc28d94a5301a"; + sha256 = "b7210a8df3f53bdca8a69e6c7492bfdd8485371e4d8d3ec5110467ff613b48f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/pl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/pl/firefox-110.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4ad7a2de09c61cd33dca2f69b28d1ad7cfb7cc55bea727a683f5fe1f8441ff84"; + sha256 = "08b657a39414bf6be79961489075b37ba1c561d1a6d9198f5923d418599ca5ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/pt-BR/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/pt-BR/firefox-110.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "285c0e2767589dca92ceaaee2ee768f4ca3293425f4043d6f80f48eb748b9f51"; + sha256 = "ca698a71e4d375acce90f9215fbf0a9b7faa2323d58e4bf89b13abeb7a3b9220"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/pt-PT/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/pt-PT/firefox-110.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "de1f9fa9682f1b4c810182761aace0216b7e0302354d3540987e04621e35c697"; + sha256 = "492d61314ea59aea023e5738bc7ee849f47a745e41b3093b91c7d929e35658a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/rm/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/rm/firefox-110.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4c49a5a412791da4593634642682eeaa2c641a3159d9f44942f9c677548a1fcf"; + sha256 = "97b9bdbe16d9fa67d74a834867f9df0958022e6d65f83757cdbe7194b0f025ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ro/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ro/firefox-110.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f92be652337f35d0a58e0ecc59ab207425a42e92ce033ef89faadb120f2f3fca"; + sha256 = "df3bc82768768bc35f73a4d14aaa7dcb4c5bfd6238176a9ed82149a700de679f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ru/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ru/firefox-110.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "4134cb7d42c7c2c96dbb0e8e2836ef6be4d3532107c8a29664a90ab71366a723"; + sha256 = "879792662def74af3ad11b8b9c44c0b7bd822e883c338124f7dcb0a11e6d225f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sco/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sco/firefox-110.0b7.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "407d8057ba130a7918e513cec48ca56e0034ceeb2684cc769174052c08349e1c"; + sha256 = "3e592ef8306d7cc157122e723fb03503b6bb7fb5884e37d6abd39f03afd38a95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/si/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/si/firefox-110.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3e05c77abb34ad4c14300b864d5e12d929049cd688ef2f5b5b4372f18a6becd1"; + sha256 = "076ca9ea7d32a2fe67f854dbd87902a7c5154c2ac3132ced57864e60e14fd254"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sk/firefox-110.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6cbe096aaba3195ed73b5a6df23a96e05e0d505cdc1930c4f3dfcf3afacc6e15"; + sha256 = "bc3af5564f432ce4399aca59b0861fdf54d2725ab32ee6b3a998915ebbf9f0b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sl/firefox-110.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "db6f60c01d83d70e0c32de9f13cb2296846856c342fba1cd2edca43cf2a6dbb8"; + sha256 = "f965c9735c3468d5830554a51a78c329769ff922fa5d90945bad776710452d1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/son/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/son/firefox-110.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3175585c37ea553850c23d4c8b23193f06d083dca3b98ee25f15c35891eacd2a"; + sha256 = "901942b73373c6b89e7a278a5f2b3a8bf88220bbd4fb77ab86454ead0a43e090"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sq/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sq/firefox-110.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "166db2fdf0e0daaa1481776e786dc6ca61471dcc8e8cf6844d41eac2f5a949fb"; + sha256 = "e933c921694e03357c2872f16cf29bf1f4ad62297943d6a8c9182b9be603daab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sr/firefox-110.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7d419fe0a1a509d0839f67543a055ec5d9ae83cdb4b08c412cbe4b3f5c3387cc"; + sha256 = "2d6d34e90d2e1149056d5e4920ea21824401d1975df7d17a143944bedb0b22f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sv-SE/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sv-SE/firefox-110.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d20624af01871714937981e9631837d95c0c81960b7085e7f19ffd62f46334b3"; + sha256 = "93623693ac414ab424320f863b36b6513ff0f30b27dcbcc248837cce2599c4c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/szl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/szl/firefox-110.0b7.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "4aba339773a21ed6e88b32409ada3391af29b3f91f1f58af5e6f9f84a319c814"; + sha256 = "a56417926df43aae7a716628ad9a3095d21840859c465616ace4fc21da40269c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ta/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ta/firefox-110.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "e21a22b00a8b575c15b2003db079c519e9a9137ee5e90ce92c9f3e49c2b6c9db"; + sha256 = "ca44efb45b39c75c08973d140b724f852b017b64cc1d759485bd98e0491488d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/te/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/te/firefox-110.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "0e5f4b62e85f3f497a9d16a553e636125fac660cd81297206c3592c3c394d017"; + sha256 = "31f8b5e3900889a4832498fe4056f27ec6645191d7d962d4d491cd6a25f3c7ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/th/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/th/firefox-110.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3480a9ec8e8b702d3c36dd75634f0ca95b9a76dcbaa75ac964e8d33c469bd0ce"; + sha256 = "05615a0d71e6c313c7ab49af6be8f76e51735bf3e21c7c49abbb32d63d0408b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/tl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/tl/firefox-110.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "8f529cee1a42dac671c06c10ab30ea5f5ad845ffd5c454b726fcd8528d1e235e"; + sha256 = "977e5443033cb0c936bc90e4679fc4bcaaaf8ebf4781383dd3fd680132cea31c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/tr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/tr/firefox-110.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ba26a522a41ad123fda9986fbff4a15a6a4792a41da9b3b6278e79dee88e1c11"; + sha256 = "6d9cc515713d158653aa13b16200bc5096d266c863f4bc53bcc74e8e8fa353ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/trs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/trs/firefox-110.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "999e51a078ad1daa7888785d428b0daeb21b1a270703a7e8f5251753d98ad712"; + sha256 = "a5dd9e188dd9f78d6fd90d6a5a7765985fb219c247f414ea911b5f5f9c0f8c52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/uk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/uk/firefox-110.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "1f64175ba11b99864c5630d3c2524456bb6de472508edd7d7bc99d0bbed65923"; + sha256 = "62f00894426fc75378dda288fc2a1cd4c7be629602632b0b0e5f175d467db107"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ur/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ur/firefox-110.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "f8a331036c7ed98c804f3d33c67c6a644c5a7072e6b1ff6cbaa81afb817dcb75"; + sha256 = "333a1364ee4117fb40f4bdf2de0433b7fa34299770b69081b7cd05403d71872e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/uz/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/uz/firefox-110.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a6985b67b4fda3a17663b6a0189545d72f96db078e70fb6e0d44b513783b14d4"; + sha256 = "159cad78149dfaa69c6efb22bb9789fc44a7880b6d944fc099e9d89e6f54bd42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/vi/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/vi/firefox-110.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c61678fe61fe9425edf27fe96cf11c9ed12c1fe8df4bc41953355c4932d73f6e"; + sha256 = "8620db9130e7bd80613c2f2bfa3c9d4df8b9de8d59ebf8b822cceeb279ec649f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/xh/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/xh/firefox-110.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "12b969c1a8e3b29d570deca48be5bc4039d24e7d6c6062fce413ea2ee99a4cb6"; + sha256 = "3e1fbb4fb5feb39bd671cd576812d5fc2498fb0c73e0b058744e393bfd012716"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/zh-CN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/zh-CN/firefox-110.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "426d79128f32bc76c492e213f4ad5b21c5594e884c7515196e565dd56b02f952"; + sha256 = "39aad118cb71b8e7e7460c690ed914ee3892691a6d8e62153b03c479b78ada23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/zh-TW/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/zh-TW/firefox-110.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "305501851b71057a113c8cd63a0f0c010d00555bd025bdd52a9c958ca72607f8"; + sha256 = "1f8a4572bd8e75964b6105f3a8d3bcc68d811b92eb26080b014bc046ecc9edd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ach/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ach/firefox-110.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "d6013c04d7ca3f460673e835ed9a77b96a565a1246edca6f5a7ffc490024163d"; + sha256 = "087f33cf2fab955f017634ce780d7f5c2cb8bfa888b6ed83f99c6a9a70d6b354"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/af/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/af/firefox-110.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d38eb42e8987d980f19f10aeb714590522552697124ce702f29387cce8fbe083"; + sha256 = "1a103ba3db1cbb66de687f9c3903061c830dce1ea572511c697f1f2a8296c5c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/an/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/an/firefox-110.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "688327f1fca1a993425d183a4670ad24be4ef72c99a0b330d244a1f3c8cf88f3"; + sha256 = "a731279bda038053c3b79eebc09985d6af74c5c31ec438f13ffde59908148383"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ar/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ar/firefox-110.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "1fa7bb063f807c070592af7f1f9598ec06171a9bd198cd07096adc41a860e312"; + sha256 = "1e8ab65e878a4d4139e3b76d36e1d69b814da191052ab2c7cd41801ff73c13d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ast/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ast/firefox-110.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bf78acfaad86c3371b745c55f89c2b786be3d16a2e1f634e7f3280e3ebea61e6"; + sha256 = "f4d7176d611a93a0153e367a20c817c6bace9011bd8f0466b52769023a4077cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/az/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/az/firefox-110.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "f3dff3c2a3fbaf17beeccd97bdc2f06acc478a3c914920d72639068d9d4f9ace"; + sha256 = "0d3ceff5f5dd2143994603b707dd049c46f20c7c95513429b6749b62b1307246"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/be/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/be/firefox-110.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "95168880a935b814e45d4bb0f1da593dea18915e599bab106046ea213c3adf7e"; + sha256 = "692715493278ed1af2f14cae406b78dc78693177e0cfb7aa3d6deb786049a5fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/bg/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/bg/firefox-110.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "614578b3e9fe9b022b639b12f13711971c99bc83ebc8e255c63e5bd30b8d6178"; + sha256 = "5515025b46068c7e8e588ab7e53fc5770e3b140f9c28dabe0941c481041d9f22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/bn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/bn/firefox-110.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a98cd5fb2b924486f80426da6fa11dbb55da7392df5150f108e49bb0778e6646"; + sha256 = "fb44bc2046389982c0f2c60b80a8ac9a15a8d8888b64c63bdb2dcf6a71bfc6be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/br/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/br/firefox-110.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c97100516020b3e6b4a54be820c635f848fc386c43ffe6434a2de16bfccc37c6"; + sha256 = "518269cec028a721d718574398abe5a5b741d0429bb5104ca14fd31139504ac8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/bs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/bs/firefox-110.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "17564fb5c74702af4a6bb98c6b93a3ad13cda5d68662255e114405f74dbfc5f5"; + sha256 = "54b5c948f0d2f9232ccc2011a272890eaf430dad483863fee486b1028f1c30d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ca-valencia/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ca-valencia/firefox-110.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b6cddc7d2553b878fa9b9b92642196c653582cf89254a431f08cef6f6220641e"; + sha256 = "c06b0fde02bbd0ae124547c38b5174848cb901eabe2a4d47efd296ce46994145"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ca/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ca/firefox-110.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e1a0a46ab1cad6252d05438f205051711632ba4af24de5b8dbd92c9e7ffb8d4e"; + sha256 = "8fbb138aeb632e47fdcd2ec435a5940f33b6718e5fa69f323e700eb299e29336"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/cak/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/cak/firefox-110.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "9f34ef2b7e9fbcdad49b0e5965c375297ba90efd9a164cbe0d5d9a8c96a97781"; + sha256 = "b4ea7698f05ed439644f6f2e6c0dc9c9deed33e7dcaa353839b713a71009db95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/cs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/cs/firefox-110.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9fb041a5c903f3715ef8314ac61c20ea8bb5da9daeff27e0b3b51c707f5d7dd7"; + sha256 = "882110d77a5a432718734cfe0b36086eb853434936d80e1e8d003a5b391eb10c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/cy/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/cy/firefox-110.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3234dfd22f23c74bcad62ba818714499f7085750b1282bf5df7ddcf42ffdc1af"; + sha256 = "52db3775d786db676fbdb14cd9630d8a89411699997f4e83eb112bf64f7d49f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/da/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/da/firefox-110.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d49b18d24628e00259129924f96d659cfdd50c31e2781e035fc0ed46e212398f"; + sha256 = "20ad2fc0e7a7a5a3299ba418824c7b7c1cc1b3d4b05fc9a71b1bbd1b24e17465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/de/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/de/firefox-110.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "5b7a1e710ac1fd0840061b3b20b91289583ebeddfbc3b7db5410cb816bd2e62b"; + sha256 = "3aa77c6ebba69ab350dc0bbf0e2711c29ceadf519a1c720c512e72c38ca8fa1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/dsb/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/dsb/firefox-110.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "bdfbecf3a30fa7f068c90cbe5f0717959e7e3ab33ddad2da81d29be5a929212b"; + sha256 = "e2419464cb5d7b12d5adb915f59320e6268e797175e73516109de2540a1f1c0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/el/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/el/firefox-110.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b3437bd3b43b14ab0ec49752fa55afc43479093913c479a60e8454db2b284a0a"; + sha256 = "1652e24aa351f17b65e1f5aee895f28b2383ecb3df069c6a9e1dce0e7b59bde8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/en-CA/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/en-CA/firefox-110.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "fc8278d4f006be9ebef07db5eb758b25e58f66a413abd166ab06d22a85d12a4e"; + sha256 = "7973cee03a4e0395caf6d93903d3b1192133634adb9a1f468a218d2196e59d96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/en-GB/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/en-GB/firefox-110.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "16e85431ef7c0eed71417af16e5699a177a9f5042625f622ab36659925017e0c"; + sha256 = "c03ef3a829ec20a48b5fc767511e7500f2cd0a61b431feeec92249c7835060fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/en-US/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/en-US/firefox-110.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8ee312bddb658db825655a13fc94a3d2cee836f37a33e8cbb56d3196c7d2c7da"; + sha256 = "ff24f93e7f6e20e69bfb3f0498c298c0a24a2c5b6d2a3cc7dcf86efbd1ed646b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/eo/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/eo/firefox-110.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3b11772f5e213b874c8c89c064e48418ad34d8d23e611082079c127b9dda7aa4"; + sha256 = "5a8ab87d0ba32dd39c8ed2e4a96b1d9fb81a9c08e75463a3fcb832872373a700"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/es-AR/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/es-AR/firefox-110.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "041b79fffc0aadaf0cc314f53dcc831d94bdecdc1e3bbcd986b8cff9949da29e"; + sha256 = "6c47cd6618df40e918a5f1037a250c58a6c5c9aba69d61f81cf600f13fcb3246"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/es-CL/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/es-CL/firefox-110.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "5e6dcac4fc3b6613c35c003189cbaaf7db4ae3f43694c7084c569875f0ce4385"; + sha256 = "32f7e8aad08e9a47d49d1ed4a6f498649e3a1972a3bafb52302c5ffe3cc40ffc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/es-ES/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/es-ES/firefox-110.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "79a2774d63c71d0b83f6d8d1c4acb2d2334cd48f7c77adb5c7b0c61a162a6f52"; + sha256 = "7727f95d6af5d3b50a2721d3e650ee28db48f258861ecd4cd7f11ec594035864"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/es-MX/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/es-MX/firefox-110.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8e1bf4768b8bff41ae5d32c615d6cf88ff1ba3b26fff7f10e32f876167925621"; + sha256 = "bafdc566604fc9c22a0f798b8918ebaeaa88efd85f80284a05c01774eaf48e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/et/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/et/firefox-110.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "14bcdb10589dbedb1c53db9920474052117970778811a15a4819fca5f3f71765"; + sha256 = "b1b99dcce7b4bd9f9b061993e318b3167575767c9dce53ad8f523a60352bba42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/eu/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/eu/firefox-110.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a123ff879aaa638103e2ce3f5d14745cccb6005e5a30ea1f509bb6795a165da0"; + sha256 = "c780e78aef0e58d88dec5401d5b7bd11afb2dbebda3e5a5ea149d480bcd0ad8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/fa/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/fa/firefox-110.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "e73b148580c651034da75970af69a15ab59ae2f71ef8138f41e8f7d03c76443a"; + sha256 = "51f9102321077e0e4b07a95fbf4a481e812e6196db5c646687850e3e2a5da883"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ff/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ff/firefox-110.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "ddf71075817f23203796935e87244bb8367de7085837683b6b52359251466197"; + sha256 = "ee7831ea2b5a762a975bd5536682c2153f69ba414ea14ef6c5cd922c4cab80ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/fi/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/fi/firefox-110.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ef11509358e689073e2c2c6b505017454d2175842af41b8d4f34f00dbf204aa2"; + sha256 = "250b50459321ac6ea4d000770e76e9e802cda686cc1915fb115764eea60923d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/fr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/fr/firefox-110.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d661a4f37ce189042320fc4e440826ca0234d18118637cc26b69ab2c405d2a1c"; + sha256 = "e44fa4fba61be3854b63d1f8d387c84fbeffab008277246524f6eae9bcff7c3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/fy-NL/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/fy-NL/firefox-110.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "361a65f4b354619e3e9d01bb8dc51a27f39357c54a977f3a60172a9ae7ec6ab1"; + sha256 = "287893ecfa83777518d7a341beef2681921b90cb5106915fd0331066aba63979"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ga-IE/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ga-IE/firefox-110.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "53888f90d5642dbaa5a4052af51506bfbbe68f1328671a83a01563f293a2f6b8"; + sha256 = "ed42aeae5dcb79f45593ddcdc66c6b8188cb8304ed82400e355d75a4e53b03ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/gd/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/gd/firefox-110.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "217266bf4ef48d95cb77b57ded9b383d2ce761bb1a1e5f8e262556c46eaaceec"; + sha256 = "5bc49a642ce8928c6f46b2fa22bc61915aad660ab1ac5352f5cde0b5c44a8800"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/gl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/gl/firefox-110.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "b0f28a9382d7700503eecc577aabf819e2679a1d4f30e94b3b855ac66a2b3f31"; + sha256 = "9f24feee5b7fc0d13e4e17374c519ceb411cf629936b2e06700dcc6a63de74d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/gn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/gn/firefox-110.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c0567e2398d2283b7ba6a6b3ca01d37efc4e67c475d589fb44f976761ff1b32b"; + sha256 = "a64db5547fbd8451ece0d43169525289355e397c9a2af95efb42603a23422972"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/gu-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/gu-IN/firefox-110.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "630076cec0005aab9271aa2b0727b1c76e298e5c83a1ee2c8cef30e6d390f1cf"; + sha256 = "bf07cb9e3c257dd6a34a42851a78032260657c6763ccf255091fd2f3f29ba10a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/he/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/he/firefox-110.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "4dd7dad1d4ba47e9cf41ddf7c75b4fa7f85d7f5e3e3240c91ca25886dc1578f2"; + sha256 = "7112abf91af307c3304614c1c880b282ed24faab39a7111dea5cb2293328ca7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hi-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hi-IN/firefox-110.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "ce1c67a2decb5434084a940a19bafcd0c09868e6b1e5ddd180280af2497f447c"; + sha256 = "998da861a738665b932b014b164ca69bb047dce7b2060c005ce7525832c8000b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hr/firefox-110.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3cdf500fc631c0c629f782fbbce6a5f206afc828d9b6a5d8d0630f4e65e2c204"; + sha256 = "29eaeb3ce5e36f3704087a7a202ab56e8c0d97bf7884e083a01ff526edb4d9f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hsb/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hsb/firefox-110.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "0fcaeba915b7589ef692f7c3eb90f48df36888a642840a83647d1937f731a5ba"; + sha256 = "e3ed50d7bca83a3cbc5bd5f10f93a44244e6c3f808bbaa76265f83450824b311"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hu/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hu/firefox-110.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b4594ef8a41868aec7b3db9d4c130c171293b6551f68efacf09a83c43a03d42d"; + sha256 = "052ba5d76c6eeb1e4d66a6c6425f37e03d6ae69e78953d1f0d335e1c6e34ba5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hy-AM/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hy-AM/firefox-110.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f920b8ec3015708ba9661ea046f168b98a6e9cd597e3041ff89c3ce2b073283a"; + sha256 = "8283129029aa358c15cfb58404b2d1d59e063d697bc73ecfcccc5bbc259c3871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ia/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ia/firefox-110.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "18d492d0ecc35418fec8e3d9756278f7ab2d9a9b24c5aa500a728b55c925faf1"; + sha256 = "d72a8f87608a01e72803e728588756e76b8635fcf79895ca220d9c3c1e9e28d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/id/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/id/firefox-110.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7db9f96cc78f6fa7aa1e4e7bd77dffdb4ed6119f0b4a8722dea499c04e80cbed"; + sha256 = "d77a76b2ef8c9b2a76d05318d0a52bfb975adf68f90a6d1427859cc115240a34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/is/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/is/firefox-110.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "fa8579d6ef1c2a87979dd5f9cd0e4643f4ac1b1c0bdf611fccffc337d4aadd8b"; + sha256 = "6313e71419b14e0a80f9b4f3a6781610ffcc217e7fae8e8198eac7598170fede"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/it/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/it/firefox-110.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "749f7ea9766851168af5468e1f4bfb534b3489902d96f0a90f65b85021accde5"; + sha256 = "21d62df2f19513d6c1554f88dd089b1d8395fbe5d575b73adf53f82be75c49f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ja/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ja/firefox-110.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c2f7871933defc961d3bcbf0d347e4401fdbb49838b6fb51bced2e6921a8712f"; + sha256 = "823d5850feea222c884c70d1cd1d26e819cf3512652b0967482b4f81546f8180"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ka/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ka/firefox-110.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a3f2e95eeca515d0464ed7dc49315e6d213ff28eb10e8b8ad2db9ec9b47a9ceb"; + sha256 = "18a6328ff12f058fc982e7e5e9db18c1e01137046ff569d27e2281da60ea7642"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/kab/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/kab/firefox-110.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3044c51a73d8e80cffc7037a59ff57ae14eea170122c641c3637745849292566"; + sha256 = "f03e001fe3456f19ce3c1ec769d938034d7b93ffbde22cf592953ecea79be08e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/kk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/kk/firefox-110.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "aa5045062385ae460b14ee9accd415e87c347f1f9a4e6e3381b6d3f5b9e17da3"; + sha256 = "ede5525fa61b020e63386562d52025579c31b9309238d1960bd0fe8e0544609d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/km/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/km/firefox-110.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "af8950167a624e4e3b83ffb75d4e77e6312894c391a7a28f52de254874d7953c"; + sha256 = "800628c8e2e3f4a79c88b86d0e35a1f95afd5f0b910e23ffe47fffce15f663d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/kn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/kn/firefox-110.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "598e170001ae93923cd044b5490414512ea6f20915cacb52935c0c92eb18e343"; + sha256 = "e04f625d658f27b74115db26adecf5c9eecf7b10317f025bcc9a56e47f9c6309"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ko/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ko/firefox-110.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2da9a904a16d6b819ae8856a58092365e7170aa8857fbd05699562a7a7b4014d"; + sha256 = "ebca3d23397626e42f41a88ebc9271da9b25c3605e79ef3c952400e876975297"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/lij/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/lij/firefox-110.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "7c8828d0b3f7dd864c3e948fa60e022e85990061af8d5fa9f74314503b94e3c5"; + sha256 = "a6c033d120e27830f89f6fba1af6332251d3e0a820901729bf5c3f4633cf7012"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/lt/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/lt/firefox-110.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "edf1327d542580af51acb6c93ea697cca1f9c69cb8abd95d330e01bc69d26b77"; + sha256 = "34a9e7a2cb57366e4bd4732a767228208defd0880768c989c6b5b9bc94a2247e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/lv/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/lv/firefox-110.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "bd1a2d487e50ddb036b30e424da8d9f3023ca56540b4dc9f3a351b33b060c054"; + sha256 = "831ca204a770068ce4105cf1033b5586872bd0071ddbe9d9bbb0f2495efc28cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/mk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/mk/firefox-110.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "9d171cda4c9f8de11c2ac6b4c8d4eda3fcda7424c6e9d6ed776c2d6f4219ca3a"; + sha256 = "cd16ea3a977ff335bfe8636cca62c46d12d0de22ba4429eded5a2ce79a53818d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/mr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/mr/firefox-110.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8d51039f8f1f01c9a6b10f1b242225b54af650d53994186a547c543594064dab"; + sha256 = "22a12d923e87800bb0998fadf6763d0fefa4be7a0df39e85a76200f5d1e641b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ms/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ms/firefox-110.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "aba977cc1cf684e1d5092ae02d25fae98335f1c240ce38c94b3a8b5cc8a77d9a"; + sha256 = "9ebf9de1970c562b68207f7051217497059235d2c5ed12caee5144923e1e05a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/my/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/my/firefox-110.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "aadf0c69937f4b0d16a557a92c0ec720d54606ddc6efcec701a5cdeeb224f1f0"; + sha256 = "245f82a08ef506715abdd248577023d4f785a832b3dbd6190fa4bb1d60dd6fd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/nb-NO/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/nb-NO/firefox-110.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c19199e14f489f9fd71d7fae722dfa8e09d3ffa878d2465fcd92616f372c2f71"; + sha256 = "2680ba8aed6bc7e3aac9648e27045560b625948ec50a5a849130713184344038"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ne-NP/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ne-NP/firefox-110.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "16703be661a630c662941830827cb039eb12e2c1c8da14a1ba1a6e575a9213c4"; + sha256 = "9445de860d2de2154481aff7479be96e0a1c6929a6345ef8028d3c62afdd9d9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/nl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/nl/firefox-110.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "53aa215ac7864f1b358bc3be186a33fed235044b76899479793e018031094101"; + sha256 = "336c25dcf9c23c7a3e008afba5cac728f94de9b9b2dc475da416fccce815e872"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/nn-NO/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/nn-NO/firefox-110.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c396b33f7ac2338f69c7f40ac006f58be878f5a6e2f40280b3d940f5fe778eb0"; + sha256 = "4fd7a750b4339dadb7ec606d5fb2286003e8dc435a9c691fa9ae32cb53f5e9d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/oc/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/oc/firefox-110.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "1ba49c4589a9fc52b2d8dfe96320abe87e69269c8dc8748fdf538738e2d39003"; + sha256 = "ffc7e5383d3e6fe74079b255cd2148406ba0fab1b1d0a139ab6004fe3c46309c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/pa-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/pa-IN/firefox-110.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a340325ae445b867d5d568c75bdcfcacbfc1806f0ab2e4abc167d2be6b619f34"; + sha256 = "863025ea1ebc894c0522cde1042866eeeb698967eec044d79c6d2eb0d76f1348"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/pl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/pl/firefox-110.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "3b7aba94e6de49fdb73d82d4faf69f8b038c22bf496a2eca6a3f1677bd71dacb"; + sha256 = "1dc6ab6b213cdf1a431c0e85879a03bacc4dc66c9c29042a678248c89800f4a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/pt-BR/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/pt-BR/firefox-110.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f790ffc8f5a0e36426cc05c36c3ce77a83038023456d0d4c603bc78d210f3c32"; + sha256 = "cb20f0107e580e27c0b226b2ebe32ea26fb7f3818703af9994be0d59020551eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/pt-PT/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/pt-PT/firefox-110.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "580ffa11e26c0824afa293afec547c2f5eaa7829fbe28effddff9bf68ab8a2d7"; + sha256 = "95001d06104329f3bc5c6228aa11bbefdd76c49b7acf2cf41d3bc77a7f9aa2f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/rm/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/rm/firefox-110.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "006be67bf0c133be88e65fba86aa66cf62424774d31ecb5862a29e735a3ab6e3"; + sha256 = "7f39d3673ba4c3ee2ddcaaee45013c0613426ffe61f46b33efd9fccf841a7f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ro/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ro/firefox-110.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3334c6cebe29db68c63107583467f0ebf920f91d9523ca9a3c3cd856f2c034a2"; + sha256 = "d7c20ac79977897823ea0da217542bd57970eebf5406e97c2e9ae7675d69a6ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ru/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ru/firefox-110.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "93fdafef07b6b65db586e52f213878ca86edc38fc1c96971aa2d9e5a5d324ef7"; + sha256 = "dea8ef23f97436885f878a8dea2fcba2e3976c3dd07c5e8cef1988d0d22231b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sco/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sco/firefox-110.0b7.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "b73d445a8bbec12da7fa9cfb993fcd74d3da343e5c326670243a300e3a33612d"; + sha256 = "aab56b5773e2c288d01966badd966af26b63cf67eb4c83d1a2ca0e6fcae98706"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/si/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/si/firefox-110.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "2e11b7b404cd80654533fe3936d5e2b2a69d11da1189a08a1f9dec1bac8b83e3"; + sha256 = "411207727c4c48fb69f228108f3d6d370de2b5a2f74bf11aac1d161cefa83383"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sk/firefox-110.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c87d3674a4e9983c26a86260909c1b57dddda338fce576de767bac7c5b03072c"; + sha256 = "f177d85c34359e4d956e53f8f7d8ace69cbca8d67a539d763d422f4208a344fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sl/firefox-110.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "a666e6035cfcc341c2c9a90e5473550498b81e71dd4ef912372b818c4b0f5e48"; + sha256 = "7bb5820d67de6cc6a8630f22a8dc7b68069e6e2bb845dcf165aecd0fb5500076"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/son/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/son/firefox-110.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a0cbe15e6fb9ac7bc211f92985b69cce2732e89dd6c4636e744c1cd7778ef9a9"; + sha256 = "8642e3eb16df9beffda8cd73aa7a4bff48fbe8f14c912679df487e7cce4a79fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sq/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sq/firefox-110.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "7697780df08b5cf9b6926079d92318241c0dee625a25f10602f43c718a5fb78b"; + sha256 = "1d8da9e05a5ecaa73f4f0913dd8af682ebef382604b477bd72f5c6df6daa4ef3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sr/firefox-110.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b2d353398b6166b1d6b6804af6ed450f1e1afccb155e533efd2290651124ad02"; + sha256 = "7c33d0a47a03de39afc1fa0a0be1849b40b37dc0b5ca8db41d63577c2f6adf60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sv-SE/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sv-SE/firefox-110.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1761a9b2c1dc11800cb7796bade2ac9e0baee745b3e84552b9a576618d0ce693"; + sha256 = "b6fbe43d6d5e035211d714432791eb8a09f329a6312906566785de297db7cadf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/szl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/szl/firefox-110.0b7.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "09c90f8a3bded9abcbf56e74784d4fae47d0423a7a0415d1a08e6cd1a3c9efeb"; + sha256 = "30591017dccd546a1e15375d938656454e172677a0a42fd76cfceba990380add"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ta/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ta/firefox-110.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "0b9c1e5433eea3f273e9a7a0496ad5ac82a428b1fb8ffb7563d791827eaf570a"; + sha256 = "c53546213d604f108a8119018a32e500b6b4ff7b8ffdbf1206d8be0650634988"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/te/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/te/firefox-110.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "541fa3564426f4e90559ea64fd9813a1af69c31075958def44a78a9289407e44"; + sha256 = "3a5f91fefa03abca8f1f1f72e10bc6d178a31aca5d7d73707afe8e531842a123"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/th/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/th/firefox-110.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "52126ef9c5c422ad52fd41cd3523a6a3a514cd4e2a1f805e56c34b3680c54d76"; + sha256 = "6c56f8503ce28d77aa3a0b19165cc0a93533ded03fdddf8690bda182962769c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/tl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/tl/firefox-110.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "7f47fdf1ddd4ecc2f98b0f66f2cba6fb348929f4133bb5117207f69d97aaa9b8"; + sha256 = "d01d4387a07c96abe24f24666fb96b1b1b50693b8a113ac607200113fd42a6fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/tr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/tr/firefox-110.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "be87175b46d62185fa7ff06daa800b2a65bafc4e5db24403df6ddb6ea501665a"; + sha256 = "1c77d202fb5b6431f5c60aecc9c87d5d46e9b0fb54118b89f8b80264869b56fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/trs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/trs/firefox-110.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b26fb04ea06f437e56959d3389206799d2c4d3666ac7825773b7b928dfe5d0d6"; + sha256 = "778f6752b91b0bf349602c256ed0c214e20cfbcce6012828d33c9e48e67dffff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/uk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/uk/firefox-110.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4ee67e13d50305179ff9b4ccdde731b514b0178993c95fa2f4877462796beecc"; + sha256 = "e488fe2904dfa7fa673d0b19d218650a8897ace5ef6f642a08081221ec169b30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ur/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ur/firefox-110.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2247b1ba1a8dc344a6c714db8d447cd9b16e2fe507924abd3ce82274b738a00a"; + sha256 = "c3e745820f63a40213cd61d0db32af54c4a1f13bb97d32180e802e321a89fa52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/uz/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/uz/firefox-110.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "aeefd3cee58897defda55dae82c73827371d2288d5d4517c3e8abf237fd6843f"; + sha256 = "a6d316eb44cde8f9633522451374f0b972dce8899658a1f8235ee39e1253bc7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/vi/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/vi/firefox-110.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b2d3759398867423060506bf64021b0431aeac93ccaea662544790c7d8be22fc"; + sha256 = "67797131b09335e1fc28fed46c63933e953b123f004229506b01de43a830378c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/xh/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/xh/firefox-110.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "188036a5914df341e864254dc7e8e4677716332547a337c4d824aa0a30acdb48"; + sha256 = "2743d59ec8373e49528d8a16894752f60e4fb914cf0ad8b3e04a53b5ac7664c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/zh-CN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/zh-CN/firefox-110.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "843c0fe5afb8139ccad4b5b269d275aa56142d8b047ec04bf08adbf89210d3f4"; + sha256 = "550a344dbec2ce163932e407debe69df20c12057bfa45c065c2e916138108e1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/zh-TW/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/zh-TW/firefox-110.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1de487e9636070d9cff1414f48bf070e380bf4200bdb8dea932f3745d3d3d6a8"; + sha256 = "f17911ebad92aa7df6f85faaa0e91f3b339c95ac1b0702f4caf2ef20dcfdca55"; } ]; } From b6a8a230dbf737b656dba728131823e0653933d2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 29 Jan 2023 21:52:52 -0300 Subject: [PATCH 39/59] labwc: 0.6.0 -> 0.6.1 --- pkgs/applications/window-managers/labwc/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 8bd0691450c7..adf3facb99b2 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -23,15 +23,15 @@ let wlroots = wlroots_0_16; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "labwc"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; - rev = finalAttrs.version; - hash = "sha256-P1hKYTW++dpV3kdmI5nBGun080gVTrKzi2WOJKR84j4="; + rev = self.version; + hash = "sha256-PfvtNbSAz1vt0+ko4zRPyRRN+lhQoA2kJ2xoJy5o4So="; }; nativeBuildInputs = [ @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/labwc/labwc"; description = "A Wayland stacking compositor, similar to Openbox"; + changelog = "https://raw.githubusercontent.com/labwc/labwc/${self.version}/NEWS.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; From 259cc7903c78d48d10c930b019bea049a5471884 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 29 Jan 2023 19:57:59 -0500 Subject: [PATCH 40/59] nixos/roon-bridge: fix exec name --- nixos/modules/services/audio/roon-bridge.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/roon-bridge.nix b/nixos/modules/services/audio/roon-bridge.nix index e9335091ba9a..70392b647cc6 100644 --- a/nixos/modules/services/audio/roon-bridge.nix +++ b/nixos/modules/services/audio/roon-bridge.nix @@ -42,7 +42,7 @@ in { environment.ROON_DATAROOT = "/var/lib/${name}"; serviceConfig = { - ExecStart = "${pkgs.roon-bridge}/start.sh"; + ExecStart = "${pkgs.roon-bridge}/bin/RoonBridge"; LimitNOFILE = 8192; User = cfg.user; Group = cfg.group; From ce389aa7c608d0ad3c060b9272c251e09329aa99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Jan 2023 02:53:49 +0000 Subject: [PATCH 41/59] python310Packages.enlighten: 1.11.1 -> 1.11.2 --- pkgs/development/python-modules/enlighten/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 2d2e4c7a479a..6689822479ca 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V6vZij0/g0hO+fkfklX00jyLMJfs22R8e5sASdYAt/g="; + hash = "sha256-koSGHe5aJy4OGjdYzT87cYCxvRdUh12naHbyp/Rsy2E="; }; propagatedBuildInputs = [ From 859f76642a4e755a535733da0e476f1ad3b21836 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Jan 2023 03:10:21 +0000 Subject: [PATCH 42/59] python310Packages.google-cloud-logging: 3.4.0 -> 3.5.0 --- .../python-modules/google-cloud-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index b94fd0635353..d167a07fa611 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zeD1n625F0aHRiUrr0sR6gD21obvAhORg+r5IfOu5rQ="; + hash = "sha256-8RVEoh6jVW9w66x7wzj/qKGXkTg07N2IU9F2uHCCOqo="; }; propagatedBuildInputs = [ From aa3e98ca07bfd2185b83ab7f9ec0d115efd9ed77 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 29 Jan 2023 22:26:54 -0500 Subject: [PATCH 43/59] simple-http-server: 0.6.5 -> 0.6.6 Diff: https://github.com/TheWaWaR/simple-http-server/compare/v0.6.5...v0.6.6 Changelog: https://github.com/TheWaWaR/simple-http-server/releases/tag/v0.6.6 --- pkgs/servers/simple-http-server/default.nix | 19 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix index 0940d1a0ece3..e59b9d73d5a8 100644 --- a/pkgs/servers/simple-http-server/default.nix +++ b/pkgs/servers/simple-http-server/default.nix @@ -1,21 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9wssSegekRBUXxpru5WGGu6BLX6BFEgV0QliNJToRFg="; + sha256 = "sha256-b+z3rio+kg1Z0B4pqhTlCTtzXgAeCAhinSa9dkIwcaY="; }; - cargoSha256 = "sha256-P8Zr5KTjXD0qHkf6QfyfN39PjokpZUfywhzVjIO5rE8="; + cargoSha256 = "sha256-teBqgQloI/13F7K/+EBKFcHWqcK1wJrNUu5LO8nwQbo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dd49c585961..02925765e6a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38613,9 +38613,7 @@ with pkgs; simplehttp2server = callPackage ../servers/simplehttp2server { }; - simple-http-server = callPackage ../servers/simple-http-server { - inherit (darwin.apple_sdk.frameworks) Security; - }; + simple-http-server = callPackage ../servers/simple-http-server { }; diceware = with python3Packages; toPythonApplication diceware; From 473312a171c662f06eaa3f9f783e5f8322984ade Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 30 Jan 2023 05:34:16 +0100 Subject: [PATCH 44/59] cargo-outdated: 0.11.1 -> 0.11.2 --- pkgs/development/tools/rust/cargo-outdated/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 8103229bb66a..6ed10aee16ec 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -5,25 +5,27 @@ , openssl , stdenv , curl +, CoreFoundation , Security , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.11.1"; + version = "0.11.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vEgYmtRAashBRsGDExewqaGsVYF7EJ4ky+cE/PMFW38="; + sha256 = "sha256-SkFMdE7VAZrT7e5SMrfW8bBA6zPqQV7LhSy3OmshUAs="; }; - cargoSha256 = "sha256-xstcKIXQDk4ngwWSzMueO47U2oFRHAqvvjRnDXFsPE8="; + cargoHash = "sha256-ZcG/4vyrcJNAMiZdR3MFyqX5Udn8wGAfiGT5uP1BSMo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl + CoreFoundation Security SystemConfiguration ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 522d94c60319..b26efacc4bfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15649,7 +15649,7 @@ with pkgs; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; cargo-pgx = callPackage ../development/tools/rust/cargo-pgx { inherit (darwin.apple_sdk.frameworks) Security; From 16b32fe811ee2b440119fb1d76d73d694afa7822 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:42:08 +1000 Subject: [PATCH 45/59] skopeo: 1.10.0 -> 1.11.0 https://github.com/containers/skopeo/releases/tag/v1.11.0 --- pkgs/development/tools/skopeo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index aaae3082d320..08bcde3ae510 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -16,18 +16,18 @@ buildGoModule rec { pname = "skopeo"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-Q6gdkaIYTDUqDbjmE9TcRtQcHjpOJ3bXLJtN8NPp9KA="; + hash = "sha256-P556Is03BeC0Tf+kNv+Luy0KASgTXsyZ/MrPaPFUHE8="; }; outputs = [ "out" "man" ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; From a6deb6e9518ec5f5ecd3805f60c6f07dceb79661 Mon Sep 17 00:00:00 2001 From: zendo Date: Mon, 30 Jan 2023 14:11:47 +0800 Subject: [PATCH 46/59] qpdfview: move to pkgs/applications/office --- pkgs/applications/{misc => office}/qpdfview/default.nix | 0 .../{misc => office}/qpdfview/qpdfview-qt515-compat.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => office}/qpdfview/default.nix (100%) rename pkgs/applications/{misc => office}/qpdfview/qpdfview-qt515-compat.patch (100%) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix similarity index 100% rename from pkgs/applications/misc/qpdfview/default.nix rename to pkgs/applications/office/qpdfview/default.nix diff --git a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch b/pkgs/applications/office/qpdfview/qpdfview-qt515-compat.patch similarity index 100% rename from pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch rename to pkgs/applications/office/qpdfview/qpdfview-qt515-compat.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 522d94c60319..1f790684af92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33416,7 +33416,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/office/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { }; From 8303bef3872bf20194f464eb222ae10ffb5a7ba4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 30 Jan 2023 07:26:44 +0100 Subject: [PATCH 47/59] ocamlPackages.pbkdf: use Dune 3 --- pkgs/development/ocaml-modules/pbkdf/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index 41dc6394e84c..5dedd200a825 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -10,12 +10,14 @@ buildDunePackage rec { pname = "pbkdf"; version = "1.2.0"; + duneVersion = "3"; + src = fetchzip { url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz"; sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI="; }; - minimalOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ cstruct mirage-crypto ]; nativeCheckInputs = [ alcotest ]; doCheck = true; From 7e0272c78ed8e3440e398fabd942906f890bcdcb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 30 Jan 2023 07:26:48 +0100 Subject: [PATCH 48/59] ocamlPackages.carton: use Dune 3 --- pkgs/development/ocaml-modules/carton/default.nix | 3 ++- pkgs/development/ocaml-modules/carton/git.nix | 1 + pkgs/development/ocaml-modules/carton/lwt.nix | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index b075ea53021a..c3d7204f3635 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -11,10 +11,11 @@ buildDunePackage rec { version = "0.6.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; - sha256 = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; + hash = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; }; patches = [ diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix index 7e08e69543d7..b361ee1447b2 100644 --- a/pkgs/development/ocaml-modules/carton/git.nix +++ b/pkgs/development/ocaml-modules/carton/git.nix @@ -9,6 +9,7 @@ buildDunePackage { pname = "carton-git"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton diff --git a/pkgs/development/ocaml-modules/carton/lwt.nix b/pkgs/development/ocaml-modules/carton/lwt.nix index 2c0cf34ae5a4..60e45823eb50 100644 --- a/pkgs/development/ocaml-modules/carton/lwt.nix +++ b/pkgs/development/ocaml-modules/carton/lwt.nix @@ -11,6 +11,7 @@ buildDunePackage { pname = "carton-lwt"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton From f697326b03f3bc8246914dd3aab7faf1ba64bd73 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 30 Jan 2023 07:26:52 +0100 Subject: [PATCH 49/59] =?UTF-8?q?ocamlPackages.decompress:=201.5.1=20?= =?UTF-8?q?=E2=86=92=201.5.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/decompress/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index a8b460f426ba..c67cfac5410a 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -1,22 +1,24 @@ { lib, fetchurl, buildDunePackage , checkseum, optint, cmdliner , bigstringaf, alcotest, camlzip, base64, ctypes, fmt, crowbar, rresult +, astring, bos }: buildDunePackage rec { pname = "decompress"; - version = "1.5.1"; + version = "1.5.2"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-${version}.tbz"; - sha256 = "sha256-y/OVojFxhksJQQvvtS38SF7ZnMEQhAtwDey0ISwypP4="; + hash = "sha256-qMmmuhMlFNVq02JvvV55EkhEg2AQNQ7hYdQ7spv1di4="; }; buildInputs = [ cmdliner ]; propagatedBuildInputs = [ optint checkseum ]; - nativeCheckInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 crowbar rresult ]; + nativeCheckInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ]; doCheck = true; meta = { From 9dc19ace3a66d8f6369f2394ae2501506b32b8da Mon Sep 17 00:00:00 2001 From: zendo Date: Mon, 30 Jan 2023 14:26:55 +0800 Subject: [PATCH 50/59] qpdfview: 0.4.18 -> 0.5.0 --- pkgs/applications/office/qpdfview/default.nix | 15 +++++++++------ .../office/qpdfview/qpdfview-qt515-compat.patch | 17 ----------------- 2 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 pkgs/applications/office/qpdfview/qpdfview-qt515-compat.patch diff --git a/pkgs/applications/office/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix index db5995149c08..6cc26c95a05b 100644 --- a/pkgs/applications/office/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -12,19 +12,21 @@ , file , ghostscript }: + mkDerivation rec { pname = "qpdfview"; - version = "0.4.18"; + version = "0.5.0"; src = fetchurl { - url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; + url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-0.5.tar.gz"; + hash = "sha256-RO/EQKRhy911eps5bxRh7novQ2ToHfVb0CIfkQIZvpk="; }; - # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - patches = [ ./qpdfview-qt515-compat.patch ]; + nativeBuildInputs = [ + qmake + pkg-config + ]; - nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtsvg @@ -35,6 +37,7 @@ mkDerivation rec { file ghostscript ]; + preConfigure = '' qmakeFlags+=(*.pro) ''; diff --git a/pkgs/applications/office/qpdfview/qpdfview-qt515-compat.patch b/pkgs/applications/office/qpdfview/qpdfview-qt515-compat.patch deleted file mode 100644 index 1fbf5ec3f101..000000000000 --- a/pkgs/applications/office/qpdfview/qpdfview-qt515-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compatibility with Qt 5.15. - -Patch copied from upstream source repository: - -https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - ---- a/sources/model.h 2017-04-19 21:01:25 +0000 -+++ b/sources/model.h 2020-06-09 06:24:11 +0000 -@@ -24,6 +24,7 @@ - #define DOCUMENTMODEL_H - - #include -+#include - #include - #include - #include - From ae855d1c76d2e1355e1a465009325da0889da73b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 30 Jan 2023 08:59:37 +0200 Subject: [PATCH 51/59] uutils-coreutils: 0.0.16 -> 0.0.17 Diff: https://github.com/uutils/coreutils/compare/0.0.16...0.0.17 --- pkgs/tools/misc/uutils-coreutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index fa17625d592c..1ac2e3124337 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.16"; + version = "0.0.17"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-03Y7966xB+3iJ1LSZPiuXMR7krhb6Wiri455ycA50SU="; + sha256 = "sha256-r4IpmwZaRKzesvq7jAjCvfvZVmfcvwj23zMH3VnlC4I="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-97yyOZCw4bJMpbH2ubyNtAJa7EwJY0AnPWMiUUzIM0M="; + hash = "sha256-ZbGLBjjAsdEhWK3/RS+yRI70xqV+5fzg76Y2Lip1m9A="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; From 35760ef789e2fbd742a930bcb499e913adc9a673 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Jan 2023 08:00:26 +0100 Subject: [PATCH 52/59] python310Packages.getmac: add changelog to meta - disable on older Python releases --- pkgs/development/python-modules/getmac/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index ecc9760ae36e..05b638559aec 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -5,6 +5,7 @@ , pytest-benchmark , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -12,11 +13,13 @@ buildPythonPackage rec { version = "0.9.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "GhostofGoes"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-U04mtg7DCC78X5Fd0wGaHrf8XkUpDLi4+ctKCyR4dKg="; + hash = "sha256-U04mtg7DCC78X5Fd0wGaHrf8XkUpDLi4+ctKCyR4dKg="; }; nativeCheckInputs = [ @@ -43,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to get the MAC address of network interfaces and hosts on the local network"; homepage = "https://github.com/GhostofGoes/getmac"; + changelog = "https://github.com/GhostofGoes/getmac/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; From 4f266763f34f30a715c474a3d188f413e5c00ef3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Jan 2023 08:02:24 +0100 Subject: [PATCH 53/59] python310Packages.enlighten: add changelog to meta --- pkgs/development/python-modules/enlighten/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 6689822479ca..f6568e691fa1 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enlighten Progress Bar for Python Console Apps"; homepage = "https://github.com/Rockhopper-Technologies/enlighten"; + changelog = "https://github.com/Rockhopper-Technologies/enlighten/releases/tag/${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ veprbl ]; }; From 605704fa22255fa2f64348cf2fe083d1a1140fca Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 30 Jan 2023 08:30:29 +0100 Subject: [PATCH 54/59] ocamlPackages.tsdl: fix build on darwin --- pkgs/development/ocaml-modules/tsdl/default.nix | 6 ++++-- pkgs/top-level/ocaml-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index db107003df04..a7d1f573c69a 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config +, AudioToolbox, Cocoa, CoreAudio, CoreVideo, ForceFeedback }: if lib.versionOlder ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" @@ -20,7 +21,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ SDL2 ctypes ]; + propagatedBuildInputs = [ SDL2 ctypes ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; preConfigure = '' # The following is done to avoid an additional dependency (ncurses) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 03bd642550f1..301495961e33 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1477,7 +1477,9 @@ let trie = callPackage ../development/ocaml-modules/trie { }; - tsdl = callPackage ../development/ocaml-modules/tsdl { }; + tsdl = callPackage ../development/ocaml-modules/tsdl { + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback; + }; tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { }; From d1a3698076d912caef3206493dfe133553c71879 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Jan 2023 09:32:05 +0100 Subject: [PATCH 55/59] python310Packages.hahomematic: 2023.1.7 -> 2023.1.8 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.1.7...2023.1.8 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.1.8 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index a5b2a8fffc28..5935073b1d82 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.1.7"; + version = "2023.1.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-n/j884ttxFCkNnpRuHquzDeWsJchHS0A13CR2CtO4lo="; + sha256 = "sha256-CzvSISNf+cxcpWwttc+K0/EmG/Z7lWtJLX9ahO0/Pq4="; }; nativeBuildInputs = [ From 9b32c3b2047a805f1373a7cdeabd7ec8a9457049 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Jan 2023 09:34:03 +0100 Subject: [PATCH 56/59] python310Packages.meshtastic: 2.0.9 -> 2.0.10 Diff: https://github.com/meshtastic/Meshtastic-python/compare/refs/tags/2.0.9...2.0.10 Changelog: https://github.com/meshtastic/python/releases/tag/2.0.10 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 6fbb4aa877fb..e97c739c21e2 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.9"; + version = "2.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-3OA61cuj9u6ejkQJgCjnu8ERjACKXz2hUekbvZqiPJ8="; + hash = "sha256-p3ELXfTe0bHrsinEz+iXZIifJykdnW5i7FFLsAhtyoc="; }; propagatedBuildInputs = [ From 7f42f2852980166a4488c82e666253b0d30c01e5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 30 Jan 2023 10:25:57 +0100 Subject: [PATCH 57/59] treewide: convert 43 fonts to stdenvNoCC.mkDerivation --- .../fonts/atkinson-hyperlegible/default.nix | 27 +++++----- pkgs/data/fonts/aurulent-sans/default.nix | 28 ++++++---- pkgs/data/fonts/b612/default.nix | 30 +++++------ pkgs/data/fonts/behdad-fonts/default.nix | 24 +++++---- pkgs/data/fonts/cabin/default.nix | 27 ++++++---- pkgs/data/fonts/comic-mono/default.nix | 26 +++++---- pkgs/data/fonts/dancing-script/default.nix | 23 ++++---- pkgs/data/fonts/dosis/default.nix | 27 ++++++---- pkgs/data/fonts/et-book/default.nix | 27 ++++++---- pkgs/data/fonts/fira/default.nix | 25 +++++---- pkgs/data/fonts/gandom-fonts/default.nix | 24 +++++---- pkgs/data/fonts/gelasio/default.nix | 31 ++++++----- .../data/fonts/ia-writer-duospace/default.nix | 26 +++++---- pkgs/data/fonts/inriafonts/default.nix | 24 +++++---- pkgs/data/fonts/ir-standard-fonts/default.nix | 26 +++++---- pkgs/data/fonts/junicode/default.nix | 26 ++++----- .../fonts/kreative-square-fonts/default.nix | 24 +++++---- pkgs/data/fonts/lalezar-fonts/default.nix | 24 +++++---- pkgs/data/fonts/libre-baskerville/default.nix | 27 ++++++---- pkgs/data/fonts/libre-bodoni/default.nix | 27 ++++++---- pkgs/data/fonts/libre-franklin/default.nix | 27 ++++++---- pkgs/data/fonts/manrope/default.nix | 26 +++++---- pkgs/data/fonts/material-icons/default.nix | 24 +++++---- pkgs/data/fonts/montserrat/default.nix | 30 ++++++----- pkgs/data/fonts/myrica/default.nix | 26 +++++---- pkgs/data/fonts/nahid-fonts/default.nix | 24 +++++---- pkgs/data/fonts/nika-fonts/default.nix | 24 +++++---- pkgs/data/fonts/office-code-pro/default.nix | 25 +++++---- pkgs/data/fonts/orbitron/default.nix | 53 ++++++++++--------- pkgs/data/fonts/oxygenfonts/default.nix | 25 +++++---- pkgs/data/fonts/parastoo-fonts/default.nix | 23 ++++---- pkgs/data/fonts/powerline-fonts/default.nix | 25 +++++---- pkgs/data/fonts/raleway/default.nix | 26 ++++----- pkgs/data/fonts/redhat-official/default.nix | 27 +++++----- pkgs/data/fonts/rhodium-libre/default.nix | 24 +++++---- pkgs/data/fonts/sahel-fonts/default.nix | 23 ++++---- pkgs/data/fonts/samim-fonts/default.nix | 23 ++++---- pkgs/data/fonts/shabnam-fonts/default.nix | 23 ++++---- pkgs/data/fonts/tt2020/default.nix | 27 +++++----- pkgs/data/fonts/vazir-code-font/default.nix | 23 ++++---- pkgs/data/fonts/vazir-fonts/default.nix | 25 +++++---- pkgs/data/fonts/xkcd-font/default.nix | 28 +++++----- 42 files changed, 631 insertions(+), 473 deletions(-) diff --git a/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/pkgs/data/fonts/atkinson-hyperlegible/default.nix index 8b2b04553726..e8b09cfb637c 100644 --- a/pkgs/data/fonts/atkinson-hyperlegible/default.nix +++ b/pkgs/data/fonts/atkinson-hyperlegible/default.nix @@ -1,21 +1,22 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "atkinson-hyperlegible"; version = "unstable-2021-04-29"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "googlefonts"; - repo = "atkinson-hyperlegible"; - rev = "1cb311624b2ddf88e9e37873999d165a8cd28b46"; - sha256 = "sha256-urSTqC3rfDRM8IMG+edwKEe7NPiTuDZph3heGHzLDks="; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "atkinson-hyperlegible"; + rev = "1cb311624b2ddf88e9e37873999d165a8cd28b46"; + hash = "sha256-RN4m5gyY2OiPzRXgFVQ3pq6JdkPcMxV4fRlX2EK+gOM="; + }; - postFetch = '' - install -Dm644 -t $out/share/fonts/opentype $out/fonts/otf/* - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/fonts/opentype fonts/otf/* + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 50f456373c69..f1ee19b3b157 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "aurulent-sans-0.1"; - owner = "deepfire"; - repo = "hartke-aurulent-sans"; - rev = name; - postFetch = '' - mkdir -p $out/share/fonts - tar xf $downloadedFile -C $out/share/fonts --strip=1 +stdenvNoCC.mkDerivation rec { + pname = "aurulent-sans"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "deepfire"; + repo = "hartke-aurulent-sans"; + rev = "${pname}-${version}"; + hash = "sha256-M/duhgqxXZJq5su9FrsGjZdm+wtO5B5meoDomde+GwY="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts + + runHook postInstall ''; - sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li"; meta = { description = "Aurulent Sans"; diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix index c38329227f02..b78f3a9e85bf 100644 --- a/pkgs/data/fonts/b612/default.nix +++ b/pkgs/data/fonts/b612/default.nix @@ -1,25 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { +stdenvNoCC.mkDerivation rec { pname = "b612"; version = "1.008"; - owner = "polarsys"; - repo = "b612"; - rev = version; + src = fetchFromGitHub { + owner = "polarsys"; + repo = "b612"; + rev = version; + hash = "sha256-uyBC8UNOwztCHXhR9XZuWDwrty0eClbo0E+gI1PmjEg="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype + mv fonts/ttf/*.ttf $out/share/fonts/truetype - mv $out/fonts/ttf/*.ttf $out/share/fonts/truetype - - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; - hash = "sha256-aJ3XzWQauPsWwEDAHT2rD9a8RvLv1kqU3krFXprmypk="; - meta = with lib; { homepage = "https://b612-font.com/"; description = "Highly legible font family for use on aircraft cockpit screens"; @@ -36,8 +36,8 @@ fetchFromGitHub rec { variants of the font. This one, baptized B612 in reference to the imaginary asteroid of the aviator Saint‑Exupéry, benefited from a complete hinting on all the characters. - ''; - license = with licenses; [ ofl epl10 bsd3 ] ; + ''; + license = with licenses; [ ofl epl10 bsd3 ]; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index be6ed005b166..143975f28db7 100644 --- a/pkgs/data/fonts/behdad-fonts/default.nix +++ b/pkgs/data/fonts/behdad-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "behdad-fonts"; version = "0.0.3"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "font-store"; - repo = "BehdadFont"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "font-store"; + repo = "BehdadFont"; + rev = "v${version}"; + hash = "sha256-gKfzxo3/bCMKXl2d6SP07ahIiNrUyrk/SN5XLND2lWY="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/behrad-fonts {} \; + + runHook postInstall ''; - sha256 = "0c57232462cv1jrfn0m2bl7jzcfkacirrdd2qimrc8iqhkz0ajfz"; meta = with lib; { homepage = "https://github.com/font-store/BehdadFont"; diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix index e68d429db2e8..186a5359c44f 100644 --- a/pkgs/data/fonts/cabin/default.nix +++ b/pkgs/data/fonts/cabin/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "cabin-1.005"; +stdenvNoCC.mkDerivation rec { + pname = "cabin"; + version = "1.005"; - owner = "impallari"; - repo = "Cabin"; - rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Cabin"; + rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + hash = "sha256-9l4QcwCot340Bq41ER68HSZGQ9h0opyzgG3DG/fVZ5s="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype fonts/OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "1bl7h217m695jn4rbniialfk573aa44fslp2rjxnhkicakpcm44h"; + runHook postInstall + ''; meta = with lib; { description = "A humanist sans with 4 weights and true italics"; diff --git a/pkgs/data/fonts/comic-mono/default.nix b/pkgs/data/fonts/comic-mono/default.nix index 0c915f21c132..fc3b8d6085be 100644 --- a/pkgs/data/fonts/comic-mono/default.nix +++ b/pkgs/data/fonts/comic-mono/default.nix @@ -1,23 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "comic-mono-font"; version = "2020-12-28"; -in fetchFromGitHub { - name = "comic-mono-font-${version}"; - owner = "dtinth"; - repo = "comic-mono-font"; - rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + src = fetchFromGitHub { + owner = "dtinth"; + repo = "comic-mono-font"; + rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + hash = "sha256-q8NxrluWuH23FfRlntIS0MDdl3TkkGE7umcU2plS6eU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts - tar -z -f $downloadedFile --wildcards -x \*.ttf --one-top-level=$out/share/fonts + cp *.ttf $out/share/fonts mkdir -p $out/etc/fonts/conf.d ln -s ${./comic-mono-weight.conf} $out/etc/fonts/conf.d/30-comic-mono.conf - ''; - hash = "sha256-poMU+WfDZcsyWyFiiXKJ284X22CJlxQIzcJtApnIdAY="; + runHook postInstall + ''; meta = with lib; { description = "A legible monospace font that looks like Comic Sans"; diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/data/fonts/dancing-script/default.nix index 5129f4bc5a5e..796069195990 100644 --- a/pkgs/data/fonts/dancing-script/default.nix +++ b/pkgs/data/fonts/dancing-script/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "dancing-script"; version = "2.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "impallari"; - repo = "DancingScript"; - rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; - sha256 = "dfFvh8h+oMhAQL9XKMrNr07VUkdQdxAsA8+q27KWWCA="; + src = fetchFromGitHub { + owner = "impallari"; + repo = "DancingScript"; + rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; + hash = "sha256-B9oAZFPH3dG/Nt5FfKfFVJYtfUKGK0AXNkQHRC7IgdU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix index 918996c5f644..a33f086c9bbe 100644 --- a/pkgs/data/fonts/dosis/default.nix +++ b/pkgs/data/fonts/dosis/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "dosis-1.007"; +stdenvNoCC.mkDerivation rec { + pname = "dosis"; + version = "1.007"; - owner = "impallari"; - repo = "Dosis"; - rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Dosis"; + rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + hash = "sha256-rZ49uNBlI+NWkiZykpyXzOonXlbVB6Vf6a/8A56Plj4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \; - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0vz25w45i8flfvppymr5h83pa2n1r37da20v7691p44018fdsdny"; + runHook postInstall + ''; meta = with lib; { description = "A very simple, rounded, sans serif family"; diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index c410826b2fb5..d1b59e2cdc0f 100644 --- a/pkgs/data/fonts/et-book/default.nix +++ b/pkgs/data/fonts/et-book/default.nix @@ -1,16 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; - name = "et-book-${builtins.substring 0 6 rev}"; - owner = "edwardtufte"; - repo = "et-book"; - sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2"; +stdenvNoCC.mkDerivation rec { + pname = "et-book"; + version = "unstable-2015-10-05"; + + src = fetchFromGitHub { + owner = "edwardtufte"; + repo = pname; + rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; + hash = "sha256-B6ryC9ibNop08TJC/w9LSHHwqV/81EezXsTUJFq8xpo="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzf $downloadedFile mkdir -p $out/share/fonts/truetype - cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf + cp -t $out/share/fonts/truetype source/4-ttf/*.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 039c5099b56e..89af9fb7b7c3 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "fira"; version = "4.202"; -in fetchFromGitHub { - name = "fira-${version}"; - owner = "mozilla"; - repo = "Fira"; - rev = version; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "Fira"; + rev = version; + hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/opentype cp otf/*.otf $out/share/fonts/opentype - ''; - sha256 = "1iwxbp7kw5kghh5nbycb05zby7p2ib61mywva3h6giv2wd4lpxnz"; + runHook postInstall + ''; meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/data/fonts/gandom-fonts/default.nix index 1b8b3307eb35..53ea5558c1f1 100644 --- a/pkgs/data/fonts/gandom-fonts/default.nix +++ b/pkgs/data/fonts/gandom-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "gandom-fonts"; version = "0.8"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "gandom-font"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "gandom-font"; + rev = "v${version}"; + hash = "sha256-nez8T0TtRLyXxIIR69LrVGde5ThCvA0fLXkYLyYQRV8="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/gandom-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-EDS3wwKwe2BIcOCxu7DxkVLCoEoTPP31k5ID51lqn3M="; meta = with lib; { homepage = "https://github.com/rastikerdar/gandom-font"; diff --git a/pkgs/data/fonts/gelasio/default.nix b/pkgs/data/fonts/gelasio/default.nix index c8cf655a18cf..cea8e439d36b 100644 --- a/pkgs/data/fonts/gelasio/default.nix +++ b/pkgs/data/fonts/gelasio/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "unstable-2018-08-12"; -in fetchFromGitHub { - name = "gelasio-${version}"; - owner = "SorkinType"; - repo = "Gelasio"; - rev = "5bced461d54bcf8e900bb3ba69455af35b0d2ff1"; - sha256 = "0dfskz2vpwsmd88rxqsxf0f01g4f2hm6073afcm424x5gc297n39"; +stdenvNoCC.mkDerivation { + pname = "gelasio"; + version = "unstable-2022-06-09"; + + src = fetchFromGitHub { + owner = "SorkinType"; + repo = "Gelasio"; + rev = "a75c6d30a35f74cdbaea1813bdbcdb64bb11d3d5"; + hash = "sha256-ncm0lSDPPPREdxTx3dGl6OGBn4FGAjFTlQpA6oDCdMI="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype/ + cp fonts/ttf/*.ttf $out/share/fonts/truetype/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/data/fonts/ia-writer-duospace/default.nix index 6da80a1bf830..483ed98737d0 100644 --- a/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "20180721"; -in fetchFromGitHub { - name = "ia-writer-duospace-${version}"; +stdenvNoCC.mkDerivation { + pname = "ia-writer-duospace"; + version = "unstable-2018-07-21"; - owner = "iaolo"; - repo = "iA-Fonts"; - rev = "55edf60f544078ab1e14987bc67e9029a200e0eb"; - sha256 = "0932lcxf861vb3hz52z1xj8r99ag9sdyqsnq9brv7gc4kp2l339c"; + src = fetchFromGitHub { + owner = "iaolo"; + repo = "iA-Fonts"; + rev = "55edf60f544078ab1e14987bc67e9029a200e0eb"; + hash = "sha256-/ifzOScILLuFkjFIgpy0ArCcelgealbpypKvZ46xApU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar --strip-components=1 -xzvf $downloadedFile mkdir -p $out/share/fonts/opentype cp "iA Writer Duospace/OTF (Mac)/"*.otf $out/share/fonts/opentype/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix index d8127b851274..1ca1ce2f9098 100644 --- a/pkgs/data/fonts/inriafonts/default.nix +++ b/pkgs/data/fonts/inriafonts/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "inriafonts"; version = "1.200"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "BlackFoundry"; - repo = "InriaFonts"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "BlackFoundry"; + repo = "InriaFonts"; + rev = "v${version}"; + hash = "sha256-CMKkwGuUEVYavnFi15FCk7Xloyk97w+LhAZ6mpIv5xg="; + }; + + installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/truetype fonts/*/TTF/*.ttf install -m444 -Dt $out/share/fonts/opentype fonts/*/OTF/*.otf + + runHook postInstall ''; - sha256 = "0wrwcyycyzvgvgnlmwi1ncdvwb8f6bbclynd1105rsyxgrz5dd70"; meta = with lib; { homepage = "https://black-foundry.com/work/inria"; diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index 2e535255cc6b..d59c111c96b7 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "ir-standard-fonts"; - version = "unstable-2017-01-21"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "morealaz"; - repo = pname; - rev = "d36727d6c38c23c01b3074565667a2fe231fe18f"; + version = "20170121"; + + src = fetchFromGitHub { + owner = "molaeiali"; + repo = pname; + rev = version; + hash = "sha256-o1d8SBX3nf7g6Gh4OP+JRS+LNrHTQOIiHhW3VNCkDV0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/ir-standard-fonts {} \; + + runHook postInstall ''; - sha256 = "0i2vzhwk77pm6fx5z5gxl026z9f35rhh3cvl003mry2lcg1x5rhp"; meta = with lib; { homepage = "https://github.com/morealaz/ir-standard-fonts"; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 5f5ce1048c5e..4e42cf1c4174 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,23 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "junicode"; version = "1.003"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "psb1558"; - repo = "Junicode-font"; - rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; + src = fetchFromGitHub { + owner = "psb1558"; + repo = "Junicode-font"; + rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; + hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' local out_ttf=$out/share/fonts/junicode-ttf mkdir -p $out_ttf - tar -f $downloadedFile -C $out_ttf --wildcards -x '*.ttf' --strip=2 - ''; + cp legacy/*.ttf $out_ttf - sha256 = "1v334gljmidh58kmrarz5pf348b0ac7vh25f1xs3gyvn78khh5nw"; + runHook postInstall + ''; meta = { homepage = "https://github.com/psb1558/Junicode-font"; diff --git a/pkgs/data/fonts/kreative-square-fonts/default.nix b/pkgs/data/fonts/kreative-square-fonts/default.nix index c9e51319733f..f6a0023bd11f 100644 --- a/pkgs/data/fonts/kreative-square-fonts/default.nix +++ b/pkgs/data/fonts/kreative-square-fonts/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "kreative-square-fonts"; version = "unstable-2021-01-29"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "kreativekorp"; - repo = "open-relay"; - rev = "084f05af3602307499981651eca56851bec01fca"; + src = fetchFromGitHub { + owner = "kreativekorp"; + repo = "open-relay"; + rev = "084f05af3602307499981651eca56851bec01fca"; + hash = "sha256-+ihosENczaGal3BGDIaJ/de0pf8txdtelSYMxPok6ww="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquare.ttf install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquareSM.ttf + + runHook postInstall ''; - sha256 = "15vvbbzv6b3jh7lxg77viycdd7yf3y8lxy54vs3rsrsxwncg0pak"; meta = with lib; { description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters"; diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/data/fonts/lalezar-fonts/default.nix index 31a857bfda05..f54c17b51f3d 100644 --- a/pkgs/data/fonts/lalezar-fonts/default.nix +++ b/pkgs/data/fonts/lalezar-fonts/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "lalezar-fonts"; version = "unstable-2017-02-28"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "BornaIz"; - repo = "Lalezar"; - rev = "238701c4241f207e92515f845a199be9131c1109"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "BornaIz"; + repo = "Lalezar"; + rev = "238701c4241f207e92515f845a199be9131c1109"; + hash = "sha256-95z58ABTx53aREXRpj9xgclX9kuGiQiiKBwqwnF6f8g="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/lalezar-fonts cp -v $( find . -name '*.ttf') $out/share/fonts/lalezar-fonts + + runHook postInstall ''; - sha256 = "0jmwhr2dqgj3vn0v26jh6c0id6n3wd6as3bq39xa870zlk7v307b"; meta = with lib; { homepage = "https://github.com/BornaIz/Lalezar"; diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix index a4be7b5b3e6b..56d83554e9ca 100644 --- a/pkgs/data/fonts/libre-baskerville/default.nix +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-baskerville-1.000"; +stdenvNoCC.mkDerivation rec { + pname = "libre-baskerville"; + version = "1.000"; - owner = "impallari"; - repo = "Libre-Baskerville"; - rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Baskerville"; + rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + hash = "sha256-1EXi1hxFpc7pFsLbEj1xs9LqjeIf3XBol/8HdKNROUU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/truetype *.ttf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "1kpji85d1mgwq8b4fh1isznrhsrv32la3wf058rwjmhx5a3l7yaj"; + runHook postInstall + ''; meta = with lib; { description = "A webfont family optimized for body text"; diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix index 63bbf8eba724..cd55c10d2e64 100644 --- a/pkgs/data/fonts/libre-bodoni/default.nix +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-bodoni-2.000"; +stdenvNoCC.mkDerivation rec { + pname = "libre-bodoni"; + version = "2.000"; - owner = "impallari"; - repo = "Libre-Bodoni"; - rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Bodoni"; + rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + hash = "sha256-yfqVeT/JiAT+fsqkXUxqlz4sEEFwEJUdvFTAzuqejtk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype */v2000\ -\ initial\ glyphs\ migration/OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0my0i5a7f0d27m6dcdirjmlcnswqqfp8gl3ccxa5f2wkn3qlzkvz"; + runHook postInstall + ''; meta = with lib; { description = "Bodoni fonts adapted for today's web requirements"; diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix index b41ae8878cc2..f6fe791743cd 100644 --- a/pkgs/data/fonts/libre-franklin/default.nix +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-franklin-1.014"; +stdenvNoCC.mkDerivation rec { + pname = "libre-franklin"; + version = "1.014"; - owner = "impallari"; - repo = "Libre-Franklin"; - rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Franklin"; + rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + hash = "sha256-GR1KHiQ1lTOmU8eAPR2pxUlMpWiW2EDMG78VDjELxDU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype */OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0aq280m01pbirkzga432340aknf2m5ggalw0yddf40sqz7falykf"; + runHook postInstall + ''; meta = with lib; { description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix index 9bf4f32caeb2..7c9ab17a79d1 100644 --- a/pkgs/data/fonts/manrope/default.nix +++ b/pkgs/data/fonts/manrope/default.nix @@ -1,18 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "manrope"; version = "3"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "sharanda"; - repo = pname; - rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; - sha256 = "1h4chkfbp75hrrqqarf28ld4yb7hfrr7q4w5yz96ivg94lbwlnld"; - postFetch = '' - tar xf $downloadedFile --strip=1 + + src = fetchFromGitHub { + owner = "sharanda"; + repo = pname; + rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; + hash = "sha256-Gm7mUD/Ud2Rf8mA3jwUL7RE8clCmb6SETOskuj6r1sw="; + }; + + installPhase = '' + runHook preInstall + install -Dm644 -t $out/share/fonts/opentype "desktop font"/* + + runHook postInstall ''; + meta = with lib; { description = "Open-source modern sans-serif font family"; homepage = "https://github.com/sharanda/manrope"; diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index 656be1b153eb..f03e8683e509 100644 --- a/pkgs/data/fonts/material-icons/default.nix +++ b/pkgs/data/fonts/material-icons/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "material-icons"; version = "3.0.1"; -in fetchFromGitHub { - name = "material-icons-${version}"; - owner = "google"; - repo = "material-design-icons"; - rev = version; + src = fetchFromGitHub { + owner = "google"; + repo = "material-design-icons"; + rev = version; + hash = "sha256-4FphNJCsaLWzlVR4TmXnDBid0EVj39fkeoh5j1leBZ8="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype cp iconfont/*.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "1syy6v941lb8nqxhdf7mfx28v05lwrfnq53r3c1ym13x05l9kchp"; meta = with lib; { description = "System status icons by Google, featuring material design"; diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index cb396080e49f..6074018f5545 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -1,25 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { +stdenvNoCC.mkDerivation rec { pname = "montserrat"; version = "7.222"; - owner = "JulietaUla"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0="; + src = fetchFromGitHub { + owner = "JulietaUla"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eVCRn2OtNI5NuYZBQy06HKnMMXhPPnFxI8m8kguZjg0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/{otf,ttf,woff,woff2} - mv $out/fonts/otf/*.otf $out/share/fonts/otf - mv $out/fonts/ttf/*.ttf $out/share/fonts/ttf - mv $out/fonts/webfonts/*.woff $out/share/fonts/woff - mv $out/fonts/webfonts/*.woff2 $out/share/fonts/woff2 + mv fonts/otf/*.otf $out/share/fonts/otf + mv fonts/ttf/*.ttf $out/share/fonts/ttf + mv fonts/webfonts/*.woff $out/share/fonts/woff + mv fonts/webfonts/*.woff2 $out/share/fonts/woff2 - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix index c36292eb0014..5d8aa43a5b21 100644 --- a/pkgs/data/fonts/myrica/default.nix +++ b/pkgs/data/fonts/myrica/default.nix @@ -1,18 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "myrica-2.011.20160403"; +stdenvNoCC.mkDerivation { + pname = "myrica"; + version = "2.011.20160403"; - owner = "tomokuni"; - repo = "Myrica"; - # commit does not exist on any branch on the target repository - rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; - sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12"; + src = fetchFromGitHub { + owner = "tomokuni"; + repo = "Myrica"; + # commit does not exist on any branch on the target repository + rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; + hash = "sha256-kx+adbN2DsO81KJFt+FGAPZN+1NpE9xiagKZ4KyaJV0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar --strip-components=1 -xzvf $downloadedFile mkdir -p $out/share/fonts/truetype cp product/*.TTC $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/data/fonts/nahid-fonts/default.nix index fbceb3c927dc..d036eed35c96 100644 --- a/pkgs/data/fonts/nahid-fonts/default.nix +++ b/pkgs/data/fonts/nahid-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "nahid-fonts"; version = "0.3.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "nahid-font"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "nahid-font"; + rev = "v${version}"; + hash = "sha256-r8/W0/pJV6OX954spIITvW7M6lIbZRpbsvEHErnXglg="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nahid-fonts {} \; + + runHook postInstall ''; - sha256 = "0df169sibq14j2mj727sq86c00jm1nz8565v85hkvh4zgz2plb7c"; meta = with lib; { homepage = "https://github.com/rastikerdar/nahid-font"; diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index f497a184be01..f5076f3c93cb 100644 --- a/pkgs/data/fonts/nika-fonts/default.nix +++ b/pkgs/data/fonts/nika-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "nika-fonts"; version = "1.0.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "font-store"; - repo = "NikaFont"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "font-store"; + repo = "NikaFont"; + rev = "v${version}"; + hash = "sha256-jDemm8IyjhoCOg4Bfsp0tzUR7m+JaswL5d7Kug+asJk="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nika-fonts {} \; + + runHook postInstall ''; - sha256 = "1x34b2dqn1dymi1vmj5vrjcy2z8s0f3rr6cniyrz85plvid6x40i"; meta = with lib; { homepage = "https://github.com/font-store/NikaFont/"; diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/data/fonts/office-code-pro/default.nix index 0513baf48680..f05a7ddd319c 100644 --- a/pkgs/data/fonts/office-code-pro/default.nix +++ b/pkgs/data/fonts/office-code-pro/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "office-code-pro"; version = "1.004"; -in fetchFromGitHub rec { - name = "${pname}-${version}"; - owner = "nathco"; - repo = "Office-Code-Pro"; - rev = version; + src = fetchFromGitHub { + owner = "nathco"; + repo = "Office-Code-Pro"; + rev = version; + hash = "sha256-qzKTXYswkithZUJT0a3IifCq4RJFeKciZAPhYr2U1X4="; + }; - postFetch = '' - tar xf $downloadedFile --strip=1 - install -m644 -Dt $out/share/doc/${name} README.md + installPhase = '' + runHook preInstall + + install -m644 -Dt $out/share/doc/${pname}-${version} README.md install -m444 -Dt $out/share/fonts/opentype 'Fonts/Office Code Pro/OTF/'*.otf 'Fonts/Office Code Pro D/OTF/'*.otf + + runHook postInstall ''; - sha256 = "1bagwcaicn6q8qkqazz6wb3x30y4apmkga0mkv8fh6890hfhywr9"; meta = with lib; { description = "A customized version of Source Code Pro"; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index f4a0a9600a15..973c79f667a3 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -1,42 +1,45 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "orbitron"; version = "20110526"; -in fetchFromGitHub { - name = "orbitron-${version}"; - owner = "theleagueof"; - repo = "orbitron"; - rev = "13e6a52"; + src = fetchFromGitHub { + owner = "theleagueof"; + repo = "orbitron"; + rev = "13e6a52"; + hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype/orbitron *.otf install -m444 -Dt $out/share/fonts/ttf/orbitron *.ttf - ''; - sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; + runHook postInstall + ''; meta = with lib; { homepage = "https://www.theleagueofmoveabletype.com/orbitron"; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; description = "Geometric sans-serif for display purposes by Matt McInerney"; longDescription = '' - Orbitron is a geometric sans-serif typeface intended for display - purposes. It features four weights (light, medium, bold, and - black), a stylistic alternative, small caps, and a ton of - alternate glyphs. + Orbitron is a geometric sans-serif typeface intended for display + purposes. It features four weights (light, medium, bold, and + black), a stylistic alternative, small caps, and a ton of + alternate glyphs. - Orbitron was designed so that graphic designers in the future - will have some alternative to typefaces like Eurostile or Bank - Gothic. If you’ve ever seen a futuristic sci-fi movie, you have - may noticed that all other fonts have been lost or destroyed in - the apocalypse that led humans to flee earth. Only those very few - geometric typefaces have survived to be used on spaceship - exteriors, space station signage, monopolistic corporate - branding, uniforms featuring aerodynamic shoulder pads, etc. Of - course Orbitron could also be used on the posters for the movies - portraying this inevitable future. + Orbitron was designed so that graphic designers in the future + will have some alternative to typefaces like Eurostile or Bank + Gothic. If you’ve ever seen a futuristic sci-fi movie, you have + may noticed that all other fonts have been lost or destroyed in + the apocalypse that led humans to flee earth. Only those very few + geometric typefaces have survived to be used on spaceship + exteriors, space station signage, monopolistic corporate + branding, uniforms featuring aerodynamic shoulder pads, etc. Of + course Orbitron could also be used on the posters for the movies + portraying this inevitable future. ''; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix index e34e49d98147..32d9273d6390 100644 --- a/pkgs/data/fonts/oxygenfonts/default.nix +++ b/pkgs/data/fonts/oxygenfonts/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "oxygenfonts-20160824"; +stdenvNoCC.mkDerivation rec { + pname = "oxygenfonts"; + version = "20160824"; - owner = "vernnobile"; - repo = "oxygenFont"; - rev = "62db0ebe3488c936406685485071a54e3d18473b"; + src = fetchFromGitHub { + owner = "vernnobile"; + repo = "oxygenFont"; + rev = "62db0ebe3488c936406685485071a54e3d18473b"; + hash = "sha256-0LKq8nChkDAb6U1sOUyga/DvzpDmIjoRn+2PB9rok4w="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype cp */Oxygen-Sans.ttf */Oxygen-Sans-Bold.ttf */OxygenMono-Regular.ttf $out/share/fonts/truetype - ''; - sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf"; + runHook postInstall + ''; meta = with lib; { description = "Desktop/gui font for integrated use with the KDE desktop"; diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix index a3d273bb8ae1..a91596a66e51 100644 --- a/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/pkgs/data/fonts/parastoo-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "parastoo-fonts"; version = "2.0.1"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "parastoo-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "parastoo-font"; + rev = "v${version}"; + hash = "sha256-E94B9R2h227D49dscCBsprmb7w0GrQ+2tWOWRf8FH30="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-4smobLS43DB7ISmbWDWX0IrtaeiyXpi1QpAiL8NyXoQ="; meta = with lib; { homepage = "https://github.com/rastikerdar/parastoo-font"; diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 3a2ae92c1e5a..ea2da0fe2ecf 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,22 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "powerline-fonts-2018-11-11"; +stdenvNoCC.mkDerivation { + pname = "powerline-fonts"; + version = "unstable-2018-11-11"; - owner = "powerline"; - repo = "fonts"; - rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0"; + src = fetchFromGitHub { + owner = "powerline"; + repo = "fonts"; + rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0"; + hash = "sha256-GGfON6Z/0czCUAGxnqtndgDnaZGONFTU9/Hu4BGDHlk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.otf' -exec install -Dt $out/share/fonts/opentype {} \; find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; find . -name '*.bdf' -exec install -Dt $out/share/fonts/bdf {} \; find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf {} \; find . -name '*.psf.gz' -exec install -Dt $out/share/consolefonts {} \; - ''; - sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/powerline/fonts"; diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index ddded71a6fa2..935fde722ed9 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "raleway"; version = "2016-08-30"; -in fetchFromGitHub { - name = "raleway-${version}"; - owner = "impallari"; - repo = "Raleway"; - rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Raleway"; + rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + hash = "sha256-mcIpE+iqG6M43I5TT95oV+5kNgphunmyxC+Jaj0JysQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name "*-Original.otf" -exec install -Dt $out/share/fonts/opentype {} \; - cp *.txt *.md -d $out - ''; - sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60"; + runHook postInstall + ''; meta = { description = "Raleway is an elegant sans-serif typeface family"; diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 9daaffd0b4ba..fd732b401bea 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchFromGitHub }: -let +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "redhat-official"; version = "4.0.2"; -in -fetchFromGitHub { - name = "redhat-official-${version}"; - owner = "RedHatOfficial"; - repo = "RedHatFont"; - rev = version; + src = fetchFromGitHub { + owner = "RedHatOfficial"; + repo = "RedHatFont"; + rev = version; + hash = "sha256-p5RS/57CDApwnRDwMi0gIEJYTDAtibIyyU2w/pnbHJI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 for kind in mono proportional; do install -m444 -Dt $out/share/fonts/opentype fonts/$kind/static/otf/*.otf install -m444 -Dt $out/share/fonts/truetype fonts/$kind/static/ttf/*.ttf done - ''; - sha256 = "sha256-904uQtbAdLx9MJudLk/vVk/+uK0nsPbWbAeXrWxTHm8="; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/RedHatOfficial/RedHatFont"; diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/pkgs/data/fonts/rhodium-libre/default.nix index fc89d6525922..1c36f41b4839 100644 --- a/pkgs/data/fonts/rhodium-libre/default.nix +++ b/pkgs/data/fonts/rhodium-libre/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "RhodiumLibre"; version = "1.2.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "DunwichType"; - repo = pname; - rev = version; + src = fetchFromGitHub { + owner = "DunwichType"; + repo = pname; + rev = version; + hash = "sha256-YCQvUdjEAj4G71WCRCM0+NwiqRqwt1Ggeg9jb/oWEsY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm444 -t $out/share/fonts/opentype/ RhodiumLibre-Regular.otf install -Dm444 -t $out/share/fonts/truetype/ RhodiumLibre-Regular.ttf - ''; - sha256 = "04ax6bri5vsji465806p8d7zbdf12r5bpvcm9nb8isfqm81ggj0r"; + runHook postInstall + ''; meta = with lib; { description = "F/OSS/Libre font for Latin and Devanagari"; diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index 9079ba7fada0..860a0066270d 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "sahel-fonts"; version = "3.4.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "sahel-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "sahel-font"; + rev = "v${version}"; + hash = "sha256-U4tIICXZFK9pk7zdzRwBPIPYFUlYXPSebnItUJUgGJY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-MrKSgz9WpVgLS37uH/7S0LPBD/n3GLXeUCMBD7x5CG8="; meta = with lib; { homepage = "https://github.com/rastikerdar/sahel-font"; diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix index b29114e6b1c4..2117cc0e6383 100644 --- a/pkgs/data/fonts/samim-fonts/default.nix +++ b/pkgs/data/fonts/samim-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "samim-fonts"; version = "4.0.4"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "samim-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "samim-font"; + rev = "v${version}"; + hash = "sha256-erT8iV5YHbEN47nEE5p5CbQYUgm8daOjymLAWF4fpVk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-WYSJ2mAzAe5H0EaMYU3qNVcQ0lRuHsjZ11YmLnZ2FCo="; meta = with lib; { homepage = "https://github.com/rastikerdar/samim-font"; diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index d5e7e2b243c3..c5f5e00e023a 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "shabnam-fonts"; version = "5.0.1"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "shabnam-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "shabnam-font"; + rev = "v${version}"; + hash = "sha256-H03GTKRVPiwU4edkr4x5upW4JCy6320Lo+cKK9FRMQs="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-m4G4UtW/0S9CsvaSF7QfthfIxGQ02E7SucdDm5s3G7A="; meta = with lib; { homepage = "https://github.com/rastikerdar/shabnam-font"; diff --git a/pkgs/data/fonts/tt2020/default.nix b/pkgs/data/fonts/tt2020/default.nix index c92e86032733..63b4e1834a3b 100644 --- a/pkgs/data/fonts/tt2020/default.nix +++ b/pkgs/data/fonts/tt2020/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "TT2020"; - version = "2020-01-05"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "ctrlcctrlv"; - repo = pname; - rev = "2b418fab5f99f72a18b3b2e7e2745ac4e03aa612"; - sha256 = "1z0nizvs0gp0xl7pn6xcjvsysxhnfm7aqfamplkyvya3fxvhncds"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "ctrlcctrlv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eAJzaookHcQ/7QNq/HUKA/O2liyKynJNdo6QuZ1Bv6k="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm644 -t $out/share/fonts/truetype dist/*.ttf install -Dm644 -t $out/share/fonts/woff2 dist/*.woff2 + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/vazir-code-font/default.nix b/pkgs/data/fonts/vazir-code-font/default.nix index 6702fd1b0220..6ba69b57feaf 100644 --- a/pkgs/data/fonts/vazir-code-font/default.nix +++ b/pkgs/data/fonts/vazir-code-font/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "vazir-code-font"; version = "1.1.2"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "vazir-code-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-code-font"; + rev = "v${version}"; + hash = "sha256-iBojse3eHr4ucZtPfpkN+mmO6sEExY8WcAallyPgMsI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + runHook postInstall ''; - sha256 = "0ivwpn9xm2zwhwgg9mghyiy5v66cn4786w9j6rkff5cmzshv279r"; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-code-font"; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index b8885298c084..787d250068b7 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -1,20 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "vazir-fonts"; version = "32.0.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "vazir-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-font"; + rev = "v${version}"; + hash = "sha256-lkjlSW3Sfr1bJ9/IOsZl9yOVh9mYKhoV5XcLkqcQ71g="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + runHook postInstall ''; - sha256 = "sha256-Uy8hgBtCcTLwXu9FkLN1WavUfP74Jf53ChxVGS3UBVM="; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-font"; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix index cfdd3c0eae0b..c1ddbe9fae6c 100644 --- a/pkgs/data/fonts/xkcd-font/default.nix +++ b/pkgs/data/fonts/xkcd-font/default.nix @@ -1,24 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "xkcd-font"; version = "unstable-2017-08-24"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "ipython"; - repo = pname; - rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; + src = fetchFromGitHub { + owner = "ipython"; + repo = pname; + rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; + hash = "sha256-1DgSx2L+OpXuPVSXbbl/hcZUyBK9ikPyGWuk6wNzlwc="; + }; - postFetch = '' - install -Dm444 -t $out/share/fonts/opentype/ $out/xkcd/build/xkcd.otf - install -Dm444 -t $out/share/fonts/truetype/ $out/xkcd-script/font/xkcd-script.ttf + installPhase = '' + runHook preInstall - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf + install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf + + runHook postInstall ''; - sha256 = "sha256-ITsJPs+ZXwUWYe2AmwyVZib8RV7bpiWHOUD8qEZRHHY="; meta = with lib; { description = "The xkcd font"; From 6fc3dfa9d1f3386a239f2abfbdf0e77fb7d40918 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Tue, 10 Jan 2023 22:13:45 -0500 Subject: [PATCH 58/59] burpsuite: 2021.12 -> 2022.12.7 https://portswigger.net/burp/releases/professional-community-2022-12-7?requestededition=community The package is now using buildFHSUserEnv. This is needed to get the integrated browser to work. --- pkgs/tools/networking/burpsuite/default.nix | 61 ++++++++++++--------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 846c966d00c4..31f848d5a7f2 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,35 +1,46 @@ -{ lib, stdenv, fetchurl, jdk11, runtimeShell, unzip, chromium }: - -stdenv.mkDerivation rec { - pname = "burpsuite"; - version = "2021.12"; +{ lib, fetchurl, jdk, buildFHSUserEnv }: +let + version = "2022.12.7"; src = fetchurl { name = "burpsuite.jar"; urls = [ - "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" - "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" + "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-BLX/SgHctXciOZoA6Eh4zuDJoxNSZgvoj2Teg1fV80g="; + sha256 = "2e354c2aadc58267bc282dde462d20b3aca7108077eb141d49f89a16172763cf"; }; - dontUnpack = true; - dontBuild = true; - installPhase = '' - runHook preInstall +in +buildFHSUserEnv { + name = "burpsuite"; - mkdir -p $out/bin - echo '#!${runtimeShell} - eval "$(${unzip}/bin/unzip -p ${src} chromium.properties)" - mkdir -p "$HOME/.BurpSuite/burpbrowser/$linux64" - ln -sf "${chromium}/bin/chromium" "$HOME/.BurpSuite/burpbrowser/$linux64/chrome" - exec ${jdk11}/bin/java -jar ${src} "$@"' > $out/bin/burpsuite - chmod +x $out/bin/burpsuite + runScript = "${jdk}/bin/java -jar ${src}"; - runHook postInstall - ''; - - preferLocalBuild = true; + targetPkgs = pkgs: with pkgs; [ + alsa-lib + at-spi2-core + cairo + cups + dbus + expat + glib + gtk3 + libdrm + libudev0-shim + libxkbcommon + mesa_drivers + nspr + nss + pango + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + ]; meta = with lib; { description = "An integrated platform for performing security testing of web applications"; @@ -43,8 +54,8 @@ stdenv.mkDerivation rec { downloadPage = "https://portswigger.net/burp/freedownload"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - platforms = jdk11.meta.platforms; - hydraPlatforms = []; + platforms = jdk.meta.platforms; + hydraPlatforms = [ ]; maintainers = with maintainers; [ bennofs ]; }; } From 880161efe12c0b27e41fd1a45bb74a20c2877021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 30 Jan 2023 12:06:54 +0100 Subject: [PATCH 59/59] Revert "burpsuite: 2021.12 -> 2022.12.7" This reverts commit 6fc3dfa9d1f3386a239f2abfbdf0e77fb7d40918. --- pkgs/tools/networking/burpsuite/default.nix | 61 +++++++++------------ 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 31f848d5a7f2..846c966d00c4 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,46 +1,35 @@ -{ lib, fetchurl, jdk, buildFHSUserEnv }: -let - version = "2022.12.7"; +{ lib, stdenv, fetchurl, jdk11, runtimeShell, unzip, chromium }: + +stdenv.mkDerivation rec { + pname = "burpsuite"; + version = "2021.12"; src = fetchurl { name = "burpsuite.jar"; urls = [ - "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" - "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" + "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" ]; - sha256 = "2e354c2aadc58267bc282dde462d20b3aca7108077eb141d49f89a16172763cf"; + sha256 = "sha256-BLX/SgHctXciOZoA6Eh4zuDJoxNSZgvoj2Teg1fV80g="; }; -in -buildFHSUserEnv { - name = "burpsuite"; + dontUnpack = true; + dontBuild = true; + installPhase = '' + runHook preInstall - runScript = "${jdk}/bin/java -jar ${src}"; + mkdir -p $out/bin + echo '#!${runtimeShell} + eval "$(${unzip}/bin/unzip -p ${src} chromium.properties)" + mkdir -p "$HOME/.BurpSuite/burpbrowser/$linux64" + ln -sf "${chromium}/bin/chromium" "$HOME/.BurpSuite/burpbrowser/$linux64/chrome" + exec ${jdk11}/bin/java -jar ${src} "$@"' > $out/bin/burpsuite + chmod +x $out/bin/burpsuite - targetPkgs = pkgs: with pkgs; [ - alsa-lib - at-spi2-core - cairo - cups - dbus - expat - glib - gtk3 - libdrm - libudev0-shim - libxkbcommon - mesa_drivers - nspr - nss - pango - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - ]; + runHook postInstall + ''; + + preferLocalBuild = true; meta = with lib; { description = "An integrated platform for performing security testing of web applications"; @@ -54,8 +43,8 @@ buildFHSUserEnv { downloadPage = "https://portswigger.net/burp/freedownload"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - platforms = jdk.meta.platforms; - hydraPlatforms = [ ]; + platforms = jdk11.meta.platforms; + hydraPlatforms = []; maintainers = with maintainers; [ bennofs ]; }; }