From 618b7b7303f36592aec1f2154e3b03e35604c325 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 May 2022 11:00:59 +0000 Subject: [PATCH 01/12] python310Packages.emcee: 3.1.1 -> 3.1.2 --- pkgs/development/python-modules/emcee/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index f41bfae5942..c79adccc41f 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "emcee"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "dfm"; repo = pname; - rev = "v${version}"; - sha256 = "0q9dj7mihjjkcy6famzwhz1xcxxzzvm00n01w4bbm66ax9zvis52"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-MguhnLLo1zeNuMca8vWpxwysh9YJDD+IzvGQDbScK2M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 9bbc9ca76fb2079a8b9880fbfba191bc40992c4e Mon Sep 17 00:00:00 2001 From: Hubert Jasudowicz Date: Thu, 12 May 2022 00:37:53 +0200 Subject: [PATCH 02/12] python3Packages.karton-core: 4.4.0 -> 4.4.1 --- pkgs/development/python-modules/karton-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 562d8880692..b839230b5f2 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "karton-core"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - sha256 = "sha256-TwTq44l/Nx+FQ6tFZHat4SPGOmHSwYfg7ShbGnxpkVw="; + sha256 = "sha256-smgKrFexuL0bgt/1Ikm1tpSGPJNJm7Ko68iZn3AQw5E="; }; propagatedBuildInputs = [ minio redis ]; From 1a1cfacaf329b7c909a92aef4a248badc580129a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 May 2022 04:20:00 +0000 Subject: [PATCH 03/12] libkqueue: 2.6.0 -> 2.6.1 https://github.com/mheily/libkqueue/releases/tag/v2.6.1 --- pkgs/development/libraries/libkqueue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libkqueue/default.nix b/pkgs/development/libraries/libkqueue/default.nix index 39a6efeb6fd..8a4bfdedd1e 100644 --- a/pkgs/development/libraries/libkqueue/default.nix +++ b/pkgs/development/libraries/libkqueue/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libkqueue"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "mheily"; repo = "libkqueue"; rev = "v${version}"; - sha256 = "sha256-qh1r95A/ngg4KWSVYlC8ldv2ClV+rRPNcJDH+aAGxHs="; + sha256 = "sha256-YKKBHOxjUS7+/ib4gcR7EYjjVOwhHVksYasLhErdV8s="; }; nativeBuildInputs = [ cmake ]; From e5ca1b8253cfe93aa59251e1644f99fd2168a5e4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 May 2022 04:20:00 +0000 Subject: [PATCH 04/12] yubikey-agent: add ldflags --- pkgs/tools/security/yubikey-agent/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index d2496df94c7..eca528f1c90 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pkg-config, darwin }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, pcsclite, pkg-config, darwin }: buildGoModule rec { pname = "yubikey-agent"; @@ -15,7 +15,7 @@ buildGoModule rec { lib.optional stdenv.isLinux (lib.getDev pcsclite) ++ lib.optional stdenv.isDarwin (darwin.apple_sdk.frameworks.PCSC); - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send @@ -27,6 +27,8 @@ buildGoModule rec { subPackages = [ "." ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p $out/lib/systemd/user substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \ From d3c2a1b01bd1a72aa1cb08766f302a1c07d82f75 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 May 2022 04:20:00 +0000 Subject: [PATCH 05/12] work-sans: 1.6 -> 2.010 https://github.com/weiweihuanghuang/Work-Sans/releases/tag/v2.010 --- pkgs/data/fonts/work-sans/default.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/data/fonts/work-sans/default.nix b/pkgs/data/fonts/work-sans/default.nix index 16a0e9ac021..49722fc3e01 100644 --- a/pkgs/data/fonts/work-sans/default.nix +++ b/pkgs/data/fonts/work-sans/default.nix @@ -1,23 +1,19 @@ -{ lib, fetchFromGitHub }: +{ lib, fetchzip }: let - version = "1.6"; -in fetchFromGitHub { + version = "2.010"; +in +fetchzip { name = "work-sans-${version}"; - owner = "weiweihuanghuang"; - repo = "Work-Sans"; - rev = "v${version}"; + url = "https://github.com/weiweihuanghuang/Work-Sans/archive/refs/tags/v${version}.zip"; postFetch = '' - tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype/ fonts/desktop/*.otf - install -m444 -Dt $out/share/fonts/truetype/ fonts/webfonts/ttf/*.ttf - install -m444 -Dt $out/share/fonts/woff/ fonts/webfonts/woff/*.woff - install -m444 -Dt $out/share/fonts/woff2/ fonts/webfonts/woff2/*.woff2 + mkdir -p $out/share/fonts + unzip -j $downloadedFile "*/fonts/*.ttf" -d $out/share/fonts/opentype ''; - sha256 = "01kjidk6zv80rqxapcdwhd9wxzrjfc6lj4gkf6dwa4sskw5x3b8a"; + sha256 = "sha256-S4O5EoKY4w/p+MHeHRCmPyQRAOUfEwNiETxMgNcsrws="; meta = with lib; { description = "A grotesque sans"; From 61731ab0b190e71b7079e297699906628e1def0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 May 2022 17:27:13 +0000 Subject: [PATCH 06/12] git-machete: 3.9.0 -> 3.9.1 --- .../version-management/git-and-tools/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 4f774f5b2f4..d5fc50ff3fd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AuF4KUayMRQ2TsvjzpMHpppM+0e6igs7MrAXzGP9yp0="; + sha256 = "sha256-/oX3x5F5/gV8YuRLzAviE7RM+Gen0gIypHs34iUnVOM="; }; nativeBuildInputs = [ installShellFiles ]; From c7d0078c594da0666a7a1ea1b5e30576c337962e Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Thu, 12 May 2022 14:48:35 -0700 Subject: [PATCH 07/12] microsoft_gsl: use fetchpatch instead of fetchurl The hash for this file when using fetchurl changed from sha256-uouv35crtly8kYhKyvMyZkqwTKt1jXC6dZjw4sQ60v0= to sha256-nCPdC5eFDRyyeJzxJnoCvlukWy61OB7DoXD+R8dGlnw= Lets use fetchpatch instead to potentially avoid this issue in the future. --- pkgs/development/libraries/microsoft_gsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index 187508a9981..35765ff2d43 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , gtest -, fetchurl +, fetchpatch , pkg-config }: @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { patches = [ # Search for GoogleTest via pkg-config first, ref: https://github.com/NixOS/nixpkgs/pull/130525 - (fetchurl { + (fetchpatch { url = "https://github.com/microsoft/GSL/commit/f5cf01083baf7e8dc8318db3648bc6098dc32d67.patch"; - sha256 = "sha256-uouv35crtly8kYhKyvMyZkqwTKt1jXC6dZjw4sQ6uv0="; + sha256 = "sha256-HJxG87nVFo1CGNivCqt/JhjTj2xLzQe8bF5Km7/KG+Y="; }) ]; From 728b0c81fee4e316b732eaca35573cc8ab018ffd Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 12 May 2022 17:08:35 -0700 Subject: [PATCH 08/12] invidious: fix build The build was broken since 52f8cf58a4504e5e219faebffa51033e400e3aec when gcc was updated from 10 to 11. This forces lsquic's version of boringssl to build with gcc 10. --- pkgs/servers/invidious/lsquic.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/invidious/lsquic.nix b/pkgs/servers/invidious/lsquic.nix index 292d37ce6cd..9c3bc68615c 100644 --- a/pkgs/servers/invidious/lsquic.nix +++ b/pkgs/servers/invidious/lsquic.nix @@ -1,9 +1,11 @@ -{ lib, boringssl, stdenv, fetchgit, fetchFromGitHub, cmake, zlib, perl, libevent }: +{ lib, boringssl, stdenv, fetchgit, fetchFromGitHub, cmake, zlib, perl, libevent, gcc10Stdenv, buildGoModule }: let versions = builtins.fromJSON (builtins.readFile ./versions.json); + buildGoModuleGcc10 = buildGoModule.override { stdenv = gcc10Stdenv; }; + # lsquic requires a specific boringssl version (noted in its README) - boringssl' = boringssl.overrideAttrs (old: { + boringssl' = (boringssl.overrideAttrs (old: { version = versions.boringssl.rev; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; @@ -14,7 +16,9 @@ let # Use /etc/ssl/certs/ca-certificates.crt instead of /etc/ssl/cert.pem ./use-etc-ssl-certs.patch ]; - }); + })).override { + buildGoModule = buildGoModuleGcc10; + }; in stdenv.mkDerivation rec { pname = "lsquic"; From b38eb9ec0363621095b46574cbaa48c6d9c36a12 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 12 May 2022 17:14:46 -0700 Subject: [PATCH 09/12] libtree: remove unnecessary fetchpatch input As requested here https://github.com/NixOS/nixpkgs/pull/172446#discussion_r871249683 --- pkgs/development/tools/misc/libtree/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/misc/libtree/default.nix b/pkgs/development/tools/misc/libtree/default.nix index 141ccc24c36..219ce239f48 100644 --- a/pkgs/development/tools/misc/libtree/default.nix +++ b/pkgs/development/tools/misc/libtree/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , binutils , chrpath , cmake From 5e402cdf7343d786cc633cca8e64e710fd56db9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 May 2022 02:31:03 +0000 Subject: [PATCH 10/12] python310Packages.itemadapter: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/itemadapter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index b082387e23c..74b8eabd866 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "itemadapter"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BbanndMaepk9+y6Dhqkcl+O4xs8otyVT6AjmJeC4fCA="; + hash = "sha256-Px9g69bJGwAiKCDzi/USaqSaj7bkZ9NR8DZEIflToV0="; }; # Infinite recursion with Scrapy From 9c7eb1821e7d5e08cb46e4555380b5ba58c55de0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 May 2022 02:42:52 +0000 Subject: [PATCH 11/12] python310Packages.rethinkdb: 2.4.8 -> 2.4.9 --- pkgs/development/python-modules/rethinkdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index 2c6123df5f2..c9c61e34d8e 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "rethinkdb"; - version = "2.4.8"; + version = "2.4.9"; src = fetchPypi { inherit pname version; - sha256 = "9f75a72bcd899ab0f6b0677873b89fba99c512bc7895eb5fbc1dc9a228b8aaee"; + sha256 = "sha256-dV8I9xdTWlXAUSj2vmwoJI+pr/JningWqrh+H59YFcE="; }; propagatedBuildInputs = [ six setuptools ]; From 62595afea705348c4fe25bb8bf8996bc03a75ed0 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" <11135+bdd@users.noreply.github.com> Date: Thu, 12 May 2022 20:38:10 -0700 Subject: [PATCH 12/12] certigo: disable test on Darwin-x86_64 (#172790) Partially reverts #167546. Hydra Darwin x86_64 tests have been failing since merge https://hydra.nixos.org/job/nixpkgs/trunk/certigo.x86_64-darwin ZHF: #172160 --- pkgs/tools/admin/certigo/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index d31cb6a0ef6..541f23058ef 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; @@ -13,6 +13,11 @@ buildGoModule rec { vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs="; + # Go running under Hydra Darwin x86_64 picks CHAPOLY instead of AES-GCM as + # the default TLS ciphersuite, and breaks the arguably flakey `TestConnect` + # test. + doCheck = !(stdenv.isDarwin && stdenv.isx86_64); + meta = with lib; { description = "A utility to examine and validate certificates in a variety of formats"; homepage = "https://github.com/square/certigo";