From f7bb18d0d30de066db4e1f1b97f80f88cc77b2b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 11:07:21 +0000 Subject: [PATCH 01/21] particl-core: 0.19.2.5 -> 0.19.2.13 --- pkgs/applications/blockchains/particl-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index 99bc49e8db33..db2a72f3e552 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -17,11 +17,11 @@ with lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.19.2.5"; + version = "0.19.2.13"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "sha256-uI4T8h6RvCikk8h/sZmGlj3Uj3Xhu0vDn/fPb6rLcSg="; + sha256 = "sha256-eXlTfSjxOGZi/0/b7myqILJZYNcbK+QqQmq+PVkh1e8="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From b875e26ffb4612707aac5ca9554c8ecf37e482bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 23:02:29 +0000 Subject: [PATCH 02/21] ulauncher: 5.11.0 -> 5.12.1 --- pkgs/applications/misc/ulauncher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index f9bf70b661ce..5adbc5dcf3e2 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.11.0"; + version = "5.12.1"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-xEM7sG0NRWouDu6NxNA94WTycykEhPI4ByjDk2yjHjo="; + sha256 = "sha256-Fd3IOCEeXGV8zGd/8SzrWRsSsZRVePnsDaX8WrBrCOQ="; }; nativeBuildInputs = with python3Packages; [ From b4e53b1517bd486b8c114d9971eb2b006dcddc6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Sep 2021 03:55:17 +0000 Subject: [PATCH 03/21] automysqlbackup: 3.0.6 -> 3.0.7 --- pkgs/tools/backup/automysqlbackup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/tools/backup/automysqlbackup/default.nix index 55186cfb21f0..f103149a83d7 100644 --- a/pkgs/tools/backup/automysqlbackup/default.nix +++ b/pkgs/tools/backup/automysqlbackup/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "automysqlbackup"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "sixhop"; repo = pname; rev = version; - sha256 = "0lki2049npc38r8m08garymywp1rzgflm0mxsfdznn9jfp4pk2lp"; + sha256 = "sha256-C0p1AY4yIxybQ6a/HsE3ZTHumtvQw5kKM51Ap+Se0ZI="; }; nativeBuildInputs = [ makeWrapper ]; From d9e1adfa5dc43cba954054d9b18677fc92d9f198 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 17 Sep 2021 02:04:40 +0000 Subject: [PATCH 04/21] buildkite-agent: 3.32.1 -> 3.32.3 --- .../tools/continuous-integration/buildkite-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index a9fbdb09d977..7ed0fa1911aa 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,13 +3,13 @@ nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.32.1"; + version = "3.32.3"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-bwxxjpIBVzFfjewUwDjFNN9zcaL3ihYjWOlWdrhf1o0="; + sha256 = "sha256-uckFsM8UWkiDmTpLRu34qKdjgEQrbsa+K8QtVS2PJ7A="; }; vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; From 40a4e8347383177fe4568ff7dea9d8c7f435edec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Sep 2021 20:34:03 +0200 Subject: [PATCH 05/21] python3Packages.amcrest: 1.9.2 -> 1.9.3 --- pkgs/development/python-modules/amcrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index 23b4c78024c3..d050a7563a74 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.9.2"; + version = "1.9.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "sha256-xBrXe3BUvLfSk7zBHVJLh/K3lGVkFKOCq0RNAOb9GqI="; + sha256 = "0f9l8xbn40xwx2zzssx5qmkpmv82j6syj8ncnmm6z9dc5wpr6sw7"; }; propagatedBuildInputs = [ From 3e913956926d118e8850dfa85c21599f1c43d603 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Sep 2021 07:46:48 +0000 Subject: [PATCH 06/21] helmfile: 0.140.0 -> 0.140.1 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 6d70b405e168..c9ce179e236e 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.140.0"; + version = "0.140.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-D9CyJE6/latz4541NfOtvKy+kui3CVmD483SkdEJzyU="; + sha256 = "sha256-QnGu/EGzgWva/EA6gKrDzWgjX6OrfZKzWIhRqKbexjU="; }; - vendorSha256 = "sha256-QYI5HxEUNrZKSjk0LlbhjvxXlWCbbLup51Ht3HJDNC8="; + vendorSha256 = "sha256-HKHMeDnIDmQ7AjuS2lYCMphTHGD1JgQuBYDJe2+PEk4="; doCheck = false; From 84a9b1f3a21b96f3063b9bd2f4d044e2316dce56 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 19 Sep 2021 16:06:27 +0200 Subject: [PATCH 07/21] rpm: 4.16.1.3 -> 4.17.0 https://rpm.org/wiki/Releases/4.17.0 --- pkgs/tools/package-management/rpm/default.nix | 22 +++---------------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 5e46a0336875..910b86e13184 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch +{ stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages , sqlite, zstd @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "rpm"; - version = "4.16.1.3"; + version = "4.17.0"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - sha256 = "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai"; + sha256 = "2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a"; }; outputs = [ "out" "dev" "man" ]; @@ -36,22 +36,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - patches = [ - # Small fixes for ndb on darwin - # https://github.com/rpm-software-management/rpm/pull/1465 - (fetchpatch { - name = "darwin-support.patch"; - url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch"; - sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171"; - }) - # Fix build on aarch64-darwin - # https://github.com/rpm-software-management/rpm/pull/1775 - (fetchpatch { - url = "https://github.com/emilazy/rpm/commit/45120e756930b4787ea2e06fb8a9e623ea13f2f3.patch"; - sha256 = "0zzblwx9apxyjsri4cxd09y9b2hs57r2fck98939j1qgcwy732ar"; - }) - ]; - postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb1330550ecd..dc26cb42c91b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8760,6 +8760,7 @@ with pkgs; rpm = callPackage ../tools/package-management/rpm { python = python3; + lua = lua5_4; }; rpm-ostree = callPackage ../tools/misc/rpm-ostree { From 3ec1a47f2e1f906915eed76d13dc115a7bc2b0d1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Sep 2021 10:22:27 +0100 Subject: [PATCH 08/21] treewide: remove @sdll from maintainers sdll github handle returns 404. Sasha agreed to remove @sdll maintainer entry. --- maintainers/maintainer-list.nix | 6 ------ pkgs/development/python-modules/cymem/default.nix | 6 +++--- pkgs/development/python-modules/ftfy/default.nix | 2 +- pkgs/development/python-modules/murmurhash/default.nix | 2 +- pkgs/development/python-modules/plac/default.nix | 10 +++++----- pkgs/development/python-modules/preshed/default.nix | 10 +++++----- pkgs/development/python-modules/spacy/default.nix | 2 +- pkgs/development/python-modules/thinc/default.nix | 2 +- 8 files changed, 17 insertions(+), 23 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bdce9f9c93ed..2a63e0f8155e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9862,12 +9862,6 @@ githubId = 11613056; name = "Scott Dier"; }; - sdll = { - email = "sasha.delly@gmail.com"; - github = "sdll"; - githubId = 17913919; - name = "Sasha Illarionov"; - }; SeanZicari = { email = "sean.zicari@gmail.com"; github = "SeanZicari"; diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index c2de6d82a5bc..d2d010e9b12f 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - cython + cython ]; prePatch = '' @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 2d3ff1febf5e..5ea93ec179ec 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Given Unicode text, make its representation consistent and possibly less broken"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; license = licenses.mit; - maintainers = with maintainers; [ sdll aborsu ]; + maintainers = with maintainers; [ aborsu ]; }; } diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index ca2ffea183b7..297026c18f72 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Cython bindings for MurmurHash2"; homepage = "https://github.com/explosion/murmurhash"; license = licenses.mit; - maintainers = with maintainers; [ aborsu sdll ]; + maintainers = with maintainers; [ aborsu ]; }; } diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index bf66f7d01f19..2bd50d87dc0b 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { }; checkPhase = '' - cd doc - ${python.interpreter} -m unittest discover -p "*test_plac*" - ''; + cd doc + ${python.interpreter} -m unittest discover -p "*test_plac*" + ''; meta = with lib; { description = "Parsing the Command Line the Easy Way"; homepage = "https://github.com/micheles/plac"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index 4fc1adfbf018..a945dcf8f4e7 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -17,9 +17,9 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - cython - cymem - murmurhash + cython + cymem + murmurhash ]; checkInputs = [ @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Cython hash tables that assume keys are pre-hashed"; homepage = "https://github.com/explosion/preshed"; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 3cabc1d6ba20..376686e0a6e5 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 4aac0d756d46..6ad29d5736d6 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Practical Machine Learning for NLP in Python"; homepage = "https://github.com/explosion/thinc"; license = licenses.mit; - maintainers = with maintainers; [ aborsu sdll ]; + maintainers = with maintainers; [ aborsu ]; }; } From 1b9ce343d4639cddbf1c75647186836389ab1171 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Sep 2021 08:11:31 +0200 Subject: [PATCH 09/21] python3Packages.slack-sdk: 3.11.1 -> 3.11.1 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index c1933198af7e..ec0bfe9320e1 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.11.0"; + version = "3.11.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "0zwz36mpc7syrkslf1rf7c6sxfanw87mbr2758j01sph50m43g6m"; + sha256 = "sha256-csWVzQZAujCLzfLJkUOSHwJZMRqC5GcU4s4kce15qms="; }; propagatedBuildInputs = [ From 489af5702ad9d5dcc0d1b35df10150fcc4f39684 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Sep 2021 08:13:06 +0200 Subject: [PATCH 10/21] python3Packages.pyupgrade: 2.25.1 -> 2.26.0 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 20f5c404b979..3eca1bbaa1bf 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.25.1"; + version = "2.26.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4k4973sNCqE2JbyT901HAijlyymFAR4hJp7NavqlzCQ="; + sha256 = "sha256-fXDBozMZbvMkdqafvPQrCI26OjQ/2Rx6OMQs9X2Q55s="; }; checkInputs = [ pytestCheckHook ]; From 9dd225773bee4de17ba642733473ec6a87d7d6d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Sep 2021 09:20:07 +0200 Subject: [PATCH 11/21] python3Packages.deezer-python: 2.3.0 -> 2.3.1 --- .../python-modules/deezer-python/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 926dadd031cf..f8c754ebb841 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -1,26 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core +, pytest-mock +, pytest-vcr +, pytestCheckHook , pythonOlder , requests , tornado -, poetry-core -, pytestCheckHook -, pytest-cov -, pytest-vcr }: buildPythonPackage rec { pname = "deezer-python"; - version = "2.3.0"; - disabled = pythonOlder "3.6"; + version = "2.3.1"; format = "pyproject"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pRYC0kJHJ5SKgDdGS1KkQEbv+DkF9oPw/A1GnB0AwfQ="; + sha256 = "sha256-0gkPwIz+nZJjxfucy71D0A5CFkhQaW32UH5t1DkuvEs="; }; nativeBuildInputs = [ @@ -29,8 +30,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-cov pytest-vcr + pytest-mock ]; propagatedBuildInputs = [ @@ -38,6 +39,13 @@ buildPythonPackage rec { tornado ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=deezer" "" + ''; + + pythonImportsCheck = [ "deezer" ]; + meta = with lib; { description = "A friendly Python wrapper around the Deezer API"; homepage = "https://github.com/browniebroke/deezer-python"; From 57070db5851b8c547ab8988d0d33ae397aa45738 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Sep 2021 09:30:59 +0200 Subject: [PATCH 12/21] python3Packages.env-canada: 0.5.1 -> 0.5.12 --- pkgs/development/python-modules/env-canada/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 3591bbde5ec7..3b6ba03365a1 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -8,17 +8,18 @@ , pillow , pytestCheckHook , python-dateutil +, voluptuous }: buildPythonPackage rec { pname = "env-canada"; - version = "0.5.1"; + version = "0.5.12"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-tafhOW1wd/D0ojRUdDzp62cQ8w7wgx5ITcWAcoY1i5Y="; + sha256 = "sha256-yrvH0A/+QA9HiKa/ohw5q0IIyWff9s9zu6tT08mIT7w="; }; propagatedBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { lxml pillow python-dateutil + voluptuous ]; checkInputs = [ From 84cf92039c8c44f12bae560b16675f4fc0ede93d Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 20 Sep 2021 14:40:11 +0200 Subject: [PATCH 13/21] visidata: 2.5 -> 2.6 --- pkgs/applications/misc/visidata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 11216b1d8878..b56904e7fd6d 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -24,13 +24,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1iijggdgj36v7d2zm45c00nrbzxaaah2azflpca0f6fjaaxh3lr2"; + sha256 = "sha256-fsk+Cn7CzrOAif5+LUMrs8llSnEfoSLAdg1qOFMJOh8="; }; propagatedBuildInputs = [ From d0da4cba4b960c19c902e65aec9cc21589d42d5e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 20 Sep 2021 12:47:43 -0500 Subject: [PATCH 14/21] fakeroot: Use a fixed git commit as a reference in patch URLs Arch Linux has bumped the fakeroot version and these patch URLs now 404. --- pkgs/tools/system/fakeroot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index bf42e987c4d3..c4d3845df803 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { # glibc 2.33 patches from ArchLinux (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8="; }) ] From c2c5c3da83681b73faf2b98ca80563939ebd8369 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 20 Sep 2021 13:51:28 -0400 Subject: [PATCH 15/21] rust-petname: init at 1.1.1 --- pkgs/tools/text/rust-petname/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/text/rust-petname/default.nix diff --git a/pkgs/tools/text/rust-petname/default.nix b/pkgs/tools/text/rust-petname/default.nix new file mode 100644 index 000000000000..4a3c0f596cfb --- /dev/null +++ b/pkgs/tools/text/rust-petname/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "rust-petname"; + version = "1.1.1"; + + src = fetchCrate { + inherit version; + crateName = "petname"; + sha256 = "sha256-X1p9W+N0Nhh7CSh776ofzHmG0ayi5COLJjBncxmL8CM="; + }; + + cargoSha256 = "sha256-jxN2EKLjf9yKkhZ4wsH72sNdk6UYAcCUrg4+qx75bWs="; + + meta = with lib; { + description = "Generate human readable random names"; + homepage = "https://github.com/allenap/rust-petname"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "petname"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 321f463449ff..6a9f06e5bda4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8808,6 +8808,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + rust-petname = callPackage ../tools/text/rust-petname { }; + rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; }; From 8693ab06727dafe1885e5794355e48834f568fce Mon Sep 17 00:00:00 2001 From: Charlie Hanley Date: Thu, 26 Aug 2021 09:41:29 -0400 Subject: [PATCH 16/21] maintainers: add chanley --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bdce9f9c93ed..5d0b50375906 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1853,6 +1853,12 @@ githubId = 1762540; name = "Changlin Li"; }; + chanley = { + email = "charlieshanley@gmail.com"; + github = "charlieshanley"; + githubId = 8228888; + name = "Charlie Hanley"; + }; CharlesHD = { email = "charleshdespointes@gmail.com"; github = "CharlesHD"; From 762ad924f3c124b59d7dab27cfd8c77ad79bca76 Mon Sep 17 00:00:00 2001 From: Charlie Hanley Date: Sun, 19 Sep 2021 19:09:57 -0400 Subject: [PATCH 17/21] python3Packages.python3-eventlib: init at 0.3.0 --- .../python3-eventlib/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/python3-eventlib/default.nix diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix new file mode 100644 index 000000000000..3c2413ff5943 --- /dev/null +++ b/pkgs/development/python-modules/python3-eventlib/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, zope_interface, twisted, greenlet }: + +buildPythonPackage rec { + pname = "python3-eventlib"; + version = "0.3.0"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "AGProjects"; + repo = "python3-eventlib"; + rev = version; + sha256 = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ="; + }; + + propagatedBuildInputs = [ zope_interface twisted greenlet ]; + + dontUseSetuptoolsCheck = true; + + pythonImportsCheck = [ "eventlib" ]; + + meta = with lib; { + description = "A networking library written in Python"; + homepage = "https://github.com/AGProjects/python3-eventlib"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chanley ]; + longDescription = '' + Eventlib is a networking library written in Python. It achieves high + scalability by using non-blocking I/O while at the same time retaining + high programmer usability by using coroutines to make the non-blocking io + operations appear blocking at the source code level. + ''; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 934e2d87f780..58709999b7dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7150,6 +7150,8 @@ in { pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; + python3-eventlib = callPackage ../development/python-modules/python3-eventlib { }; + python3-openid = callPackage ../development/python-modules/python3-openid { }; python-awair = callPackage ../development/python-modules/python-awair { }; From d236e2cfb4bd874e831e730942f2ed767334d425 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 20 Sep 2021 14:22:20 -0400 Subject: [PATCH 18/21] fundoc: init at 0.4.1 --- pkgs/development/tools/fundoc/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/fundoc/default.nix diff --git a/pkgs/development/tools/fundoc/default.nix b/pkgs/development/tools/fundoc/default.nix new file mode 100644 index 000000000000..47484b78759c --- /dev/null +++ b/pkgs/development/tools/fundoc/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "fundoc"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "csssr"; + repo = pname; + rev = "v${version}"; + sha256 = "0nd03c2lz07ghaab67kgl5pw8z8mv6kwx3xzr4pqr7v5b983py6v"; + }; + + cargoSha256 = "sha256-6riBlCyqNN2nzgwfVfbRy1avT9b0PdetOrbmbaltsjE="; + + meta = with lib; { + description = "Language agnostic documentation generator"; + homepage = "https://github.com/csssr/fundoc"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2374b9c13c4..cebd1f1da10c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14009,6 +14009,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; + fundoc = callPackage ../development/tools/fundoc { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; From 8fc20dfdca1c32e645dcf661f14f358d7ef8f2c4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Sep 2021 19:19:21 +0100 Subject: [PATCH 19/21] libebml: upstream fix for gcc-11 --- pkgs/development/libraries/libebml/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 6a042012132e..84025e24f659 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libebml"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25"; }; + patches = [ + # Upstream fix for gcc-11 + (fetchpatch { + url = "https://github.com/Matroska-Org/libebml/commit/f0bfd53647961e799a43d918c46cf3b6bff89806.patch"; + sha256 = "1yd6rsds03kwx5jki4hihd2bpfh26g5l1pi82qzaqzarixdxwzvl"; + excludes = [ "ChangeLog" ]; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ From 857c478cbd7758ef7d985900b37ceb3ec3fe2a2d Mon Sep 17 00:00:00 2001 From: Charlie Hanley Date: Sun, 19 Sep 2021 18:10:32 -0400 Subject: [PATCH 20/21] python3Packages.python3-application: init at 3.0.3 --- .../python3-application/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/python3-application/default.nix diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix new file mode 100644 index 000000000000..cddb354a5db2 --- /dev/null +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -0,0 +1,47 @@ +{ lib, isPy3k, buildPythonPackage, fetchFromGitHub, fetchpatch, zope_interface, twisted }: + +buildPythonPackage rec { + pname = "python3-application"; + version = "3.0.3"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "AGProjects"; + repo = pname; + rev = version; + sha256 = "sha256-oscUI/Ag/UXmAi/LN1pPTdyqQe9aAfeQzhKFxaTmW3A="; + }; + + patches = [ + # Apply bugfix commit that is not yet part of a release + (fetchpatch { + name = "fix-time-import.patch"; + url = "https://github.com/AGProjects/${pname}/commit/695f7d769e69c84e065872ffb403157d0af282fd.patch"; + sha256 = "sha256-MGs8uUIFXkPXStOn5oCNNEMVmcKrq8YPl8Xvl3OTOUM="; + }) + ]; + + propagatedBuildInputs = [ zope_interface twisted ]; + + pythonImportsCheck = [ "application" ]; + + meta = with lib; { + description = "A collection of modules that are useful when building python applications"; + homepage = "https://github.com/AGProjects/python3-application"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chanley ]; + longDescription = '' + This package is a collection of modules that are useful when building python applications. Their purpose is to eliminate the need to divert resources into implementing the small tasks that every application needs to do in order to run successfully and focus instead on the application logic itself. + The modules that the application package provides are: + 1. process - UNIX process and signal management. + 2. python - python utility classes and functions. + 3. configuration - a simple interface to handle configuration files. + 4. log - an extensible system logger for console and syslog. + 5. debug - memory troubleshooting and execution timing. + 6. system - interaction with the underlying operating system. + 7. notification - an application wide notification system. + 8. version - manage version numbers for applications and packages. + ''; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58709999b7dc..048dcf9e3bd7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7150,6 +7150,8 @@ in { pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; + python3-application = callPackage ../development/python-modules/python3-application { }; + python3-eventlib = callPackage ../development/python-modules/python3-eventlib { }; python3-openid = callPackage ../development/python-modules/python3-openid { }; From 0cd345bcc470627d057eb94afa5a470fbb24830a Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 20 Sep 2021 15:12:25 -0400 Subject: [PATCH 21/21] tv: 0.5.3 -> 0.6.0 --- pkgs/tools/text/tv/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/tv/default.nix b/pkgs/tools/text/tv/default.nix index 8bd5433ad25d..bb3dd9582c90 100644 --- a/pkgs/tools/text/tv/default.nix +++ b/pkgs/tools/text/tv/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "tv"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "uzimaru0000"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mh/+MX0MZM1fsi9HGTioRRH1DVatmkdyiwAgG/42cVU="; + sha256 = "sha256-4PcD0keG3OVZPv6MA+rNSL9lysrseJUA6C5cd2f6LRY="; }; - cargoSha256 = "sha256-8uxW0EIeMPvgffYW55Ov1euoVi8Zz9fZ4F44ktxvj9Q="; + cargoSha256 = "sha256-E4qMxCqgJYIA8E6A0d8iUYTbKif5T51zcFdc+Ptq7qc="; meta = with lib; { description = "Format json into table view"; homepage = "https://github.com/uzimaru0000/tv"; + changelog = "https://github.com/uzimaru0000/tv/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; };