From 8039e186a10fb8e1540b6b2619d8d90a6eed1dcd Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 23 Nov 2021 17:43:56 +0100 Subject: [PATCH 01/57] stayrtr: init at 0.3.0 --- pkgs/servers/stayrtr/default.nix | 36 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/servers/stayrtr/default.nix diff --git a/pkgs/servers/stayrtr/default.nix b/pkgs/servers/stayrtr/default.nix new file mode 100644 index 000000000000..cee68bd2f61b --- /dev/null +++ b/pkgs/servers/stayrtr/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, stayrtr +, testVersion +}: + +buildGoModule rec { + pname = "stayrtr"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "bgp"; + repo = "stayrtr"; + rev = "v${version}"; + sha256 = "10ndb8p7znnjycwg56m63gzqf9zc6lq9mcvz4n48j0c4il5xyn8x"; + }; + vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + passthru.tests.version = testVersion { + package = stayrtr; + }; + + meta = with lib; { + description = "Simple RPKI-To-Router server. (Hard fork of GoRTR)"; + homepage = "https://github.com/bgp/stayrtr/"; + license = licenses.bsd3; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaf92ebfeffa..cf107454f808 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33668,6 +33668,8 @@ with pkgs; gortr = callPackage ../servers/gortr {}; + stayrtr = callPackage ../servers/stayrtr {}; + sentencepiece = callPackage ../development/libraries/sentencepiece {}; kcli = callPackage ../development/tools/kcli {}; From 8b43c30702f0de5457536fa3910674c9def42378 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 08:54:00 +0000 Subject: [PATCH 02/57] dpt-rp1-py: 0.1.15 -> 0.1.16 --- pkgs/tools/misc/dpt-rp1-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix index 75a95d153035..5f1e53f8105f 100644 --- a/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -1,13 +1,13 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dpt-rp1-py"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { owner = "janten"; repo = pname; rev = "v${version}"; - sha256 = "0kmhsx6n3wjzqcvfnpvdxiiwzxr51khgrl0kgaaas8hwq246l65d"; + sha256 = "0zvf09b9rzpx5b0w81ziqd7v321hfhgsgvshdx23karj2hf75bvj"; }; doCheck = false; From 44586149d7bee67a30449d289a4379c30c9544c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 09:36:06 +0000 Subject: [PATCH 03/57] dcw-gmt: 2.0.1 -> 2.0.2 --- pkgs/applications/gis/gmt/dcw.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix index 5672fe0905d7..627ca8088957 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/applications/gis/gmt/dcw.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "dcw-gmt"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; - sha256 = "sha256-XJCylo9Alc9epEo1TcnY+d0bj+VRTgM4/4W0jgNUeiU="; + sha256 = "sha256-KzAPAco1DbF6rdAmCuM7823GthvkFQ5mgpAzzsPWXDw="; }; installPhase = '' From d18cb53238d32893cf4a72229130ff8aa3726630 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 31 Dec 2021 13:02:20 +0100 Subject: [PATCH 04/57] python3Packages.hahomematic: 0.9.0 -> 0.9.1 --- 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 6f4e456d11bc..287e12afe78e 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-Tp8m5Kw+mubJXKgov+CbfwtzWYzmqyjK1Q9gRkivTxk="; + sha256 = "sha256-sxYa0SCsX1NZlCRMIpwyU1KPEteVH5HGLx1dFsbiu/E="; }; propagatedBuildInputs = [ From 7b7f200804cb59235c42a2a767773edb36c25566 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 31 Dec 2021 13:04:16 +0100 Subject: [PATCH 05/57] checkov: 2.0.695 -> 2.0.701 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 2c03330ccbcd..fdd6fefd7600 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.695"; + version = "2.0.701"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-7ppEMlgdZrMWzKmJfivU6qLSHTgvC+WSiOLdjiRWKP8="; + sha256 = "sha256-jhMhi+72lB70WXzPRWfhZjqmkEjvBMjKcnVic41PDJk="; }; nativeBuildInputs = with py.pkgs; [ From 5178944f6cbffed46fc8abdc5c7b53ff1463dc5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 14:54:31 +0000 Subject: [PATCH 06/57] cgal_5: 5.3 -> 5.3.1 --- pkgs/development/libraries/CGAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index d83560568121..630ff8a6964f 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.3"; + version = "5.3.1"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "sha256-ogY47Ggtj9k2U5pop1DNFkTusgQi2nNLc5OGN45SBCk="; + sha256 = "sha256-atILY/d2b99v0Kk226KwJ/qEcJnWBhtge52wkz6Bgcg="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; From 49754f48882a8847132ab7b034acfb759f967c94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 17:13:10 +0000 Subject: [PATCH 07/57] bctoolbox: 5.0.55 -> 5.0.58 --- pkgs/development/libraries/bctoolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index f03014b2cd70..2d8ddb27ad4a 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.0.55"; + version = "5.0.58"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-fZ+8XBTZ6/wNd8odzg20dAXtbjRudI6Nw0hKC9bopGo="; + sha256 = "sha256-N7XxGTZkMSL+zyKHteVeRoZ63ZdT5Pq60xi9v6QURxA="; }; # Do not build static libraries From 719567e91f22de6279269441df85a064d2f11f82 Mon Sep 17 00:00:00 2001 From: Yana Timoshenko Date: Fri, 31 Dec 2021 21:48:55 +0300 Subject: [PATCH 08/57] maintainers: update personal details --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/applications/audio/lmms/default.nix | 2 +- pkgs/applications/misc/redshift/575.patch | 2 +- pkgs/applications/misc/redshift/default.nix | 2 +- pkgs/applications/misc/toggldesktop/default.nix | 6 +++--- .../instant-messengers/SkypeExport/default.nix | 2 +- .../build-fhs-userenv/chrootenv/default.nix | 2 +- pkgs/development/libraries/libcacard/default.nix | 2 +- .../libraries/libinotify-kqueue/default.nix | 2 +- pkgs/development/libraries/liblcf/default.nix | 2 +- pkgs/development/libraries/qrencode/default.nix | 2 +- pkgs/development/mobile/imgpatchtools/default.nix | 2 +- pkgs/development/tools/pup/default.nix | 2 +- pkgs/games/easyrpg-player/default.nix | 2 +- pkgs/games/pokerth/default.nix | 2 +- pkgs/misc/emulators/epsxe/default.nix | 2 +- pkgs/misc/emulators/mednaffe/default.nix | 2 +- pkgs/os-specific/windows/pthread-w32/default.nix | 2 +- pkgs/tools/cd-dvd/ccd2iso/default.nix | 2 +- pkgs/tools/inputmethods/ibus/default.nix | 2 +- pkgs/tools/misc/tio/default.nix | 2 +- pkgs/tools/networking/wireguard-go/default.nix | 2 +- pkgs/tools/security/qdigidoc/default.nix | 2 +- 23 files changed, 30 insertions(+), 30 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e49f8efaefec..f82c1ce6c267 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12851,6 +12851,12 @@ githubId = 2242427; name = "Yoann Ono"; }; + yana = { + email = "yana@riseup.net"; + github = "alpakido"; + githubId = 1643293; + name = "Yana Timoshenko"; + }; yarny = { email = "41838844+Yarny0@users.noreply.github.com"; github = "Yarny0"; @@ -12870,12 +12876,6 @@ githubId = 73759599; name = "Lara A."; }; - yegortimoshenko = { - email = "yegortimoshenko@riseup.net"; - github = "yegortimoshenko"; - githubId = 1643293; - name = "Yegor Timoshenko"; - }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 4830476af2c8..22d9b3fed976 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -43,6 +43,6 @@ mkDerivation rec { homepage = "https://lmms.io"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ goibhniu yegortimoshenko ]; + maintainers = with maintainers; [ goibhniu yana ]; }; } diff --git a/pkgs/applications/misc/redshift/575.patch b/pkgs/applications/misc/redshift/575.patch index d731d8ec43ad..f5beeb6ce518 100644 --- a/pkgs/applications/misc/redshift/575.patch +++ b/pkgs/applications/misc/redshift/575.patch @@ -1,5 +1,5 @@ From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001 -From: Yegor Timoshenko +From: Yana Timoshenko Date: Tue, 16 Jan 2018 11:43:46 +0000 Subject: [PATCH] Fix Autoconf script diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 5798473db5e0..311c28db556a 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -108,7 +108,7 @@ rec { license = licenses.gpl3Plus; homepage = "http://jonls.dk/redshift"; platforms = platforms.unix; - maintainers = with maintainers; [ yegortimoshenko globin ]; + maintainers = with maintainers; [ globin yana ]; }; }; diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index 44c46f746550..dfd68fd5ac19 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -16,7 +16,7 @@ let version = "20180522.005732"; src = fetchzip { - url = "https://github.com/yegortimoshenko/bugsnag-qt/archive/${version}.tar.gz"; + url = "https://github.com/alpakido/bugsnag-qt/archive/${version}.tar.gz"; sha256 = "02s6mlggh0i4a856md46dipy6mh47isap82jlwmjr7hfsk2ykgnq"; }; @@ -42,7 +42,7 @@ let version = "20190125.190943"; src = fetchzip { - url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz"; + url = "https://github.com/alpakido/qt-oauth-lib/archive/${version}.tar.gz"; sha256 = "0zmfgvdf6n79mgfvbda7lkdxxlzjmy86436gqi2r5x05vq04sfrj"; }; @@ -143,7 +143,7 @@ buildEnv { description = "Client for Toggl time tracking service"; homepage = "https://github.com/toggl/toggldesktop"; license = licenses.bsd3; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index bab9d12123df..a150014daa7c 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; }; } diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index 15d7b3153580..b9d2de7277eb 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Setup mount/user namespace for FHS emulation"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 3585daefbf58..1ab5b428f57a 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Smart card emulation library"; homepage = "https://gitlab.freedesktop.org/spice/libcacard"; license = licenses.lgpl21; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index ff74060d3d46..1f147b0ad5c5 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Inotify shim for macOS and BSD"; homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd; }; } diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 1e6f57368b78..50c41982450f 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index c005b835a932..abab060bf2cd 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ adolfogc yegortimoshenko ]; + maintainers = with maintainers; [ adolfogc yana ]; platforms = platforms.all; }; } diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix index 2b746423cfe9..f5725054bb5e 100644 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/erfanoabdi/imgpatchtools"; license = licenses.gpl3; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 018232b3f40a..8cdfddb7f016 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/default.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "Parsing HTML at the command line"; homepage = "https://github.com/ericchiang/pup"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 yana ]; }; } diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index 81968d25e3dc..83e40a4c3407 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "RPG Maker 2000/2003 and EasyRPG games interpreter"; homepage = "https://easyrpg.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 1c9879f8beb9..ffae1b5cd8f6 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -65,7 +65,7 @@ mkDerivation rec { homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; license = licenses.gpl3; - maintainers = with maintainers; [ obadz yegortimoshenko ]; + maintainers = with maintainers; [ obadz yana ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index f70e90e98722..f39c2ae74ac4 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "http://epsxe.com/"; description = "Enhanced PSX (PlayStation 1) emulator"; license = licenses.unfree; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index c8363b8d6041..4874d5efee7a 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "GTK-based frontend for mednafen emulator"; homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sheenobu yegortimoshenko AndersonTorres ]; + maintainers = with maintainers; [ sheenobu yana AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index de909828f7a2..da0fe569a480 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "POSIX threads library for Windows"; homepage = "https://sourceware.org/pthreads-win32"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.windows; }; } diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index ad3fee9792c6..1fe606e6acc2 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "CloneCD to ISO converter"; homepage = "https://sourceforge.net/projects/ccd2iso/"; license = licenses.gpl2; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index a0aea92ea4af..50b9dba51d35 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -169,6 +169,6 @@ stdenv.mkDerivation rec { description = "Intelligent Input Bus, input method framework"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel yegortimoshenko ]; + maintainers = with maintainers; [ ttuegel yana ]; }; } diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index 9b8e76f10c43..b49cfa44c18d 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Serial console TTY"; homepage = "https://tio.github.io/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 3fa487a7dc6d..6f7bc6caa7f0 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -25,6 +25,6 @@ buildGoPackage rec { description = "Userspace Go implementation of WireGuard"; homepage = "https://git.zx2c4.com/wireguard-go/about/"; license = licenses.mit; - maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ]; + maintainers = with maintainers; [ elseym kirelagin yana zx2c4 ]; }; } diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index c0b2f73d5c17..b47a2455b672 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -45,6 +45,6 @@ mkDerivation rec { homepage = "https://www.id.ee/"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ yegortimoshenko mmahut ]; + maintainers = with maintainers; [ mmahut yana ]; }; } From 3789776ec243066716ed9154cea45d9db2311cf9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:43:11 +0700 Subject: [PATCH 09/57] microscheme: fix meta.homepage --- pkgs/development/compilers/microscheme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index 1f3a98de821e..fa65622ba0cd 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { - homepage = "http://microscheme.org"; + homepage = "https://ryansuchocki.github.io/microscheme/"; description = "A Scheme subset for Atmel microcontrollers"; longDescription = '' Microscheme is a Scheme subset/variant designed for Atmel From 42e649dbb93af84a35cb486b97ef0a4901e58310 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:48:29 +0700 Subject: [PATCH 10/57] popfile: fix meta.homepage --- pkgs/tools/text/popfile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 7cfb2d2d6a4b..7dec478a6342 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "An email classification system that automatically sorts messages and fights spam"; - homepage = "http://getpopfile.org"; + homepage = "https://getpopfile.org/"; license = lib.licenses.gpl2; # Should work on macOS, but havent tested it. From e034dfaa3060cbc03c6acc81ba80f630aa1f89ad Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:48:50 +0700 Subject: [PATCH 11/57] mysqltuner: fix meta.homepage --- pkgs/tools/misc/mysqltuner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index d55d2971535d..f4dbf2cef6e1 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; - homepage = "http://mysqltuner.com"; + homepage = "https://mysqltuner.com/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg shamilton ]; }; From 0fcc2b59ffac125d0558995a75bda3d4abf0e09d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:49:04 +0700 Subject: [PATCH 12/57] meteor: fix meta.homepage --- pkgs/servers/meteor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index ac870a8d5d15..fb9221b93964 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Complete open source platform for building web and mobile apps in pure JavaScript"; - homepage = "http://www.meteor.com"; + homepage = "https://www.meteor.com/"; license = licenses.mit; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ cstrahan ]; From 84ffe78949c8f7adad559a2e5187ae1b6b1e0890 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:49:24 +0700 Subject: [PATCH 13/57] premake: fix meta.homepage --- pkgs/development/tools/misc/premake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index ccd8a4574a1f..192a7746203b 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "http://industriousone.com/premake"; + homepage = "https://premake.github.io/"; description = "A simple build configuration and project generation tool using lua"; license = lib.licenses.bsd3; platforms = platforms.unix; From 9e404fc0e6f8a5dec91930c08606f53514629014 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:49:33 +0700 Subject: [PATCH 14/57] opengrm-ngram: fix meta.homepage --- pkgs/development/libraries/opengrm-ngram/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix index 3b00ae17e910..06f2e3542bba 100644 --- a/pkgs/development/libraries/opengrm-ngram/default.nix +++ b/pkgs/development/libraries/opengrm-ngram/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers"; - homepage = "http://www.openfst.org/twiki/bin/view/GRM/NGramLibrary"; + homepage = "https://www.openfst.org/twiki/bin/view/GRM/NGramLibrary"; license = licenses.asl20; maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; From 6b4efc2c2e19f1173a4461b6a3dc083c2f3dabdb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:49:46 +0700 Subject: [PATCH 15/57] pekwm: fix meta.homepage --- pkgs/applications/window-managers/pekwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index fcce16c08ba6..5550e6f706e7 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { appear as they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - homepage = "http://www.pekwm.org"; + homepage = "https://www.pekwm.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; From c5b36a0c919acc882129078a5ed618a7f8e9e368 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:49:54 +0700 Subject: [PATCH 16/57] openfst: fix meta.homepage --- pkgs/development/libraries/openfst/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 08767680ffd6..599d1cad0cc5 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { FSTs have key applications in speech recognition and synthesis, machine translation, optical character recognition, pattern matching, string processing, machine learning, information extraction and retrieval among others ''; - homepage = "http://www.openfst.org/twiki/bin/view/FST/WebHome"; + homepage = "https://www.openfst.org/twiki/bin/view/FST/WebHome"; license = licenses.asl20; maintainers = [ maintainers.dfordivam ]; platforms = platforms.unix; From 3e70e92c4a1275537e86ff852e267f21a4f6ae0d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:50:04 +0700 Subject: [PATCH 17/57] mkgmap-splitter: fix meta.homepage --- pkgs/applications/misc/mkgmap/splitter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 564867712a67..db89e538d51f 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility for splitting OpenStreetMap maps into tiles"; - homepage = "http://www.mkgmap.org.uk"; + homepage = "https://www.mkgmap.org.uk/"; downloadPage = "https://www.mkgmap.org.uk/download/splitter.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; From 8023a221c6197773645ade8066a39b574dcfc3e6 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:50:12 +0700 Subject: [PATCH 18/57] mkgmap: fix meta.homepage --- pkgs/applications/misc/mkgmap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 668740acaf3a..74926b252eb5 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; - homepage = "http://www.mkgmap.org.uk"; + homepage = "https://www.mkgmap.org.uk/"; downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; From 7eca037d30645f11a6b4fb28eb7145074f1e38b6 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:50:21 +0700 Subject: [PATCH 19/57] pbrt: fix meta.homepage --- pkgs/applications/graphics/pbrt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 9fdf92a4ae80..587a078e0660 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ zlib ]; meta = with lib; { - homepage = "http://pbrt.org"; + homepage = "https://pbrt.org/"; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; platforms = platforms.linux; license = licenses.bsd2; From c2f109451cbd8327bb7e7d8e5bfd7478af8bf075 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 1 Jan 2022 01:50:30 +0700 Subject: [PATCH 20/57] milkytracker: fix meta.homepage --- pkgs/applications/audio/milkytracker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 32e5cec9dd02..47fbd5794ea0 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Music tracker application, similar to Fasttracker II"; - homepage = "http://milkytracker.org"; + homepage = "https://milkytracker.org/"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; []; From 22eb1ae0fe86f3c2959efeaf8a5d1f117e23f499 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 14:41:28 +0000 Subject: [PATCH 21/57] nsd: 4.3.8 -> 4.3.9 --- pkgs/servers/dns/nsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 37ed309a61e0..e9f030dac785 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.8"; + version = "4.3.9"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-EYl+JfcvWpj5ICvVN4yTaIbVQ3YFGmFNNojkUenLmeE="; + sha256 = "sha256-UxVJ8JKJ7L0Fgp4UuzRWMpTYW57d4sYToA9ZevITXo0="; }; prePatch = '' From ea77a1acf3075da6daeeee77a2421c27cae37d61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 13:26:21 +0000 Subject: [PATCH 22/57] opera: 82.0.4227.23 -> 82.0.4227.43 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index c53d4c132f4f..642781d570a7 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "82.0.4227.23"; + version = "82.0.4227.43"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-jA8fglRLH0aqhjsD65bsieplCLCJXgdBViPGrAu9sSQ="; + sha256 = "sha256-DFhf62dqk7qA2k+JgVqGLxF30UPwQwhXD105Qua25X0="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; From 768cbb76ba665409f69938615f2ba4c6c96606a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Dec 2021 02:55:03 +0000 Subject: [PATCH 23/57] python38Packages.plumbum: 1.7.1 -> 1.7.2 --- pkgs/development/python-modules/plumbum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index a99591c259d9..e571f276f28f 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.7.1"; + version = "1.7.2"; checkInputs = [ pytest ]; @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3c0ac8c4ee57b2adddc82909d3c738a62ef5f77faf24ec7cb6f0a117e1679740"; + sha256 = "0d1bf908076bbd0484d16412479cb97d6843069ee19f99e267e11dd980040523"; }; } From a8867f7f6bb81bcdbf9ccb38f05a341c2482f054 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Dec 2021 04:49:51 +0000 Subject: [PATCH 24/57] python38Packages.qtconsole: 5.2.1 -> 5.2.2 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index b56e80eb80c7..4cf9bd022dab 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.2.1"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "bb3b9f0d674055e627c1097779c0d5e028176706d3b6be39cf52235f6ddcc88e"; + sha256 = "8f9db97b27782184efd0a0f2d57ea3bd852d053747a2e442a9011329c082976d"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From 3563230176df27d019ceee21289fbba3bda402b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Dec 2021 07:51:08 +0000 Subject: [PATCH 25/57] sentry-native: 0.4.12 -> 0.4.13 --- pkgs/development/libraries/sentry-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index af2a5e64d119..ba4c8fcd0efd 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-ut864o4LHmuHYJszFz7LFoIiSvf6a0S42xmV51CVBQ0="; + sha256 = "sha256-btgv/GwwQhT/DtWhjM/g081UYLT7E76ZhqXZdMiIWsk="; }; nativeBuildInputs = [ cmake ]; From b9c3060cda11305760c6b24c12bdf12f1dea7e9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 11:54:46 +0000 Subject: [PATCH 26/57] frugal: 3.14.11 -> 3.14.12 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 0fc0abca7b0c..fb6a4f496248 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.11"; + version = "3.14.12"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XUG9Md6T0/+yn3KGqJO09FFlpuli2wJqOf/SEIVKXac="; + sha256 = "sha256-2fXefYvcclcxMeX6JtHjoVNRwJTsUAhxet646BDPHic="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-Z42t9dGlNbSwNy2N/ZoEejkbIEeUUk87mcYhkTnxhpc="; + vendorSha256 = "sha256-4Ak+mh9ege38iO1QyxvGkYvRyU11QjphfLrit1qfu58="; meta = with lib; { description = "Thrift improved"; From c66f7a2d032f15ffdbe76b0a39167e7950a90fac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 09:36:09 +0000 Subject: [PATCH 27/57] doppler: 3.35.0 -> 3.36.2 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 2bd087fe4a46..27b44ce6042a 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.35.0"; + version = "3.36.2"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-Eb6msMl5X8ct9XlVlrxbnkXSEouzK/jCW94qm3PTXBQ="; + sha256 = "sha256-T8WqQTB3ogxGiImkyZUUbKcXTdSgGM0Vb4OkckslzYE="; }; vendorSha256 = "sha256-VPxHxNtDeP5CFDMTeMsZYED9ZGWMquJdeupeCVldY/E="; From a712326cfbb1a682d9b6d22ac448eee11b01cfc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 15:49:38 +0000 Subject: [PATCH 28/57] htmldoc: 1.9.13 -> 1.9.14 --- pkgs/tools/typesetting/htmldoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index e29447011bc3..cd48a3fd8765 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "htmldoc"; - version = "1.9.13"; + version = "1.9.14"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; rev = "v${version}"; - sha256 = "sha256-wAqH3BKNYbOXMbnaRhz4QZ/49stxC2Qf+yatKBv0i68="; + sha256 = "sha256-mPykntRKu2NrIIGYGNCATUC3k/dvRmVkjHyhBeFfQ2U="; }; nativeBuildInputs = [ pkg-config ]; From 4bd2b68a96e12765c2d62921812b187c877ee332 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 15:26:13 +0000 Subject: [PATCH 29/57] heimer: 3.0.0 -> 3.1.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index dba3ef4ee8a8..1510c992f354 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-Q1a+sGZTVUjViakBT3E7+AgqMSldAnp7UJcsSS6KZXs="; + sha256 = "sha256-F0Pl6Wk+sGfOegy7iljQH63kAMYlRYv7G9nBAAtDEkg="; }; nativeBuildInputs = [ cmake ]; From dcf4b19f295f224cb617f55b8056db8a4816ba06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 15:05:40 +0000 Subject: [PATCH 30/57] nwg-panel: 0.5.1 -> 0.5.4 --- pkgs/applications/misc/nwg-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 2b1e81720d83..6798e73c9314 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -13,13 +13,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - sha256 = "0i3g6brw8y17lzq6yzqc91x5w8na8wpqj57zq72zhgdji39n0g0d"; + sha256 = "0vl9vfgpa1byf9vxn03j58h9zcbjd1y83b0kgv97cxm2mhqz12dg"; }; # No tests From 741bca91e1ac72a9f2d941f7ecc88d0aef21ceb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 17:16:12 +0000 Subject: [PATCH 31/57] monetdb: 11.41.11 -> 11.41.13 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index fe6e2cac92aa..3a21676e710c 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.41.11"; + version = "11.41.13"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "sha256-SiZvAvsl2NPa5AxeLtpvWwDhl7ZC0Z/6H/l1hCGpWzw="; + sha256 = "sha256-42u/sWUEOlCGe9UaWnUQJJ39TIE6OBI/5P9sKxKvreM="; }; postPatch = '' From 74939879df704cea2d8f7f3d2efbe385524fb631 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 16:30:49 +0000 Subject: [PATCH 32/57] imgui: 1.85 -> 1.86 --- pkgs/development/libraries/imgui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 94dd9f95d390..038c5a036200 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.85"; + version = "1.86"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-HQsGlsvmf3ikqhGnJHf/d6SRCY/QDeW7XUTwXQH/JYE="; + sha256 = "sha256-NuyWrtD+/bRkMlsvU0gNkQhDJVlSPPWhBELN/AtYRwk="; }; dontBuild = true; From 4fc926f61cbeb00fd31fa82218060262251b299f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 16:01:52 +0000 Subject: [PATCH 33/57] hugo: 0.91.1 -> 0.91.2 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 9340a6caccba..34d565fdfeb5 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.91.1"; + version = "0.91.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TPJGRXiZQ7yEttGFpVdiFcyUL5emfjfuoq3k+dQmKCg="; + sha256 = "sha256-6bqtw0hUrRBhTwEDURaTjgl3aVVCbfxjoPRfhSd3LK8="; }; - vendorSha256 = "sha256-ViWbqWjlHd8yosxe+CF1GJ9oK+plOn9s7ruhgsX/v58="; + vendorSha256 = "sha256-CO+7WgoTsFCd9vkcALKcJP6Kj3CIWr5FF75/WgbK04g="; doCheck = false; From 65f95f5defa2b421dc56863e9e8b74e1838aeee1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Dec 2021 09:07:38 +0000 Subject: [PATCH 34/57] vice: 3.5 -> 3.6 --- pkgs/misc/emulators/vice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 00819e3b35c4..bfe2cae5120f 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "vice"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; - sha256 = "sha256-Vrl4+q64solgMr1gTQPDUBACGH7vHKWM7O1A8Rpl3A4="; + sha256 = "sha256-Zb/lXM5ifbm1oKx4dqkMCH6f6G6fVRfoCURsQGSi0/0="; }; nativeBuildInputs = [ From 99df3dc2d9c058457ed953d20f95e4c5fa18df74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Dec 2021 05:30:10 +0000 Subject: [PATCH 35/57] rpm-ostree: 2021.9 -> 2021.14 --- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index c4764923c7a9..bfc2ce2c0e99 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2021.9"; + version = "2021.14"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DvATvvAliJhEItbOlK1CA/ibhzImw651pkplqpRG+OQ="; + sha256 = "sha256-WOG21wSbjXMc/6OHJBEKFOhvnIt+SFpZikB8XkfN32Y="; }; nativeBuildInputs = [ From 95a5c4d4d78c1cd334dc0df16652601364e71f46 Mon Sep 17 00:00:00 2001 From: Alexander Tsvyashchenko Date: Thu, 30 Dec 2021 18:17:29 +0100 Subject: [PATCH 36/57] python3Packages.deepdish: init at 0.3.7 --- .../python-modules/deepdish/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/deepdish/default.nix diff --git a/pkgs/development/python-modules/deepdish/default.nix b/pkgs/development/python-modules/deepdish/default.nix new file mode 100644 index 000000000000..6ae9316a0f6d --- /dev/null +++ b/pkgs/development/python-modules/deepdish/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, scipy +, tables +}: + +buildPythonPackage rec { + pname = "deepdish"; + version = "0.3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wqzwh3y0mjdyba5kfbvlamn561d3afz50zi712c7klkysz3mzva"; + }; + + propagatedBuildInputs = [ + numpy + scipy + tables + ]; + + pythonImportsCheck = [ + "deepdish" + ]; + + # checkInputs = [ + # pandas + # ]; + + # The tests are broken: `ModuleNotFoundError: No module named 'deepdish.six.conf'` + doCheck = false; + + meta = with lib; { + description = "Flexible HDF5 saving/loading and other data science tools from the University of Chicago."; + homepage = "https://github.com/uchicago-cs/deepdish"; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8a2a6f0d8b9..1a392dee5d8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2044,6 +2044,8 @@ in { deepdiff = callPackage ../development/python-modules/deepdiff { }; + deepdish = callPackage ../development/python-modules/deepdish { }; + deepmerge = callPackage ../development/python-modules/deepmerge { }; deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; From d58a493e94dc5014e6298c1ee6c755823c5791e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 23:16:44 +0000 Subject: [PATCH 37/57] python38Packages.nltk: 3.6.6 -> 3.6.7 --- pkgs/development/python-modules/nltk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index df49f1d0f57b..9267f70c2c01 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.6.6"; + version = "3.6.7"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0f8ff4e261c78605bca284e8d2025e562304766156af32a1731f56b396ee364b"; + sha256 = "51bf1aef5304740a708be7c8e683f7798f03dc5c7a7e7feb758be9e95f4585e3"; }; propagatedBuildInputs = [ From a378c8c9838553eadee18cfde78da3c086c971a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Dec 2021 11:37:10 +0000 Subject: [PATCH 38/57] python3Packages.pikepdf: 4.2.0 -> 4.3.0 https://github.com/pikepdf/pikepdf/blob/v4.3.0/docs/release_notes.rst --- pkgs/development/python-modules/pikepdf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index feea54a77b22..6f0f733c4723 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -8,6 +8,7 @@ , jbig2dec , lxml , mupdf +, packaging , pillow , psutil , pybind11 @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "4.2.0"; + version = "4.3.0"; disabled = ! isPy3k; src = fetchFromGitHub { @@ -37,7 +38,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-8ForstZzRpr2TnOgK/+y4aF3R7XMEYfcSQhntA765Co="; + hash = "sha256-9dSJ6+rZd49rFSQExYnFBGQGZ8MnFM+z/0Iz/nYkW4E="; }; patches = [ @@ -73,6 +74,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml lxml + packaging pillow setuptools ]; From 51cb27c198532b59a5b860f1dd3651ada287d441 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Dec 2021 07:33:59 +0000 Subject: [PATCH 39/57] glfw: 3.3.5 -> 3.3.6 --- pkgs/development/libraries/glfw/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index a860eed37a72..53409ec7f732 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "3.3.5"; + version = "3.3.6"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-1KkzYclOLGqiV1/8BsJ3e+pXMQ6a+sjLwZ7mjSuxxbA="; + sha256 = "sha256-mYcnucIRudLLySShKSDzsQfuoM2/0guKpeLSGuAWEkQ="; }; # Fix freezing on Wayland (https://github.com/glfw/glfw/pull/1711) From ec3a993710d73c27cf7cf4a45fe69ff1c4d834ef Mon Sep 17 00:00:00 2001 From: Max Niederman Date: Fri, 31 Dec 2021 12:26:20 -0800 Subject: [PATCH 40/57] gitignore: add .vscode/ --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 85b94d882521..1411ef7e1c7c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .*.swp .*.swo .idea/ +.vscode/ outputs/ result result-* From bfd6db1574c45a87d2b4d7b23508ae3faa6e06e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 13:46:34 +0000 Subject: [PATCH 41/57] mysql80: 8.0.26 -> 8.0.27 --- pkgs/servers/sql/mysql/8.0.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index e37789e7ee6c..58b264c9b1e2 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.26"; + version = "8.0.27"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "sha256-293Nx3L4BscRo3MTY6UPPTWeqsnF0UgAhHKKHCzl2k0="; + sha256 = "sha256-Sn5y+Jnm8kvNR503jt0vMvWD5of5OiYpF3SBXVpUm5c="; }; patches = [ From da7010ee7d67a0d6d28e2c3504057fa9439b6caa Mon Sep 17 00:00:00 2001 From: Alexander Tsvyashchenko Date: Thu, 30 Dec 2021 18:16:57 +0100 Subject: [PATCH 42/57] python3Packages.objax: init at 1.4.0 --- .../python-modules/objax/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/objax/default.nix diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix new file mode 100644 index 000000000000..fb48f9141e2a --- /dev/null +++ b/pkgs/development/python-modules/objax/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, jax +, jaxlib +, numpy +, parameterized +, pillow +, scipy +, tensorflow-tensorboard_2 ? null +}: + +buildPythonPackage rec { + pname = "objax"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "objax"; + rev = "v${version}"; + sha256 = "09gm61ghn5mi92q5mhx22mcv6aa6z78jsrnfar1hd3nwwyn9dq42"; + }; + + propagatedBuildInputs = [ + jax + jaxlib + numpy + parameterized + pillow + scipy + tensorflow-tensorboard_2 + ]; + + pythonImportsCheck = [ + "objax" + ]; + + meta = with lib; { + description = "Objax is a machine learning framework that provides an Object Oriented layer for JAX."; + homepage = "https://github.com/google/objax"; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + # Darwin doesn't have `tensorflow-tensorboard_2` which is required by wheel deps. + platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a392dee5d8b..fbcb8f33be74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5460,6 +5460,8 @@ in { obfsproxy = callPackage ../development/python-modules/obfsproxy { }; + objax = callPackage ../development/python-modules/objax { }; + objgraph = callPackage ../development/python-modules/objgraph { # requires both the graphviz package and python package graphvizPkgs = pkgs.graphviz; From ed3cc3b3560075a583719a0f18f617a2b2e6bf46 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 Jan 2022 08:11:56 +1000 Subject: [PATCH 43/57] direnv: 2.30.1 -> 2.30.2 (#152648) https://github.com/direnv/direnv/releases/tag/v2.30.2 --- pkgs/tools/misc/direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index fa9be5c84a67..e9d38cbdcc2c 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "direnv"; - version = "2.30.1"; + version = "2.30.2"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-4ojoV6BtPOaMnDierxlfkOuaP1KZGYNMImSURA33tfg="; + sha256 = "sha256-lQcy3EXl6KicAzRbypyX8sh39vNbZE2aUHBtwx07s9g="; }; vendorSha256 = "sha256-YhgQUl9fdictEtz6J88vEzznGd8Ipeb9AYo/p1ZLz5k="; From d734acf2bac2d9d04b8368627ad346c52450bac1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 31 Dec 2021 13:13:01 +0100 Subject: [PATCH 44/57] python3Packages.google-nest-sdm: 0.4.9 -> 1.2.0 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 4a35812a19da..14014a1fc97c 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "0.4.9"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-Y0p1Hu3hcJQzbHmwMaIC8l5W4GXuuX8LBLCOvQ1N0So="; + sha256 = "sha256-LipfaCJClwqKN16k9hdYtwaLRh9jIJAMBvV7Z/uXuyk="; }; propagatedBuildInputs = [ From 5d299522f25ac8320e6489029b74ac9a0d2ef922 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 31 Dec 2021 21:10:02 +0100 Subject: [PATCH 45/57] python3Packages.google-nest-sdm: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 14014a1fc97c..93fa676f6f82 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-LipfaCJClwqKN16k9hdYtwaLRh9jIJAMBvV7Z/uXuyk="; + sha256 = "sha256-gg5JAkTUuch6HcRLl1Xm/LAoC32EcayG1w3Fk7GrZD8="; }; propagatedBuildInputs = [ From 9d6d1a474b946c98168bf7fee9e4185ed11cfd8f Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sat, 1 Jan 2022 03:10:27 +0530 Subject: [PATCH 46/57] neovim: 0.6.0 -> 0.6.1 --- pkgs/applications/editors/neovim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b44fc98722e9..412a6f724956 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-mVVZiDjAsAs4PgC8lHf0Ro1uKJ4OKonoPtF59eUd888="; + sha256 = "sha256-0XCW047WopPr3pRTy9rF3Ff6MvNRHT4FletzOERD41A="; }; patches = [ From b47fe6a022973eb8310a66ff983546ae0f30ae40 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Dec 2021 13:31:19 +1000 Subject: [PATCH 47/57] .github/CODEOWNERS: add terraform-providers --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3e527f9529e2..b69988a92b0c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -248,3 +248,6 @@ /pkgs/development/compilers/nim @ehmry /pkgs/development/nim-packages @ehmry /pkgs/top-level/nim-packages.nix @ehmry + +# terraform providers +/pkgs/applications/networking/cluster/terraform-providers @zowoq From d191b4293352fa4d79fb0d62b45d5d41a23dd54c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Dec 2021 15:10:45 +1000 Subject: [PATCH 48/57] terraform: add maintainer --- pkgs/applications/networking/cluster/terraform/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 92b52770e335..a15305cba848 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -65,6 +65,7 @@ let timstott zimbatm maxeaubrey + zowoq ]; }; } // attrs'); From 09195e8acbfb68e3c8d6fcc1335fe00a82c1af13 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Dec 2021 17:59:20 +1000 Subject: [PATCH 49/57] terraform-providers: set doCheck to false this is usually a no op anyway --- .../networking/cluster/terraform-providers/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index afcd55a2b54d..e86bd7df9879 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -13,6 +13,7 @@ let pname = data.repo; version = data.version; subPackages = [ "." ]; + doCheck = false; src = fetchFromGitHub { inherit (data) owner repo rev sha256; }; @@ -31,6 +32,7 @@ let version = data.version; goPackagePath = "github.com/${data.owner}/${data.repo}"; subPackages = [ "." ]; + doCheck = false; src = fetchFromGitHub { inherit (data) owner repo rev sha256; }; From 0e1acb3c5e3d5a07cf244d2e1625a7dd0df87b92 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Dec 2021 18:04:46 +1000 Subject: [PATCH 50/57] terraform-providers.ansible: 1.0.3 -> 1.0.4, remove separate derivation --- .../terraform-providers/ansible/default.nix | 26 ------------------- .../terraform-providers/ansible/deps.nix | 11 -------- .../cluster/terraform-providers/default.nix | 1 - .../terraform-providers/providers.json | 9 +++++++ 4 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix deleted file mode 100644 index b8e3c1540e94..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, buildGoPackage }: -buildGoPackage rec { - pname = "terraform-provider-ansible"; - version = "1.0.3"; - - goPackagePath = "github.com/nbering/terraform-provider-ansible"; - goDeps = ./deps.nix; - - src = fetchFromGitHub { - owner = "nbering"; - repo = "terraform-provider-ansible"; - rev = "v${version}"; - sha256 = "0dqi9ym0xvnz3h73cmd1vf6k2qwfhxvj1mcakkpmsd4cpxq4l6pr"; - }; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-ansible{,_v${version}}"; - - meta = with lib; { - description = "A Terraform provider serving as an interop layer for an Ansible dynamic inventory script."; - homepage = "https://github.com/nbering/terraform-provider-ansible"; - license = licenses.mpl20; - maintainers = with maintainers; [ uskudnik ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix deleted file mode 100644 index dc49f24afa59..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/hashicorp/terraform"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/terraform"; - rev = "v0.12.5"; - sha256 = "0p064rhaanwx4szs8hv6mdqad8d2bgfd94h2la11j58xbsxc7hap"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index e86bd7df9879..324994e27f83 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -53,7 +53,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { # Packages that don't fit the default model - ansible = callPackage ./ansible { }; cloudfoundry = callPackage ./cloudfoundry { }; gandi = callPackage ./gandi { }; hcloud = callPackage ./hcloud { }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2dda8cee9ff3..29dca5d97081 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -43,6 +43,15 @@ "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", "version": "1.149.0" }, + "ansible": { + "owner": "nbering", + "provider-source-address": "registry.terraform.io/nbering/ansible", + "repo": "terraform-provider-ansible", + "rev": "v1.0.4", + "sha256": "1djjcrcm9218rfn51kpzp3cbb5qbkfwpjqm9h9rhadibbvjmly6y", + "vendorSha256": "1kc47n1janmiwwjphvxpily3dwyy1axxh36aj3sb2kpawi4pq1rq", + "version": "1.0.4" + }, "archive": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/archive", From 18c46f641f50b61895b4b91de29216243d4ce3a9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Dec 2021 18:09:02 +1000 Subject: [PATCH 51/57] terraform-providers.cloudfoundry: 0.14.2 -> 0.15.0, remove separate derivation --- .../cloudfoundry/default.nix | 29 ------------------- .../cluster/terraform-providers/default.nix | 1 - .../terraform-providers/providers.json | 9 ++++++ 3 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix deleted file mode 100644 index 05d46c079f83..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-cloudfoundry"; - version = "0.14.2"; - - src = fetchFromGitHub { - owner = "cloudfoundry-community"; - repo = pname; - rev = "v${version}"; - sha256 = "12mx87dip6vn10zvkf4rgrd27k708lnl149j9xj7bmb8v9m1082v"; - }; - - vendorSha256 = "0kydjnwzj0fylizvk1vg42zyiy17qhz40z3iwa1r5bb20qkrlz93"; - - # needs a running cloudfoundry - doCheck = false; - - postInstall = "mv $out/bin/terraform-provider-cloudfoundry{,_v${version}}"; - - passthru = { provider-source-address = "registry.terraform.io/cloudfoundry-community/cloudfoundry"; }; - - meta = with lib; { - homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry"; - description = "Terraform provider for cloudfoundry"; - license = licenses.mpl20; - maintainers = with maintainers; [ ris ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 324994e27f83..dd48cc1b23f1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -53,7 +53,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { # Packages that don't fit the default model - cloudfoundry = callPackage ./cloudfoundry { }; gandi = callPackage ./gandi { }; hcloud = callPackage ./hcloud { }; libvirt = callPackage ./libvirt { }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 29dca5d97081..c7b6c221c887 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -197,6 +197,15 @@ "vendorSha256": "0qby6fa1x5fapgcy5i35dwwlkb2ggws9sxcssshzssy0fzpb3k87", "version": "3.6.0" }, + "cloudfoundry": { + "owner": "cloudfoundry-community", + "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry", + "repo": "terraform-provider-cloudfoundry", + "rev": "v0.15.0", + "sha256": "0kg9aivxlbkqgrwv0j02hfsaky5q4f0bmqihn589dsdk7jds66i7", + "vendorSha256": "19jnaazhdqagfx5wkpvrf0amf7d22kg6hzk0nsg888d0l4x93hna", + "version": "0.15.0" + }, "cloudinit": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/cloudinit", From e40468c4574905c286cd1f97f28584f12241955d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Dec 2021 18:13:10 +1000 Subject: [PATCH 52/57] terraform-providers.hcloud: 1.26.0 -> 1.32.2, remove separate derivation --- .../cluster/terraform-providers/default.nix | 1 - .../terraform-providers/hcloud/default.nix | 32 ------------------- .../terraform-providers/providers.json | 9 ++++++ 3 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index dd48cc1b23f1..43325fa4265b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -54,7 +54,6 @@ let special-providers = { # Packages that don't fit the default model gandi = callPackage ./gandi { }; - hcloud = callPackage ./hcloud { }; libvirt = callPackage ./libvirt { }; linuxbox = callPackage ./linuxbox { }; lxd = callPackage ./lxd { }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix deleted file mode 100644 index 5d0fcb13f179..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-hcloud"; - version = "1.26.0"; - - src = fetchFromGitHub { - owner = "hetznercloud"; - repo = pname; - rev = "v${version}"; - sha256 = "04fa3qr65hg1ylq2933ark5q1za6k0a4ky36a6vrw2dcgpr4f9zs"; - }; - - vendorSha256 = "15gcnwylxkgjriqscd4lagmwfssagq0ksrlb2svidw9aahmr7hw0"; - - # Spends an awful time in other test folders, apparently tries to reach - # opencensus and fails. - checkPhase = '' - pushd hcloud - go test -v - popd - ''; - - postInstall = "mv $out/bin/terraform-provider-hcloud{,_v${version}}"; - - meta = with lib; { - homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry"; - description = "Terraform provider for cloudfoundry"; - license = licenses.mpl20; - maintainers = with maintainers; [ ris ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c7b6c221c887..a0fb0c2f057d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -446,6 +446,15 @@ "sha256": "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq", "version": "1.6.0" }, + "hcloud": { + "owner": "hetznercloud", + "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", + "repo": "terraform-provider-hcloud", + "rev": "v1.32.2", + "sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f", + "vendorSha256": "0g8cbkg5kcddd1x3p6d8mb6mqwsayqby0mrrifkw5icf7rlaa0sl", + "version": "1.32.2" + }, "hedvig": { "owner": "terraform-providers", "repo": "terraform-provider-hedvig", From e0687dd46cf96e501a859bf7a84f3b9533c040b7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Dec 2021 18:16:07 +1000 Subject: [PATCH 53/57] terraform-providers.linuxbox: 0.3.11 -> 0.4.2, remove separate derivation --- .../cluster/terraform-providers/default.nix | 1 - .../terraform-providers/linuxbox/default.nix | 26 ------------------- .../terraform-providers/providers.json | 9 +++++++ 3 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 43325fa4265b..862c8e800be8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -55,7 +55,6 @@ let # Packages that don't fit the default model gandi = callPackage ./gandi { }; libvirt = callPackage ./libvirt { }; - linuxbox = callPackage ./linuxbox { }; lxd = callPackage ./lxd { }; teleport = callPackage ./teleport { }; vpsadmin = callPackage ./vpsadmin { }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix deleted file mode 100644 index 4f8c44aad3f1..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-linuxbox"; - version = "0.3.11"; - - src = fetchFromGitHub { - owner = "numtide"; - repo = pname; - rev = "v${version}"; - sha256 = "1sxb2iv4dl0rw3v1r7k5dfkyh14nmp19cprqafhb7ncarmvawq39"; - }; - - vendorSha256 = "16hp0pv1qpvr34ac1syjci39csvyj3c748inllypjwx76q6rwp7k"; - - postInstall = "mv $out/bin/terraform-provider-linuxbox{,_v${version}}"; - - passthru.provider-source-address = "registry.terraform.io/numtide/linuxbox"; - - meta = with lib; { - homepage = "https://github.com/numtide/terraform-provider-linuxbox"; - description = "Basic building block for Seed DevOps"; - license = licenses.bsd3; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a0fb0c2f057d..946199a9a478 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -634,6 +634,15 @@ "sha256": "17hnm7wivd75psap2qdmlnmmlf964s7jf4jrfgsm6njx32wwwfpp", "version": "1.12.3" }, + "linuxbox": { + "owner": "numtide", + "provider-source-address": "registry.terraform.io/numtide/linuxbox", + "repo": "terraform-provider-linuxbox", + "rev": "v0.4.2", + "sha256": "1ghlp0nnc67m5rsx6aixqxjd5vhpbi88gcfyv3710dvqxchdgscy", + "vendorSha256": "01d556pfaa2ycww5kgd1f3shp2i2r48kgwnls39lhplp5qmnkz4g", + "version": "0.4.2" + }, "local": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/local", From 9b10b523f3db3985d6df6a924a3388f5eb88d737 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Dec 2021 18:18:41 +1000 Subject: [PATCH 54/57] terraform-providers.lxd: remove separate derivation --- .../cluster/terraform-providers/default.nix | 1 - .../terraform-providers/lxd/default.nix | 27 ------------------- .../terraform-providers/providers.json | 9 +++++++ 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 862c8e800be8..d4ce235a92dc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -55,7 +55,6 @@ let # Packages that don't fit the default model gandi = callPackage ./gandi { }; libvirt = callPackage ./libvirt { }; - lxd = callPackage ./lxd { }; teleport = callPackage ./teleport { }; vpsadmin = callPackage ./vpsadmin { }; vercel = callPackage ./vercel { }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix deleted file mode 100644 index 4ea2194a03a3..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-lxd"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "sl1pm4t"; - repo = "terraform-provider-lxd"; - rev = "v${version}"; - sha256 = "sha256-fl9sYoyrVV6LvnIrnyAXy18QLLazQajjcLO1JWsqAR4="; - }; - - vendorSha256 = "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc="; - - doCheck = false; - - postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}"; - - meta = with lib; { - homepage = "https://github.com/sl1pm4t/terraform-provider-lxd"; - description = "Terraform provider for lxd"; - platforms = platforms.linux; - license = licenses.mpl20; - maintainers = with maintainers; [ gila ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 946199a9a478..26e730c4f7e2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -666,6 +666,15 @@ "sha256": "00d8qx95cxaif636dyh935nv9nn6lmb1ybxy7n4myy9g80y50ap1", "version": "1.3.0" }, + "lxd": { + "owner": "terraform-lxd", + "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", + "repo": "terraform-provider-lxd", + "rev": "v1.6.0", + "sha256": "07h159mjbddkf3ishhdknqn10pyb2wh9yavjps5mwmdbiii6qpvy", + "vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs", + "version": "1.6.0" + }, "mailgun": { "owner": "terraform-providers", "repo": "terraform-provider-mailgun", From 84ef8b2222bd812b8fd41d9f5eea091c6734345f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Dec 2021 18:19:58 +1000 Subject: [PATCH 55/57] terraform-providers.vercel: remove separate derivation --- .../cluster/terraform-providers/default.nix | 1 - .../terraform-providers/providers.json | 9 ++++++++ .../terraform-providers/vercel/default.nix | 23 ------------------- 3 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index d4ce235a92dc..23df0f174117 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -57,7 +57,6 @@ let libvirt = callPackage ./libvirt { }; teleport = callPackage ./teleport { }; vpsadmin = callPackage ./vpsadmin { }; - vercel = callPackage ./vercel { }; } // (lib.optionalAttrs (config.allowAliases or false) { kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; }); diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 26e730c4f7e2..88eb98c312fb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1196,6 +1196,15 @@ "sha256": "06nk5c7lxs8fc04sz97lc3yk1zk1b9phkzw6fj9fnmpgaak87bj9", "version": "0.9.2" }, + "vercel": { + "owner": "ondrejsika", + "provider-source-address": "registry.terraform.io/ondrejsika/vercel", + "repo": "terraform-provider-vercel", + "rev": "v2.1.0", + "sha256": "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw", + "vendorSha256": "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k", + "version": "2.1.0" + }, "vra7": { "owner": "terraform-providers", "repo": "terraform-provider-vra7", diff --git a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix deleted file mode 100644 index f37d1ac5d87a..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-vercel"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "ondrejsika"; - repo = pname; - rev = "v${version}"; - sha256 = "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw"; - }; - - vendorSha256 = "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k"; - - postInstall = "mv $out/bin/terraform-provider-vercel{,_v${version}}"; - - meta = with lib; { - homepage = "https://github.com/ondrejsika/terraform-provider-vercel"; - description = "Terraform provider for Vercel"; - maintainers = with maintainers; [ mmahut ]; - }; -} From 41473bf95964074a1e7659173d505907b678fb51 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Dec 2021 22:30:23 +1000 Subject: [PATCH 56/57] terraform-providers: support `proxyVendor` --- .../networking/cluster/terraform-providers/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 23df0f174117..e58e5dfbd511 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -19,6 +19,7 @@ let }; vendorSha256 = data.vendorSha256 or null; deleteVendor = data.deleteVendor or false; + proxyVendor = data.proxyVendor or false; # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. From 796af3ddba8c3b045b79332a39eae92f24efc277 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Dec 2021 22:31:47 +1000 Subject: [PATCH 57/57] terraform-providers.google: 3.76.0 -> 4.5.0 --- .../cluster/terraform-providers/providers.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 88eb98c312fb..6bcb2aa85bfa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -415,11 +415,12 @@ "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", + "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v3.76.0", - "sha256": "1j3q07v4r0a3mlkmpqw8nav5z09fwyms9xmlyk6k6xkkzr520xcp", - "vendorSha256": "1ffxfracj4545fzh6p6b0wal0j07807qc2q83qzchbalqvi7yhky", - "version": "3.76.0" + "rev": "v4.5.0", + "sha256": "173aqwrzqdb3y57wiq1dbgb74ksr063qqq1k178n4wrab4s1h3px", + "vendorSha256": "0f18fh0qi1v1hkq3j8nrc8x2rah7vk6njjgdakxr1g1xxv8f0nhx", + "version": "4.5.0" }, "google-beta": { "owner": "hashicorp",