From 2dbca5d4b9aa012e48fb5aa39a656db2e7faf048 Mon Sep 17 00:00:00 2001 From: Steven Sherry Date: Sat, 1 Jan 2022 16:05:26 -0600 Subject: [PATCH 01/20] pinentry: remove qt for darwin due to build issues with qt --- pkgs/tools/security/pinentry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index f34acafc9fe9..2de900483f09 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -3,7 +3,7 @@ , ncurses, gtk2, gcr, libcap, libsecret , enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] - ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ] + ++ lib.optionals (!stdenv.isDarwin) [ "qt" ] }: with lib; From d24b615dbf5a60abea7d8d6e87254a10cad92cf7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Jan 2022 00:54:22 +0000 Subject: [PATCH 02/20] python38Packages.makefun: 1.12.1 -> 1.13.0 --- pkgs/development/python-modules/makefun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index aeb13abd0dfe..dbf4b8ffe46b 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "makefun"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "4d0e90ca3fdbdeb6a4a0891e2da7d4b8e80386e19e6db91ce29b8aa5c876ecfe"; + sha256 = "2c673d2b4f0ef809347513cb45e3b23a04228588af7c9ac859e99247abac516a"; }; postPatch = '' From e8f5af7cec7d35f559024c9209cc7a547d8c934b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 3 Jan 2022 22:33:26 -0800 Subject: [PATCH 03/20] bypass403: mark broken, upstream no longer exists --- pkgs/tools/security/bypass403/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/bypass403/default.nix b/pkgs/tools/security/bypass403/default.nix index 5bf40766883a..3d1569cf5577 100644 --- a/pkgs/tools/security/bypass403/default.nix +++ b/pkgs/tools/security/bypass403/default.nix @@ -21,5 +21,8 @@ buildGoModule rec { homepage = "https://github.com/drsigned/bypass403"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + + # https://github.com/drsigned/bypass403 no longer exists + broken = true; }; } From c2368173cf5dfe1f8d87c4c6ff53bd5ca04b540e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jan 2022 09:47:44 +0100 Subject: [PATCH 04/20] python3Packages.algebraic-data-types: 0.1.1 -> 0.2.1 --- .../algebraic-data-types/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/algebraic-data-types/default.nix b/pkgs/development/python-modules/algebraic-data-types/default.nix index 8a46d405799b..7c4f9a4f6082 100644 --- a/pkgs/development/python-modules/algebraic-data-types/default.nix +++ b/pkgs/development/python-modules/algebraic-data-types/default.nix @@ -1,28 +1,45 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, hypothesis, mypy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, hypothesis +, mypy +, pytestCheckHook +}: buildPythonPackage rec { pname = "algebraic-data-types"; - version = "0.1.1"; + version = "0.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jspahrsummers"; repo = "adt"; rev = "v" + version; - sha256 = "1py94jsgh6wch59n9dxnwvk74psbpa1679zfmripa1qfc2218kqi"; + hash = "sha256-RHLI5rmFxklzG9dyYgYfSS/srCjcxNpzNcK/RPNJBPE="; }; - disabled = pythonOlder "3.6"; - checkInputs = [ + pytestCheckHook hypothesis mypy ]; + disabledTestPaths = [ + # AttributeError: module 'mypy.types' has no attribute 'TypeVarDef' + "tests/test_mypy_plugin.py" + ]; + + pythonImportsCheck = [ + "adt" + ]; + meta = with lib; { description = "Algebraic data types for Python"; homepage = "https://github.com/jspahrsummers/adt"; license = licenses.mit; maintainers = with maintainers; [ uri-canva ]; - platforms = platforms.unix; }; } From 462142060866ea45f35220c9b66f7d6984f3d0f1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 6 Jan 2022 23:24:08 +1000 Subject: [PATCH 05/20] fd: 8.3.0 -> 8.3.1 https://github.com/sharkdp/fd/releases/tag/v8.3.1 --- pkgs/tools/misc/fd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 15af17524840..3a5f1111992d 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.3.0"; + version = "8.3.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-MSkQYsBZkQOFkOnjGY+VuifUZnzloSysAO/hsp+fy1A="; + sha256 = "sha256-1Fxkd37KoFkUYYeFTaCAtndCa00lZB2KptsKIwpIt2o="; }; - cargoSha256 = "sha256-nwgAgyVaxs1ebu9ndUN3FlFiycyEbRgvUhZ8iGmrVhQ="; + cargoSha256 = "sha256-qymlTuFnYMbldNDGVDpkLCC0QQK1il/LAXcIil5koCo="; nativeBuildInputs = [ installShellFiles ]; From e929791228b17b53bd6767ccca78f65195c074e1 Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 6 Jan 2022 13:59:56 +0100 Subject: [PATCH 06/20] mercurial: extend tests timeout for Hydra This extends the timeout for the tests to 30 minutes, which are otherwise failing at 10 minutes on Hydra. --- pkgs/applications/version-management/mercurial/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 8320491758ea..a85844fff216 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -78,7 +78,7 @@ let EOF # extended timeout necessary for tests to pass on the busy CI workers - export HGTESTFLAGS="--blacklist blacklists/nix --timeout 600" + export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800" make check ''; From a8ef60565ac9dc3fe2c68dc6a7fb29765e8bc2cf Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 6 Jan 2022 22:16:22 +0100 Subject: [PATCH 07/20] mercurial: add CA cert to test env for libgit This seems to be required for the tests to pass on Hydra. Otherwise, the test suit fails with errors like: ``` feature pygit2 failed: OpenSSL error: failed to load certificates: error:00000000:lib(0):func(0):reason(0) ``` --- pkgs/applications/version-management/mercurial/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index a85844fff216..c3c04da3a69a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -11,6 +11,7 @@ , which , sqlite , git +, cacert , gnupg }: @@ -70,6 +71,7 @@ let git gnupg ]; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; # needed for git checkPhase = '' cat << EOF > tests/blacklists/nix # tests enforcing "/usr/bin/env" shebangs, which are patched for nix From 5fb039e9d87694bb2860aa2fae77ec0bea8f30ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jan 2022 22:29:19 +0100 Subject: [PATCH 08/20] kubescape: 1.0.137 -> 1.0.138 --- pkgs/tools/security/kubescape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 8f5382d38108..e6fece66ea95 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.137"; + version = "1.0.138"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2VjC5icIKF7VO7Tli/mk/gXbIzZxkFm7Aigwl+BVQ6g="; + sha256 = "sha256-/Rp4eNlvlONiH3F6Zv9GDUF26tmSuhFGUL1MoKOFSEc="; }; nativeBuildInputs = [ From 9b830a41f55fb4741c48a5f977d2e61d55a7854e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jan 2022 22:52:29 +0100 Subject: [PATCH 09/20] termscp: 0.7.0 -> 0.8.0 --- pkgs/tools/networking/termscp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index 58bbfe5e46c6..4883cc042cde 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "veeso"; repo = pname; rev = "v${version}"; - sha256 = "131kij6pnw9r0p2a28g00z85dh758h4rm9ic09qmp61cq7dphkc1"; + sha256 = "sha256-fVZDpzgcpMWOoUtoq7go/NFWfoR1aONuRtTba0sqPZk="; }; - cargoSha256 = "1k2vwmfy6dczgs3bz8k4j24cc8l7l9fdh3ymp79ril4rp1v6kfp2"; + cargoSha256 = "sha256-iLm73dWF9z/obtAXe5dZlvJcxU6hB5N0vaSc/HLuTuQ="; nativeBuildInputs = [ pkg-config From 7251af3871b58b537c772e1409f6b098deec668f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jan 2022 01:01:55 +0000 Subject: [PATCH 10/20] blocksat-cli: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/blocksat-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index 6c943d5ae57c..4c5b96bce538 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "96ec5e548dcdb71ada75727d76b34006fe5f6818bd89cf982e15616d41889603"; + sha256 = "sha256-hz5BGE+gqOrPiXvmeOTOecm2RUrTvM/xxvV3cnO2QSc="; }; propagatedBuildInputs = [ From 6195b7c6e0e462f280c770c3c5c8a72004074dc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jan 2022 02:22:43 +0000 Subject: [PATCH 11/20] python38Packages.striprtf: 0.0.18 -> 0.0.19 --- pkgs/development/python-modules/striprtf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index f2639debbdd0..8b4adb293831 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.18"; + version = "0.0.19"; src = fetchPypi { inherit pname version; - sha256 = "6bb2dc8a59f3128662f958d647c5e6755f9ad8053f216c88e68514df204926d2"; + sha256 = "b7f15e11306e466dbe91665409233a06d9fdb4ee156489a3d879579891b04c25"; }; meta = with lib; { From 71fc9310a8ba04e3d47c48b8eb49112fcc384273 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jan 2022 06:05:57 +0000 Subject: [PATCH 12/20] python38Packages.google-cloud-spanner: 3.12.0 -> 3.12.1 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index b08f8fb31ff9..62bba685417d 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.12.0"; + version = "3.12.1"; src = fetchPypi { inherit pname version; - sha256 = "8f1390c3776fcfce71e1ef024d9ccde52c16d1cd728bc587c24065d6e4d21933"; + sha256 = "98e53298a7c79f0af351c80e6fc0b57bc735afdec764424e459179ef04f5a40f"; }; propagatedBuildInputs = [ From c1220ff9b0d8092564dee7ba083cfe2c572eed8e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 7 Jan 2022 07:43:10 +0100 Subject: [PATCH 13/20] bazel_4: dont propagate absl-py (#153779) otherwise bazel pollutes PYTHONPATH and if it's just necessary to generate the fish completion then we dont need to propagate it --- .../development/tools/build-managers/bazel/bazel_4/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index d7943ef25844..6a8792910b11 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -536,6 +536,7 @@ stdenv.mkDerivation rec { unzip which zip + python3.pkgs.absl-py # Needed to build fish completion ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; # Bazel makes extensive use of symlinks in the WORKSPACE. @@ -549,8 +550,6 @@ stdenv.mkDerivation rec { shopt -s dotglob extglob mv !(bazel_src) bazel_src ''; - # Needed to build fish completion - propagatedBuildInputs = [ python3.pkgs.absl-py ]; buildPhase = '' runHook preBuild From 30255bdad573a520207fc787c52ad8c89eabc842 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jan 2022 07:07:33 +0000 Subject: [PATCH 14/20] python38Packages.azure-mgmt-consumption: 8.0.0 -> 9.0.0 --- .../python-modules/azure-mgmt-consumption/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index aa942d3a732b..ce17bc60de50 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-consumption"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b4cc167648634f864394066d5621afc137c1be795ee76f7539125f9538a2bf37"; + sha256 = "76f9566390721226add96c9d3020ab986d3e5fd81e3143c098f57262c6ce4a51"; }; propagatedBuildInputs = [ From e24fb01615acf8e56cbb5e91b711dc505f5c248f Mon Sep 17 00:00:00 2001 From: Lara Date: Fri, 7 Jan 2022 09:25:25 +0100 Subject: [PATCH 15/20] gitlab: 14.6.0 -> 14.6.1 (#153764) --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 4a1e7f46ea38..4a47fdeaf2b2 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.6.0", - "repo_hash": "0b77nh7xq5qalzhvfmsymmkrb78lmaffk464b074wi5c8gy3f5dn", + "version": "14.6.1", + "repo_hash": "0zgznf0f7jxyznil6q3fac2rvhaa2lhlpxcnbmkg9djyx1vcm7k1", "yarn_hash": "1kcjbf8xn3bwac2s9i2i7dpgbkwcjh09wvgbgysm5yffpdswg6nl", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.6.0-ee", + "rev": "v14.6.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.6.0", + "GITALY_SERVER_VERSION": "14.6.1", "GITLAB_PAGES_VERSION": "1.49.0", "GITLAB_SHELL_VERSION": "13.22.1", - "GITLAB_WORKHORSE_VERSION": "14.6.0" + "GITLAB_WORKHORSE_VERSION": "14.6.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 7cfcdf7dd746..04cfd0e47146 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -33,7 +33,7 @@ let }; }; - version = "14.6.0"; + version = "14.6.1"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -45,7 +45,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-YiDZtWRb1PnCAv+UCPRQFoCA12vf3xoHoJ1i/hW+vMg="; + sha256 = "sha256-nbE71s+KoDC6EK26cmq+YIw9MFSQv1y6qwZAJXVXGj4="; }; vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index fd8bdd2aef17..0ac84d8aa012 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.6.0"; + version = "14.6.1"; src = fetchFromGitLab { owner = data.owner; From 3c0f090cacf5c9acca53b3d1b361784853646a5a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 7 Jan 2022 08:23:42 +1000 Subject: [PATCH 16/20] terraform: 1.1.2 -> 1.1.3 https://github.com/hashicorp/terraform/releases/tag/v1.1.3 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a15305cba848..7bcc6476115a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -198,8 +198,8 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.2"; - sha256 = "sha256-8M/hs4AiApe9C19VnVhWYYOkKqXbv3aREUTNfExTDww="; + version = "1.1.3"; + sha256 = "sha256-dvAuzVmwnM2PQcILzw3xNacBwuRY7cZEU3nv4/DzOKE="; vendorSha256 = "sha256-inPNvNUcil9X0VQ/pVgZdnnmn9UCfEz7qXiuKDj8RYM="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; From 789434b790d4cade0eceaff4716fe53b24223072 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 10:02:01 +0100 Subject: [PATCH 17/20] python3Packages.striprtf: add pythonImportsCheck --- pkgs/development/python-modules/striprtf/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 8b4adb293831..0e884a09b440 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -6,12 +6,17 @@ buildPythonPackage rec { pname = "striprtf"; version = "0.0.19"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "b7f15e11306e466dbe91665409233a06d9fdb4ee156489a3d879579891b04c25"; }; + pythonImportsCheck = [ + "striprtf" + ]; + meta = with lib; { homepage = "https://github.com/joshy/striprtf"; description = "A simple library to convert rtf to text"; From 2320573b696600fc868e3cc35ce7fb4b56a10f8e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 4 Jan 2022 20:36:24 -0300 Subject: [PATCH 18/20] 7zz: 21.04 -> 21.07 --- pkgs/tools/archivers/7zz/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 8d23b3a5c3c3..f5344a63f494 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -1,13 +1,12 @@ { stdenv, lib, fetchurl, p7zip }: -# https://sourceforge.net/p/sevenzip/discussion/45797/thread/7fe6c21efa/ stdenv.mkDerivation rec { pname = "7zz"; - version = "21.04"; + version = "21.07"; src = fetchurl { - url = "https://7-zip.org/a/7z${lib.replaceStrings ["." ] [""] version}-src.7z"; - sha256 = "sha256-XmuEyIJAJQM0ZbgrW02lQ2rp4KFDBjLXKRaTfY+VCOg="; + url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.7z"; + sha256 = "sha256-0QdNVvQVqrmdmeWXp7ZtxFXbpjSa6KTInfdkdbahKEw="; }; sourceRoot = "CPP/7zip/Bundles/Alone2"; @@ -17,8 +16,6 @@ stdenv.mkDerivation rec { # GCC: https://github.com/nidud/asmc/issues/8 makefile = "../../cmpl_gcc.mak"; # "../../cmpl_gcc_x64.mak"; - NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ]; - nativeBuildInputs = [ p7zip ]; enableParallelBuilding = true; From 2aa7799528e26d0900fb046560b0937351516e8e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 2 Jan 2022 17:46:41 +0100 Subject: [PATCH 19/20] nimPackages.nimBuilder: collect deps from $pkgsHostTarget --- pkgs/development/nim-packages/build-nim-package/default.nix | 2 +- pkgs/development/nim-packages/nim_builder/nim_builder.nim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/nim-packages/build-nim-package/default.nix b/pkgs/development/nim-packages/build-nim-package/default.nix index acf67b9f8977..f8301ebb4880 100644 --- a/pkgs/development/nim-packages/build-nim-package/default.nix +++ b/pkgs/development/nim-packages/build-nim-package/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (attrs // { configurePhase = if isNull configurePhase then '' runHook preConfigure - find $NIX_BUILD_TOP -name .attrs.json + export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS nim_builder --phase:configure runHook postConfigure '' else diff --git a/pkgs/development/nim-packages/nim_builder/nim_builder.nim b/pkgs/development/nim-packages/nim_builder/nim_builder.nim index 90dcb46588b7..0cb68e63f137 100644 --- a/pkgs/development/nim-packages/nim_builder/nim_builder.nim +++ b/pkgs/development/nim-packages/nim_builder/nim_builder.nim @@ -97,7 +97,7 @@ proc configurePhase*() = for def in getEnv("nimDefines").split: if def != "": switch("define", def) - for input in getEnv("buildInputs").split: + for input in getEnv("NIX_NIM_BUILD_INPUTS").split: if input != "": for nimbleFile in walkFiles(input / "*.nimble"): let inputSrc = normalizedPath( From d1acd89e0116ff88eba80541027429fc922612e9 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 2 Jan 2022 17:48:54 +0100 Subject: [PATCH 20/20] nimPackages.pixie: 1.1.3 -> 3.1.2 * vmath 1.0.3 -> 1.1.1 * check bumpy, flatty, vmath, and zippy * remove typography, it was merged into pixie The hottext package is now broken. --- .../nim-packages/bumpy/default.nix | 23 +++++++++++++--- .../nim-packages/flatty/default.nix | 21 ++++++++++++--- .../nim-packages/pixie/default.nix | 26 ++++++++++++++++--- .../nim-packages/typography/default.nix | 7 ----- .../nim-packages/vmath/default.nix | 23 +++++++++++++--- .../nim-packages/zippy/default.nix | 23 +++++++++++++--- pkgs/tools/text/hottext/default.nix | 8 +----- pkgs/top-level/nim-packages.nix | 2 -- 8 files changed, 100 insertions(+), 33 deletions(-) delete mode 100644 pkgs/development/nim-packages/typography/default.nix diff --git a/pkgs/development/nim-packages/bumpy/default.nix b/pkgs/development/nim-packages/bumpy/default.nix index 9579d87d9d5d..909894352319 100644 --- a/pkgs/development/nim-packages/bumpy/default.nix +++ b/pkgs/development/nim-packages/bumpy/default.nix @@ -1,7 +1,24 @@ -{ fetchNimble }: +{ lib, buildNimPackage, fetchFromGitHub, vmath }: -fetchNimble { +buildNimPackage rec { pname = "bumpy"; version = "1.0.3"; - hash = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0="; + + src = fetchFromGitHub { + owner = "treeform"; + repo = pname; + rev = version; + hash = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0="; + }; + + propagatedBuildInputs = [ vmath ]; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "2d collision library"; + license = [ licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; } diff --git a/pkgs/development/nim-packages/flatty/default.nix b/pkgs/development/nim-packages/flatty/default.nix index 88f3426e512a..5e542d22e4a5 100644 --- a/pkgs/development/nim-packages/flatty/default.nix +++ b/pkgs/development/nim-packages/flatty/default.nix @@ -1,7 +1,22 @@ -{ fetchNimble }: +{ lib, buildNimPackage, fetchFromGitHub }: -fetchNimble { +buildNimPackage rec { pname = "flatty"; version = "0.2.3"; - hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA="; + + src = fetchFromGitHub { + owner = "treeform"; + repo = pname; + rev = version; + hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA="; + }; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "Tools and serializer for plain flat binary files"; + license = [ licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; } diff --git a/pkgs/development/nim-packages/pixie/default.nix b/pkgs/development/nim-packages/pixie/default.nix index 2262ccf23721..1366e55a1e36 100644 --- a/pkgs/development/nim-packages/pixie/default.nix +++ b/pkgs/development/nim-packages/pixie/default.nix @@ -1,7 +1,25 @@ -{ fetchNimble }: +{ lib, buildNimPackage, fetchFromGitHub, bumpy, chroma, flatty, nimsimd, vmath +, zippy }: -fetchNimble { +buildNimPackage rec { pname = "pixie"; - version = "1.1.3"; - hash = "sha256-xKIejVxOd19mblL1ZwpJH91dgKQS5g8U08EL8lGGelA="; + version = "3.1.2"; + + src = fetchFromGitHub { + owner = "treeform"; + repo = pname; + rev = version; + hash = "sha256-rF72ybfsipBHgQmH0e6DBn1e7WWY6dGn9yp1qvLIS3A="; + }; + + propagatedBuildInputs = [ bumpy chroma flatty nimsimd vmath zippy ]; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "Full-featured 2d graphics library for Nim"; + license = [ licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; } diff --git a/pkgs/development/nim-packages/typography/default.nix b/pkgs/development/nim-packages/typography/default.nix deleted file mode 100644 index 59037cbd9dd3..000000000000 --- a/pkgs/development/nim-packages/typography/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ fetchNimble }: - -fetchNimble { - pname = "typography"; - version = "0.7.9"; - hash = "sha256-IYjw3PCp5XzVed2fGGCt9Hb60cxFeF0BUZ7L5PedTLU="; -} diff --git a/pkgs/development/nim-packages/vmath/default.nix b/pkgs/development/nim-packages/vmath/default.nix index 9ca48c43d7f4..bb6e1c266ea5 100644 --- a/pkgs/development/nim-packages/vmath/default.nix +++ b/pkgs/development/nim-packages/vmath/default.nix @@ -1,7 +1,22 @@ -{ fetchNimble }: +{ lib, buildNimPackage, fetchFromGitHub }: -fetchNimble { +buildNimPackage rec { pname = "vmath"; - version = "1.0.3"; - hash = "sha256-zzSKXjuTZ46HTFUs0N47mxEKTKIdS3dwr+60sQYSdn0="; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "treeform"; + repo = pname; + rev = version; + hash = "sha256-/v0lQIOMogTxFRtbssziW4W6VhMDepM6Si8igLgcx30="; + }; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "Math vector library for graphical things"; + license = [ licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; } diff --git a/pkgs/development/nim-packages/zippy/default.nix b/pkgs/development/nim-packages/zippy/default.nix index 84008325bec8..ba27b0858f59 100644 --- a/pkgs/development/nim-packages/zippy/default.nix +++ b/pkgs/development/nim-packages/zippy/default.nix @@ -1,7 +1,24 @@ -{ fetchNimble }: +{ lib, buildNimPackage, fetchFromGitHub, unzip }: -fetchNimble { +buildNimPackage rec { pname = "zippy"; version = "0.7.3"; - hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8="; + + nativeBuildInputs = [ unzip ]; + + src = fetchFromGitHub { + owner = "guzba"; + repo = pname; + rev = version; + hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8="; + }; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "Pure Nim implementation of deflate, zlib, gzip and zip"; + license = [ licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; } diff --git a/pkgs/tools/text/hottext/default.nix b/pkgs/tools/text/hottext/default.nix index 6fe7a686c100..5472c8a36cf5 100644 --- a/pkgs/tools/text/hottext/default.nix +++ b/pkgs/tools/text/hottext/default.nix @@ -12,15 +12,8 @@ nimPackages.buildNimPackage rec { }; buildInputs = with nimPackages; [ - bumpy - chroma - flatty - nimsimd pixie sdl2 - typography - vmath - zippy ]; HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; @@ -38,6 +31,7 @@ nimPackages.buildNimPackage rec { ''; meta = with lib; { + broken = true; # Needs to be updated to latest Pixie API. description = "Simple RSVP speed-reading utility"; license = licenses.unlicense; homepage = "https://git.sr.ht/~ehmry/hottext"; diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index fa78e6ed9aa9..7d88d29db48b 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -77,8 +77,6 @@ lib.makeScope newScope (self: tempfile = callPackage ../development/nim-packages/tempfile { }; - typography = callPackage ../development/nim-packages/typography { }; - ui = callPackage ../development/nim-packages/ui { inherit (pkgs) libui; }; unicodedb = callPackage ../development/nim-packages/unicodedb { };