From 49d5bc254bec5b50532a92c4376d12de749a0511 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 Sep 2021 03:28:02 +0200 Subject: [PATCH 01/84] mstflint: 4.14.0-3 -> 4.17.0-1 --- pkgs/tools/misc/mstflint/default.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index 70bace74b1e9..51fd22b0c35e 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -1,18 +1,25 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, zlib, libibmad, openssl }: +{ lib +, stdenv +, fetchurl +, libibmad +, openssl +, zlib +}: stdenv.mkDerivation rec { pname = "mstflint"; - version = "4.14.0-3"; + version = "4.17.0-1"; - src = fetchFromGitHub { - owner = "Mellanox"; - repo = pname; - rev = "v${version}"; - sha256 = "0zy9npyzf7dkxlfl9mx6997aa61mk23ixpjb01ckb1wvav5k6z82"; + src = fetchurl { + url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/mstflint-${version}.tar.gz"; + sha256 = "030vpiv44sxmjf0dng91ziq1cggwj33yp0l4xc6cdhnrv2prjs7y"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ zlib libibmad openssl ]; + buildInputs = [ + libibmad + openssl + zlib + ]; hardeningDisable = [ "format" ]; From 742fddd514417ac98979089a18b17de420d3e5a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 07:46:54 +0000 Subject: [PATCH 02/84] cloudmonkey: 6.1.0 -> 6.2.0 --- pkgs/tools/virtualization/cloudmonkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 1945e56b96e7..00ca3f09d393 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudmonkey"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "apache"; repo = "cloudstack-cloudmonkey"; rev = version; - sha256 = "sha256-OmVM6ayrtrLl+PADnkUnrssbsq1GZp2KiMBOXPgfi5Y="; + sha256 = "sha256-C9e2KsnoggjWZp8gx757MbFdGxmfh+TtAd+luS3ycHU="; }; runVend = true; From 92f000385a30165c73dd63ec969c296a60f76af2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Nov 2021 10:18:31 +0100 Subject: [PATCH 03/84] python3Packages.django-rq: 2.4.1 -> 2.5.0 --- pkgs/development/python-modules/django-rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 18a6808a21ef..7b524ea86364 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "v${version}"; - sha256 = "1dy3mhj60xlqy7f65zh80sqn6qywsp697r6yy3jcl5wmwizzhybr"; + sha256 = "sha256-ly0gixl1cPHa03h44zXT8d1/NqrEBnQS6JmuuGj5Rk4="; }; propagatedBuildInputs = [ From 4c053bd1f8e7c0d571f435a06a37f473bd44ddde Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 20 Nov 2021 13:51:31 +0100 Subject: [PATCH 04/84] gitkraken: 8.1.0 -> 8.1.1 --- pkgs/applications/version-management/gitkraken/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 89a403880116..a92c6b5d5271 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -11,20 +11,19 @@ with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; - version = "8.1.0"; + version = "8.1.1"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { - url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-yC7MGTVxD8xEutlleH3WKRnendnv0KijhUwQ00wwJYQ"; + sha256 = "sha256-C6R7/ucQhMsugg7qT+B8OG77AMOx2nmZlVAQcxAfpmc="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-SP+LCsxjl5YNOu4rDZOiDIqkynGE+iiLJtxi8tFugKM="; + sha256 = "sha256-l0K9Ha+0KqVqNQOSouT2rwRRi4YoIjMNnZnmBY8Loa8="; }; aarch64-darwin = srcs.x86_64-darwin; From e0eb89f3916ae5b5e8e3c45909df8c82383b622a Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 24 Nov 2021 16:42:32 -0700 Subject: [PATCH 05/84] element-desktop: 1.9.4 -> 1.9.5 --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/pin.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 235955ac14e5..d00efd5ac872 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.4", + "version": "1.9.5", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 6d47eb9fe711..7697c0d5b9a4 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.4", - "desktopSrcHash": "sTY55DWeEKV3Ma5DTr4W6K6BjrE019aY8LRk/5f8pPM=", + "version": "1.9.5", + "desktopSrcHash": "8x3TBu0zSNEVWp+ULydule8bPSd01pMkCZHdJbQf82U=", "desktopYarnHash": "0axz0d5qryd0k89lrziah1r6j1154c1cibf1qsjk1azlri3k4298", - "webHash": "141iz2jcvwyv3fpi63ddi697qzkk6jg100d0lz6iam98m8m35g24" + "webHash": "04pabvvb3l88gp866fkbjngl9r20s300pvw7qykynl0ps8fjms0l" } From 26038de2256eae025045e4646d91a73285700ed3 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 25 Nov 2021 10:11:28 +0100 Subject: [PATCH 06/84] ruby: 2.7.4 -> 2.7.5, 3.0.2 -> 3.0.3 --- pkgs/development/interpreters/ruby/default.nix | 12 ++++++------ pkgs/development/interpreters/ruby/patchsets.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b6010cf32d10..7ab397bfc191 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -252,18 +252,18 @@ let in { ruby_2_7 = generic { - version = rubyVersion "2" "7" "4" ""; + version = rubyVersion "2" "7" "5" ""; sha256 = { - src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh"; - git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p"; + src = "1wc1hwmz4m6iqlmqag8liyld917p6a8dvnhnpd1v8d8jl80bjm97"; + git = "16565fyl7141hr6q6d74myhsz46lvgam8ifnacshi68vzibwjbbh"; }; }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "2" ""; + version = rubyVersion "3" "0" "3" ""; sha256 = { - src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah"; - git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r"; + src = "1b4j39zyyvdkf1ax2c6qfa40b4mxfkr87zghhw19fmnzn8f8d1im"; + git = "1q19w5i1jkfxn7qq6f9v9ngax9h52gxwijk7hp312dx6amwrkaim"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3ea358c349a3..31a9a9f1c08d 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,12 +1,12 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.7.4" = ops useRailsExpress [ + "2.7.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "3.0.2" = ops useRailsExpress [ + "3.0.3" = ops useRailsExpress [ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; From b71ed45cfc402ee498b973dc919e8bcf433deeea Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 26 Nov 2021 09:03:06 -0800 Subject: [PATCH 07/84] wl-mirror: init at 0.5.0 --- pkgs/tools/wayland/wl-mirror/default.nix | 45 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/wayland/wl-mirror/default.nix diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix new file mode 100644 index 000000000000..0836723760e7 --- /dev/null +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wayland +, wayland-protocols +, wayland-scanner +, wlr-protocols +, libGL +}: + +stdenv.mkDerivation rec { + pname = "wl-mirror"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Ferdi265"; + repo = "wl-mirror"; + rev = "v${version}"; + sha256 = "1wjdjzj6h1q51yg70gdrq2yrgg6ihamcwhizxfrjq8955yy2y6ly"; + }; + + patchPhase = '' + substituteInPlace CMakeLists.txt \ + --replace 'WL_PROTOCOL_DIR "/usr' 'WL_PROTOCOL_DIR "${wayland-protocols}' \ + --replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}' + ''; + + nativeBuildInputs = [ cmake pkg-config wayland-scanner ]; + buildInputs = [ + libGL + wayland + wayland-protocols + wlr-protocols + ]; + + meta = with lib; { + homepage = "https://github.com/Ferdi265/wl-mirror"; + description = "Mirrors an output onto a Wayland surface."; + license = licenses.gpl3; + maintainers = with maintainers; [ twitchyliquid64 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9526189b7f3..71323dc0b8bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2555,6 +2555,8 @@ with pkgs; wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; + wl-mirror = callPackage ../tools/wayland/wl-mirror { }; + wlogout = callPackage ../tools/wayland/wlogout { }; wlr-randr = callPackage ../tools/wayland/wlr-randr { }; From c67c811fa655a821c477336c3041c76f829ee1b5 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 27 Nov 2021 01:16:27 +0100 Subject: [PATCH 08/84] schismtracker: 20210525 -> 20211116 --- pkgs/applications/audio/schismtracker/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index ba193f70194d..bf74dd64f926 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20210525"; + version = "20211116"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "06ybkbqry7f7lmzgwb9s7ipafshl5gdj98lcjsjkcbnywj8r9b3h"; + sha256 = "1kcw4rwphyqh0hwwjsydzwg484xj17rb5lc8pfsixsg77z50ayzz"; }; configureFlags = [ "--enable-dependency-tracking" ] @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib; + enableParallelBuilding = true; + meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; From e2668f6a7b9ddf2852d85720ad78d019c7379c5c Mon Sep 17 00:00:00 2001 From: Lara Date: Mon, 29 Nov 2021 13:11:02 +0000 Subject: [PATCH 09/84] gitlab: 14.4.2 -> 14.5.0 --- .../version-management/gitlab/data.json | 16 +-- .../version-management/gitlab/gitaly/Gemfile | 2 +- .../gitlab/gitaly/Gemfile.lock | 6 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab/gitaly/gemset.nix | 8 +- .../gitlab/gitlab-shell/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile | 24 +++-- .../gitlab/rubyEnv/Gemfile.lock | 57 ++++++----- .../gitlab/rubyEnv/gemset.nix | 97 ++++++++++++------- .../version-management/gitlab/update.py | 1 - 11 files changed, 133 insertions(+), 90 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 004560bff995..2753e67cdfeb 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.4.2", - "repo_hash": "0zhac96b6p7p9vpj083ajfsj5a2fwkv602zxv79cjvpd924c5ws2", - "yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw", + "version": "14.5.0", + "repo_hash": "sha256-HKm2zxr9jHN5NvoKoR0YnEsna84oz+ax6BYmDiWrODc=", + "yarn_hash": "081c06ds723mv95ivpnlh3ida2ra3brrm1lzfh2pmlg5wz9vi1cs", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.4.2-ee", + "rev": "v14.5.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.4.2", - "GITLAB_PAGES_VERSION": "1.46.0", - "GITLAB_SHELL_VERSION": "13.21.1", - "GITLAB_WORKHORSE_VERSION": "14.4.2" + "GITALY_SERVER_VERSION": "14.5.0", + "GITLAB_PAGES_VERSION": "1.48.0", + "GITLAB_SHELL_VERSION": "13.22.0", + "GITLAB_WORKHORSE_VERSION": "14.5.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 662252527f9d..6568c0c3cbf4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rugged', '~> 1.1' +gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.1.4.1' diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 05e75a524139..b5c5ec672b37 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -121,7 +121,7 @@ GEM parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) - pg_query (2.1.0) + pg_query (2.1.1) google-protobuf (>= 3.17.1) proc_to_ast (0.1.0) coderay @@ -184,7 +184,7 @@ GEM rubocop-ast (0.2.0) parser (>= 2.7.0.1) ruby-progressbar (1.10.1) - rugged (1.1.0) + rugged (1.2.0) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) @@ -234,7 +234,7 @@ DEPENDENCIES rspec rspec-parameterized rubocop (~> 0.69) - rugged (~> 1.1) + rugged (~> 1.2) sentry-raven (~> 3.0) timecop diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 41e5908c629d..c997bb019688 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,7 +21,7 @@ let }; }; - version = "14.4.2"; + version = "14.5.0"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -33,10 +33,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-MzYUSoG+HjW9o2zn6Q9Pd5NfI7hZkw1xFXOXHbbxJvo="; + sha256 = "sha256-DbyxZKxW+S2u23+F8VQxkDXWp+L1WeISs6OEBb5DavA="; }; - vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; + vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 4aad9394cd6e..0fa91679adb2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -554,10 +554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12dibsqndfnckc24yryy8v467rxp7p80jx21jhm8z7swp8118jhx"; + sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -830,10 +830,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; + sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 2ffc52f3b12c..0cac8a8a3366 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.21.1"; + version = "13.22.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-FBkxJLl58ZbqM1P4LohsozGiKg38gQwVGOV9AAjVE0M="; + sha256 = "sha256-jMFTNyGdegdBO+f6Pw36iuhvyzcM8rCbnfSyLSOiEjY="; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index eaae6eacf44f..b20ddafbbbc5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.4.2"; + version = "14.5.0"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 0713560ead89..8e781a9a8626 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'rails', '~> 6.1.4.1' -gem 'bootsnap', '~> 1.4.6' +gem 'bootsnap', '~> 1.9.1', require: false # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -17,14 +17,14 @@ gem 'default_value_for', '~> 3.4.0' # Supported DBs gem 'pg', '~> 1.1' -gem 'rugged', '~> 1.1' +gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.0' gem 'faraday', '~> 1.0' gem 'marginalia', '~> 1.10.0' # Authorization -gem 'declarative_policy', '~> 1.0.0' +gem 'declarative_policy', '~> 1.1.0' # Authentication libraries gem 'devise', '~> 4.7.2' @@ -38,6 +38,7 @@ gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-activedirectory-v2', '~> 1.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-cas3', '~> 1.1.4' +gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.4' gem 'omniauth-gitlab', '~> 1.0.2' @@ -129,7 +130,7 @@ gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false +gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm' # for Google storage gem 'google-api-client', '~> 0.33' @@ -186,6 +187,7 @@ gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' group :puma do gem 'puma', '~> 5.3.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false + gem 'sd_notify', '~> 0.1.0', require: false end # State machine @@ -290,7 +292,7 @@ gem 'autoprefixer-rails', '10.2.5.1' gem 'terser', '1.0.2' gem 'addressable', '~> 2.8' -gem 'gemojione', '~> 3.3' +gem 'tanuki_emoji', '~> 0.5' gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' @@ -341,13 +343,15 @@ group :development do gem 'lefthook', '~> 0.7.0', require: false gem 'solargraph', '~> 0.43', require: false - gem 'letter_opener_web', '~> 1.4.1' + gem 'letter_opener_web', '~> 2.0.0' # Better errors handler gem 'better_errors', '~> 2.9.0' # thin instead webrick gem 'thin', '~> 1.8.0' + + gem 'sprite-factory', '~> 1.7' end group :development, :test do @@ -372,7 +376,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 6.3.0', require: false + gem 'gitlab-styles', '~> 6.4.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -396,7 +400,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.3.0', require: false + gem 'gitlab-dangerfiles', '~> 2.5.0', require: false end group :development, :test, :coverage do @@ -474,7 +478,7 @@ end gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.3.0.pre.rc2' +gem 'gitaly', '~> 14.4.0.pre.rc43' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -535,4 +539,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'sd_notify' +gem 'ipynbdiff', '0.3.7' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 8a135d809ba1..75ca996d5c42 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -141,7 +141,7 @@ GEM rack (>= 0.9.0) bindata (2.4.10) binding_ninja (0.2.3) - bootsnap (1.4.6) + bootsnap (1.9.1) msgpack (~> 1.0) bootstrap_form (4.2.0) actionpack (>= 5.0) @@ -215,7 +215,7 @@ GEM css_parser (1.7.0) addressable daemons (1.3.1) - danger (8.3.1) + danger (8.4.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -237,7 +237,7 @@ GEM html-pipeline declarative (0.0.20) declarative-option (0.1.0) - declarative_policy (1.0.0) + declarative_policy (1.1.0) default_value_for (3.4.0) activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) @@ -429,8 +429,6 @@ GEM ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) gemoji (3.0.1) - gemojione (3.3.0) - json get_process_mem (0.2.5) ffi (~> 1.0) gettext (3.3.6) @@ -445,7 +443,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.3.0.pre.rc2) + gitaly (14.4.0.pre.rc43) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -453,7 +451,7 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.3.0) + gitlab-dangerfiles (2.5.0) danger (>= 8.3.1) danger-gitlab (>= 8.0.0) gitlab-experiment (0.6.4) @@ -485,7 +483,7 @@ GEM openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.8.0) sidekiq (~> 6.1) - gitlab-styles (6.3.0) + gitlab-styles (6.4.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-performance (~> 1.9.2) @@ -635,6 +633,9 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) + ipynbdiff (0.3.7) + diffy (= 3.3.0) + json (= 2.5.1) jaeger-client (1.1.0) opentracing (~> 0.3) thrift @@ -692,10 +693,11 @@ GEM lefthook (0.7.5) letter_opener (1.7.0) launchy (~> 2.2) - letter_opener_web (1.4.1) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) + letter_opener_web (2.0.0) + actionmailer (>= 5.2) + letter_opener (~> 1.7) + railties (>= 5.2) + rexml libyajl2 (1.2.0) license_finder (6.0.0) bundler @@ -832,6 +834,8 @@ GEM addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) omniauth (~> 1.2) + omniauth-dingtalk-oauth2 (1.0.0) + omniauth-oauth2 (~> 1.7.1) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.4.0) @@ -852,7 +856,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.7.1) + omniauth-oauth2 (1.7.2) oauth2 (~> 1.4) omniauth (>= 1.9, < 3) omniauth-oauth2-generic (0.2.2) @@ -1122,7 +1126,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (2.0.0) - rugged (1.1.0) + rugged (1.2.0) safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) @@ -1148,7 +1152,7 @@ GEM addressable (>= 2.3.5) faraday (> 0.8, < 2.0) scientist (1.6.0) - sd_notify (0.1.1) + sd_notify (0.1.0) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1210,6 +1214,7 @@ GEM spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) + sprite-factory (1.7.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -1240,6 +1245,7 @@ GEM sys-filesystem (1.1.9) ffi sysexits (1.2.0) + tanuki_emoji (0.5.0) temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -1393,7 +1399,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) - bootsnap (~> 1.4.6) + bootsnap (~> 1.9.1) bootstrap_form (~> 4.2.0) browser (~> 4.2) bullet (~> 6.1.3) @@ -1410,7 +1416,7 @@ DEPENDENCIES crystalball (~> 0.7.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) - declarative_policy (~> 1.0.0) + declarative_policy (~> 1.1.0) default_value_for (~> 3.4.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks @@ -1448,14 +1454,13 @@ DEPENDENCIES fog-rackspace (~> 0.1.1) fugit (~> 1.2.1) fuubar (~> 2.2.0) - gemojione (~> 3.3) gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.3.0.pre.rc2) + gitaly (~> 14.4.0.pre.rc43) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.3.0) + gitlab-dangerfiles (~> 2.5.0) gitlab-experiment (~> 0.6.4) gitlab-fog-azure-rm (~> 1.2.0) gitlab-labkit (~> 0.21.1) @@ -1465,7 +1470,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.8.0) gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 6.3.0) + gitlab-styles (~> 6.4.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) @@ -1495,6 +1500,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) + ipynbdiff (= 0.3.7) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) @@ -1506,7 +1512,7 @@ DEPENDENCIES kramdown (~> 2.3.1) kubeclient (~> 4.9.2) lefthook (~> 0.7.0) - letter_opener_web (~> 1.4.1) + letter_opener_web (~> 2.0.0) license_finder (~> 6.0) licensee (~> 9.14.1) lockbox (~> 0.6.2) @@ -1535,6 +1541,7 @@ DEPENDENCIES omniauth-azure-activedirectory-v2 (~> 1.0) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) + omniauth-dingtalk-oauth2 (~> 1.0) omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.4) omniauth-gitlab (~> 1.0.2) @@ -1596,10 +1603,10 @@ DEPENDENCIES ruby-saml (~> 1.13.0) ruby_parser (~> 3.15) rubyzip (~> 2.0.0) - rugged (~> 1.1) + rugged (~> 1.2) sanitize (~> 5.2.1) sassc-rails (~> 2.1.0) - sd_notify + sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) sentry-raven (~> 3.1) @@ -1616,11 +1623,13 @@ DEPENDENCIES spamcheck (~> 0.1.0) spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) + sprite-factory (~> 1.7) sprockets (~> 3.7.0) sshkey (~> 2.0) stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.1.6) + tanuki_emoji (~> 0.5) terser (= 1.0.2) test-prof (~> 1.0.7) test_file_finder (~> 0.1.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 2c1f53c0b3ac..6c6a26f3d266 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -557,10 +557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz62p9vc7lcrmzhiz4pf7myww086mq287cw3jjj7fyc7jhmamw0"; + sha256 = "1ndjra3h86dq28njm2swmaw6n3vsywrycrf7i5iy9l8hrhfhv4x2"; type = "gem"; }; - version = "1.4.6"; + version = "1.9.1"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -931,10 +931,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12nmycrlwr8ca2s0fx76k81gjw12iz15k1n0qanszv5d4l1ykj2l"; + sha256 = "1f9p7sdj542cbn352qz58m4n26kamv6vbnxzpc06j0pxi50z3i0v"; type = "gem"; }; - version = "8.3.1"; + version = "8.4.1"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1007,10 +1007,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k2wl0jr0jq64gy7ibb1ipm2dzqil7y66vyffwx81g7sqchh7xh6"; + sha256 = "1jri6fqpyrlnhl99mhqlqwpi6z8idb7g421rysxz40yyk8lwzx4s"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; default_value_for = { dependencies = ["activerecord"]; @@ -1838,17 +1838,6 @@ }; version = "3.0.1"; }; - gemojione = { - dependencies = ["json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; - type = "gem"; - }; - version = "3.3.0"; - }; get_process_mem = { dependencies = ["ffi"]; groups = ["default" "puma" "unicorn"]; @@ -1910,10 +1899,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197db842msm326ib8r3gqlavf5d11r4cd9jg4wjnyar3ccyr9dn7"; + sha256 = "022amhic8rs09qmp3hy1zz5inxbxnrvg8j82bq4l2s8ml9hqfs3a"; type = "gem"; }; - version = "14.3.0.pre.rc2"; + version = "14.4.0.pre.rc43"; }; github-markup = { groups = ["default"]; @@ -1953,10 +1942,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07ckvf7vk0494s70ql7zp3ckn8q70mhwa0143hj6bjh0bpgmgsnw"; + sha256 = "1488s24c9fm55z2a2pbry2fjx72fzgzv0y48krgldvf0qy43l0kz"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store" "scientist"]; @@ -2059,10 +2048,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vxg5j9405r5xvwnswhm2r7pg9pn6pqg675pxz6f8d3sxy5z963p"; + sha256 = "16d90sd0x6qfkhgfjysswwrzk82zs82xs9azn9w287irpzdkvj7f"; type = "gem"; }; - version = "6.3.0"; + version = "6.4.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2589,6 +2578,17 @@ }; version = "0.8.3"; }; + ipynbdiff = { + dependencies = ["diffy" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18337bzcwssmnyg2wf3za50z0zh2b1sh17wgaapavd1ffr24svkx"; + type = "gem"; + }; + version = "0.3.7"; + }; jaeger-client = { dependencies = ["opentracing" "thrift"]; groups = ["default"]; @@ -2826,15 +2826,15 @@ version = "1.7.0"; }; letter_opener_web = { - dependencies = ["actionmailer" "letter_opener" "railties"]; + dependencies = ["actionmailer" "letter_opener" "railties" "rexml"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kgz2n0cyw3m8ipvijlikb6bldmzhnq451b9d7w5l74gw2fhqckg"; + sha256 = "0vvvaz2ngaxv0s6sj25gdvp73vd8pfl8q3jharadg18p3va0m1ik"; type = "gem"; }; - version = "1.4.1"; + version = "2.0.0"; }; libyajl2 = { groups = ["default"]; @@ -3489,6 +3489,17 @@ }; version = "1.1.4"; }; + omniauth-dingtalk-oauth2 = { + dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sflfy1jvn9wqpral7gcfmbys7msvykp6rlnl33r8qgnbksn54y8"; + type = "gem"; + }; + version = "1.0.0"; + }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; groups = ["default"]; @@ -3572,10 +3583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10fr2b58sp7l6nfdvxpbi67374hkrvsf507cvda89jjs0jacy319"; + sha256 = "1ry65f309rnzhgdjvqybkd5i4qp9rpk1gbp4dz02h4l6bkk6ya10"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -4778,10 +4789,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; + sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; safe_yaml = { groups = ["default" "test"]; @@ -4881,14 +4892,14 @@ version = "1.6.0"; }; sd_notify = { - groups = ["default"]; + groups = ["puma"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb"; + sha256 = "0qx6hwi10s0ir46l3aq4lspkxlcs1x4cjhvdhpdxyxaicciqddi2"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.0"; }; securecompare = { groups = ["default"]; @@ -5144,6 +5155,16 @@ }; version = "1.0.4"; }; + sprite-factory = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18hvn14vz1v3j1gvbqjypa59hgj3c4mqbimby50k407c395551jm"; + type = "gem"; + }; + version = "1.7.1"; + }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; groups = ["default" "development" "test"]; @@ -5291,6 +5312,16 @@ }; version = "1.2.0"; }; + tanuki_emoji = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qw0qa3xz4h3izwl5qsvmg5vvfsfjhmv4mdxaw1v1w1qgp7j7gws"; + type = "gem"; + }; + version = "0.5.0"; + }; temple = { groups = ["default" "development" "test"]; platforms = []; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index c8b4efc2478e..bee10e49f4b4 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -143,7 +143,6 @@ def update_rubyenv(): f.write(repo.get_file('Gemfile.lock', rev)) with open(rubyenv_dir / 'Gemfile', 'w') as f: original = repo.get_file('Gemfile', rev) - original += "\ngem 'sd_notify'\n" f.write(re.sub(r".*mail-smtp_pool.*", "", original)) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) From ce91a90d7a67b05a7e179c9b555a9c2dadbeb688 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 29 Nov 2021 17:10:47 +0100 Subject: [PATCH 10/84] roundcube: 1.5.0 -> 1.5.1 ChangeLog: https://github.com/roundcube/roundcubemail/releases/tag/1.5.1 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 4ae18f795332..5fcd2f2d3bc0 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-L9x7FmPl6ZcGv/NAk6pHMdS/IqWMtVWiUg7RveeNASw="; + sha256 = "sha256-YRsNgCJ9C3AonHFXh7LYX9Fe2RXrVtWFwQTCQ3YDboM="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From f146c92955309ecc4d8be5c29be6028b97557703 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 29 Nov 2021 18:37:36 +0100 Subject: [PATCH 11/84] gitaly: use custom libgit2 commit --- .../version-management/gitlab/gitaly/default.nix | 14 +++++++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c997bb019688..4dacc906a3ae 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -4,6 +4,18 @@ , libgit2, openssl, zlib, pcre, http-parser }: let + # git2go 32.0.5 does not support libgit2 1.2.0 or 1.3.0. + # It needs a specific commit in between those two releases. + libgit2_custom = libgit2.overrideAttrs (oldAttrs: rec { + version = "1.2.0"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e"; + sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI="; + }; + }); + rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; @@ -46,7 +58,7 @@ buildGoModule { tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2_custom openssl zlib pcre http-parser ]; doCheck = false; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67756bb1451a..989847dbe0e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5753,9 +5753,7 @@ with pkgs; gitleaks = callPackage ../tools/security/gitleaks { }; - gitaly = callPackage ../applications/version-management/gitlab/gitaly { - libgit2 = libgit2_1_1; # git2go only supports v1.1.x - }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; gitstats = callPackage ../applications/version-management/gitstats { }; From 1c725641c94d7d939d949b74804063de41535336 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 30 Nov 2021 14:04:02 +0100 Subject: [PATCH 12/84] evcxr: 0.11.0 -> 0.12.0 ChangeLog: https://github.com/google/evcxr/blob/v0.12.0/RELEASE_NOTES.md#version-0120 --- pkgs/development/interpreters/evcxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 81200a94aae9..97cae4089256 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-JziLEsY6kF5UeDt17q/HDrTlNtHj7DWy1tTq3s2eZHE="; + sha256 = "sha256-sD/eykXoeJq43o3xyFx2VIoH+xZrMmb6vZKVt4CO7B4="; }; - cargoSha256 = "sha256-I164eXgc/yiKKskloh6FGYD3bLCLWXaM6uWa01PRDXs="; + cargoSha256 = "sha256-eySdhzavm9NGv2xjgdq/C2iv6lxdulhgYNs9ehnSzKQ="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; From 0fd4de2ae21bc4a1a70e1d2349b64578794852fc Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Tue, 30 Nov 2021 15:59:43 -0800 Subject: [PATCH 13/84] plan9port: add DarwinTools to buildInputs on darwin --- pkgs/tools/system/plan9port/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 88c786e30b6e..d6c8833618cd 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation { IOKit Metal QuartzCore + darwin.DarwinTools ]); builder = ./builder.sh; From 373ec365bdb85d68a823a084974216f95c146b4d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Dec 2021 04:20:00 +0000 Subject: [PATCH 14/84] rqbit: 2.1.2 -> 2.1.3 https://github.com/ikatson/rqbit/releases/tag/v2.1.1 --- pkgs/applications/networking/p2p/rqbit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/applications/networking/p2p/rqbit/default.nix index 0220b12bd4b8..6d037e56ea44 100644 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/pkgs/applications/networking/p2p/rqbit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - sha256 = "0b9wxjwnhhs3vi1x55isdqck67lh1r7nf3dwmhlwcg5887smwp5c"; + sha256 = "sha256-ovg+oMlt3XzOxG9w/5Li3awMyRdIt1/JnIFfZktftkw="; }; - cargoSha256 = "1s278d73mwqpq3n5vmrn5jb6g5dafaaplnhs8346pwcc6y16w3d3"; + cargoSha256 = "sha256-0CA0HwFI86VfSyBNn0nlC1n4BVgOc9BLh1it7ReT8+Y="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 4a49525fa0169c971ff46459deb8d9b5102efa76 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Dec 2021 04:20:00 +0000 Subject: [PATCH 15/84] jtc: 1.75d -> 1.76 https://github.com/ldn-softdev/jtc/releases/tag/1.76 --- pkgs/development/tools/jtc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jtc/default.nix b/pkgs/development/tools/jtc/default.nix index 947dee9ee3c0..947f26664f4d 100644 --- a/pkgs/development/tools/jtc/default.nix +++ b/pkgs/development/tools/jtc/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "jtc"; - version = "1.75d"; + version = "1.76"; src = fetchFromGitHub { owner = "ldn-softdev"; repo = pname; rev = version; - sha256 = "0vgb5hcgml0vmdal494231jq6dlr0qgssqhnrgsvqqjapy8xhnpw"; + sha256 = "sha256-VATRlOOV4wBInLOm9J0Dp2vhtL5mb0Yxdl/ya0JiqEU="; }; buildPhase = '' runHook preBuild - $CXX -o jtc -Wall -std=gnu++14 -Ofast jtc.cpp + $CXX -o jtc -Wall -std=gnu++14 -Ofast -pthread -lpthread jtc.cpp runHook postBuild ''; From 21e5acd30888d414953ef69257f9510e29a311c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 10:36:07 +0100 Subject: [PATCH 16/84] python3Packages.twitterapi: 2.7.7 -> 2.7.9.1 --- pkgs/development/python-modules/twitterapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 313e408ca50d..6bbb68c28f5a 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.7"; + version = "2.7.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-KEJ0lAg6Zi2vps+ZPTkT6ts87qnIBL9pFe1tPEzviCI="; + sha256 = "sha256-3Ho8iw//X+eB7B/Q9TJGeoxAYjUJ96qsI1T3WYqZOpM="; }; propagatedBuildInputs = [ From be53d7d2d68ffedd31569b3b697d25a9ca335dc1 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 1 Dec 2021 10:38:06 +0800 Subject: [PATCH 17/84] vimPlugins.nvim-treesitter{,-textobjects}: use default branch Neovim in nixpkgs is 0.6 now. We don't need 0.5 compatibility anymore. --- pkgs/misc/vim-plugins/vim-plugin-names | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e964a19cf41d..eb55c9b2ac83 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -558,8 +558,8 @@ nvim-telescope/telescope-z.nvim@main nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter-refactor -nvim-treesitter/nvim-treesitter-textobjects@0.5-compat -nvim-treesitter/nvim-treesitter@0.5-compat +nvim-treesitter/nvim-treesitter-textobjects +nvim-treesitter/nvim-treesitter nvim-treesitter/playground oberblastmeister/neuron.nvim oberblastmeister/termwrapper.nvim From 574e92dac65adab09b44ab101cde1b4b1737a7b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 11:57:53 +0100 Subject: [PATCH 18/84] python3Packages.pre-commit: 2.15.0 -> 2.16.0 --- .../python-modules/pre-commit/default.nix | 30 ++++++++++--------- ...use-the-hardcoded-path-to-pre-commit.patch | 15 ---------- 2 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 7739c33f7ca2..384544f82866 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -1,47 +1,47 @@ { lib -, fetchPypi , buildPythonPackage -, pythonOlder -, aspy-yaml -, cached-property , cfgv +, fetchPypi , identify , importlib-metadata , importlib-resources , nodeenv , python -, six +, pythonOlder +, pyyaml , toml , virtualenv }: buildPythonPackage rec { pname = "pre-commit"; - version = "2.15.0"; + version = "2.16.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "sha256-PCWt1429+2ooplF4DVwxGsQN0X8WDrOVSgxZ2kClBac="; + sha256 = "sha256-/piXysgwqnFk29AqTnuQyuSWMEUc6IRkvKc9tIa6n2U="; }; patches = [ - ./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch ./languages-use-the-hardcoded-path-to-python-binaries.patch ]; propagatedBuildInputs = [ - aspy-yaml - cached-property cfgv identify nodeenv - six + pyyaml toml virtualenv - ] ++ lib.optional (pythonOlder "3.8") importlib-metadata - ++ lib.optional (pythonOlder "3.7") importlib-resources; + ] ++ lib.optional (pythonOlder "3.8") [ + importlib-metadata + ] ++ lib.optional (pythonOlder "3.7") [ + importlib-resources + ]; # slow and impure doCheck = false; @@ -55,7 +55,9 @@ buildPythonPackage rec { --subst-var-by nodeenv ${nodeenv} ''; - pythonImportsCheck = [ "pre_commit" ]; + pythonImportsCheck = [ + "pre_commit" + ]; meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; diff --git a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch b/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch deleted file mode 100644 index 4c1b6421e090..000000000000 --- a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl -index 299144e..6d12543 100755 ---- a/pre_commit/resources/hook-tmpl -+++ b/pre_commit/resources/hook-tmpl -@@ -25,8 +25,8 @@ ARGS.append('--') - ARGS.extend(sys.argv[1:]) - - DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?' --if os.access(INSTALL_PYTHON, os.X_OK): -- CMD = [INSTALL_PYTHON, '-mpre_commit'] -+if os.access('@pre-commit@/bin/pre-commit', os.X_OK): -+ CMD = ['@pre-commit@/bin/pre-commit'] - elif which('pre-commit'): - CMD = ['pre-commit'] - else: From b1cbba2cc9822f3200c5f01160ab5679ecd4fbc5 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 1 Dec 2021 19:00:55 +0800 Subject: [PATCH 19/84] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 318 ++++++++++++++-------------- 1 file changed, 159 insertions(+), 159 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a3cc3136dbf3..d6b78c236348 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2021-11-28"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "f92674de63d82accbed4f4a853925ec1d75e8cff"; - sha256 = "0njyhpn29z5s6xx25flk0pf53ifpdwznasdryi0bnri25pfv29hq"; + rev = "ab68f4f07b0f382f61b14b67599a59b1f6fead87"; + sha256 = "1jlav2mbsizwnkkgp1v15sw765q24kc5sss34y16hdxsap6113vd"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -197,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-11-27"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "d98ee14f18c7e117f8221aea83c51d713a080076"; - sha256 = "05azpx3q49j9c2qli0n15dby0xn88pfij36xfsnwy2wrbs5c2k0d"; + rev = "1607b4c100f9c466fc0208e936421a0202025457"; + sha256 = "1rx1ggy54j71pp5ihv8zb3wqq69b26v65q1snv6hlabar02hrl1r"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -473,12 +473,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-11-28"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f56b751e3b04b3146f90f892047fb63623eb6ca6"; - sha256 = "0lxz0xir8zy7p5bs5z6vf9nxy91n6pxjqvf5iql7yfhc9hhaasf4"; + rev = "d034dcc738c8fd2217199e5db76066223ab8750c"; + sha256 = "1s97snn5g5bd3sfqj5n2a76f0r9d3ywi0q08xbxv6y3p83c1dn10"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -605,12 +605,12 @@ final: prev: cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2021-11-22"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "e5aa12620b6cae9ba5ce27aed2c47a99b81f004f"; - sha256 = "03zjy4xwzm1898pabz0gzydc5zlcnsprkqlk0aavz0aw21mmywkh"; + rev = "29ca81a6f0f288e6311b3377d9d9684d22eac2ec"; + sha256 = "0yzh0jdys1bn1c2mqm410c0ndyyyxpmigzdrkhnkv78b16vjyhq6"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -689,12 +689,12 @@ final: prev: cmp-omni = buildVimPluginFrom2Nix { pname = "cmp-omni"; - version = "2021-09-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-omni"; - rev = "3fec8a57d6d230c81d24c03dd80e97c62d4eda63"; - sha256 = "018lzqxdcw78ckqm16jn0wh3pv9pjl6abcj1q2svfalmim0h6a87"; + rev = "580d07d32242d542e365d2732eddd2dbb7374aff"; + sha256 = "1d6j1ddfb9xijsljskb04s3kan3sg8lmbv1qal5hmhrwi8x65dwg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; }; @@ -713,12 +713,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-11-27"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "4fe14cf56288200614950fe57525ac6340f49d5a"; - sha256 = "1f48pnmwnr93frggpqd0m6vnpkj1frn3vnnp5ljwi86mlc4p4ag4"; + rev = "e30d3fdee650a07330654efab1951b2f1b91435e"; + sha256 = "1sf79aqq41qbz69b29yzyn27qb9x8spyqxpay8fgzhn8jfkapvxv"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -737,12 +737,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2021-11-28"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "d52a25de3417139d5b0e1624f15c60df0565c75f"; - sha256 = "1vx0zb41c39k7ba6slkic8w9f91l5070yzja6l14pyngq55h5mdw"; + rev = "e03ad3d788b0d76293b3a7601e0abf988d6d3859"; + sha256 = "13kkgvlnzjh57ynpyj1vw1dgs4zf4y2cq4c1mf3g51782qgf0kxp"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1002,12 +1002,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-11-25"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "d7c6daa59a0d5940f85f110d8e59fdf9b0cef5d1"; - sha256 = "14j1fc1c43lpj24gflw1b594n601al8clkcpjpql7rl3dbmh3dc9"; + rev = "5106ae2d3c93d37173ccb3b917bebb9845e3d3e6"; + sha256 = "1svhj1n17y70ns9d0hc9a3dvxb1nmpii5vgificgpwqfmkws4dak"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -1170,12 +1170,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-11-28"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "b1de088782d8ad225728fcb79cfa889f8ff3edf9"; - sha256 = "1cjlf1yqdd1il0wjbhmgflqp761ybkpbaaw318564b8hvmxknwxk"; + rev = "cdfb2df434ff57a00f2f3f90dc5c6e11c2bd3079"; + sha256 = "0f7wwn3x579qm0klq4h2hmmvh5srb1fvsgmcnhm2il4j2mgdhykh"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1362,12 +1362,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2021-11-06"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "feb1269a56628accc1ec74f4d5e0ea91b80fe9f9"; - sha256 = "0nnbj538vd99rb4cjfs6xxx6c1n7aflpw92zkz9if1xhfw4jqfzc"; + rev = "e9db6ec1c53797eea0571f4374bee79bcca5db40"; + sha256 = "0hlbr4dvh8irif6xa24dwj0l1wx8djfx72dq1wx4y16af4wgkkfv"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1640,12 +1640,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-11-26"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "f92d27b22bd5bfa47903ac91de5077263ce816ea"; - sha256 = "03yawkbh6fxm9wf5nfj2wblcdwxjs4gjcqrp96k9xyjf58ggrlsi"; + rev = "2c0f5af509a9e0f42430c0b561ab7e49aec84f72"; + sha256 = "16ap4kdb5gghnn6x9fiafphpr7gvkq5baiba0vzxiv8h2la0jhw1"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1712,12 +1712,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-11-11"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "f2c8e3d2a72f3763e3ea9c620a118e73e2146fb1"; - sha256 = "08v10j0hirqcj2r2fcw8b04v8bpwj1kp887pq8vs5f57ncqzl8x7"; + rev = "80be959e1840b0a49dda09775610cc3c366b8f3c"; + sha256 = "136akfkblxc4myyb7l6gs8zszrgn2is8b0692v16xbql3i4d708n"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2219,12 +2219,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree.nvim"; - version = "2021-11-24"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "62d2be7e0bf5a594a547efa1ab962c930f448e2d"; - sha256 = "1k1bz9hvbqxankfr038fbmxrmjr1zcnn3j7mchzcj4pfx5x3ny3g"; + rev = "508a33853b9cc14c67cc042d2f4876d6db636b68"; + sha256 = "0n1mn3fnmxddgj0j4041ia2fnnhsfknl4ks88llabg8k0kcxvzmi"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -2243,24 +2243,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2021-11-15"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "003ee482a25118cdac73faea8bd35df0399e8f8f"; - sha256 = "0zpy1cpviia9l4z3b87534arnxfja48bjhqqb88mxjzm9gkc4rbf"; + rev = "a11e5fa14bbb438f59a3744bff53a3ad78eecd71"; + sha256 = "0s17alrjqbdyk7jxg6jyb4xwmr9741a2r3306ywx6qsl9pk3n0p2"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-11-19"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "95845ef39ce0a98f68cdfdcf7dd586c5e965acc7"; - sha256 = "0hzzwsc9y8z71d82j2sbhhl5vxp1xmd8ki0km746jcigfaaagdll"; + rev = "9678750f209671551c335c4f22658a6554c2f439"; + sha256 = "1i8xlj40a80p3s7pkxqqdxpfz0330akfqd7q2rr4gakqc927aqgy"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2327,12 +2327,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-11-17"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "817bae89f75c8f061f7c0198ce392dca5d16ac94"; - sha256 = "0pxz7mrl4fsdi6pyk7zizxb7g3a11n8s36ndg3l9qsbihfxiqk5y"; + rev = "308fb0fc4810ddd29209d2840cd92c68a5bd005e"; + sha256 = "0nlww4f8v5w05qz44pw3hdapkfm22gp12733pp634r1hi6ga0kdj"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2387,24 +2387,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-11-11"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "a25c5294013d58e4fde6b72d94a5f77e3330f0cc"; - sha256 = "0k4baphl8x6fy8hqidr7g8mw6w1cjhwsgjmsd9v72a9ikl4z22vq"; + rev = "fb27ccbd20cc1eda04e181f22c722977bdf9c934"; + sha256 = "0hi99gjirhfcv3l8jay0ay3qk9w2mhv06y6afxvx0jk64wr8mr1q"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2021-11-22"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "c69b98d5defbe998627be2175e2ce7707fd73dc0"; - sha256 = "0wha77kmci0923qin5k6ximmfs8pf6viz22h5yl7abc3wi294vzb"; + rev = "8efd28ff057c24b8179e0ace9e12f57141a7f6b0"; + sha256 = "0kqal8ddxam5hiczf6pakmx1dxk2zbf32l2hk27jcscj0q7npxc7"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2627,12 +2627,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-11-20"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "caf7f61e94525bbd97e32f118efd6c0722430616"; - sha256 = "1gdnw6scph18ihkiscyh51lbdaj5m6hlq5wggammpzi7pj2gqmar"; + rev = "0f8df7e43f0cae4c44e0e8383436ad602f333419"; + sha256 = "13jqcl54ijdzk3r17fmr2zzzjxn1njwfhipaaxyk7p6qqi1hphgj"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2928,12 +2928,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2021-11-25"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "5d23a7a83b1a8ccdbf1b27927172d5fdcbdf0dd5"; - sha256 = "0p6f8wwiniin1ah1ds2c5n9pq6qmy6hk0f10iil4bim5ng08yvwn"; + rev = "0283251541b44508cf80a25be660d1a856cbe9de"; + sha256 = "16nvzgx6h11br4v5vw1sjm0lv84727xlxrfs9zc54whxhs4bscd8"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3240,12 +3240,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "e63b58600f91681f744fc180ae13ce2800b5e29a"; - sha256 = "1sc7v2g1dfw5sls8iddi10w5ba2n7j24k77abarw7y6rwfmnzlrh"; + rev = "f40a378f969de864289399334017c98875100799"; + sha256 = "002wwfyiydr9r240c1x9zxs1dgym4zkwv0zk7pm6ivc67287avp9"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3828,12 +3828,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2021-11-23"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "3e4d6d427b6353dcf3569ba02abdcf4c6f532621"; - sha256 = "1gr0476ibsdp3n31xab3wkmfff09f1zgicyizjnbck7lbin1v3xi"; + rev = "0f203f0b7964170f0dd2610ccb2307dc03d6dffd"; + sha256 = "1qsr5i2zc7ika9v6b16771lxbyaajciabmyc0n96c4fzgc584h3a"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4008,12 +4008,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2021-11-07"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "c9265653e7fbf70326d671b37c7c89e4fa2b8093"; - sha256 = "0cn8gxzk9l4nmfxr97xrcz8sd0vrzv827mw499nlpai1z8xqj318"; + rev = "d96e7e3fa955ef89788f4d6e14cdff07a162cf15"; + sha256 = "0fn3ijhyjdvy4aq12hwgg5mpmh2vfd848bycz0gpifkigmhb1dwj"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -4056,12 +4056,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-11-26"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "b07ce47f02c7b12ad65bfb4da215c6380228a959"; - sha256 = "0j9iawg8hv1aqd68k7n22hm6rs0ia862vxvkq3y10b0xiagcvfyr"; + rev = "357b9a1afedd0d708b48fc1f39fffb92a73840a3"; + sha256 = "0lfhfri2507mkp8d6klwkhkxi2mdzjywkx910pbc0lmzcvfsprna"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4128,12 +4128,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-11-27"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "d82e784a36160028b245576213100c888be503f0"; - sha256 = "1y0g2y9fbxy5bq1wp8g36irsjhhvkbkcj6nfmbiaichizsl5zmz8"; + rev = "eb044199ce46ff597da6efc7d3e4d3bf7e7b17aa"; + sha256 = "14viwfxiazqc8k1zrabqhwv3yxv1ycvcwk7ql2gpnxp3fak3rp8g"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4164,12 +4164,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-11-27"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "092fb66b6ddb4b12b9b542d105d7af40e4fbd9f2"; - sha256 = "0fa4y4zyrg6amsfjivs9zb9wlh1zlcjmh7va8mbghccmi72lpl92"; + rev = "a61c36a639a1662a5d27b1a88086b9c91d7d49a8"; + sha256 = "0a8b9i7sg71hw25r3k1g7niajp3x4qivb33i14gi991p87mdnmfq"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4248,12 +4248,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-11-27"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "052f3424daba36984f506de80532121b01e07ff5"; - sha256 = "076qrh2jskqfbpr31bmp9l3l855659p4j6yd4mmzm71xwv020049"; + rev = "a5183531c2b29199a8a0ad0187697ee7c9cdcee2"; + sha256 = "0hvj2jknbr87fg14hnm28l3gpccpgkhf7czsjvi5qjqi1bi3s12j"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -4308,24 +4308,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-11-24"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "b9bbef6204bbb143d45fd457a07f211cb38f9679"; - sha256 = "19r828px9ix31ai0ydxqi7ymp4cpabk23ligglnki4pc34bhw55q"; + rev = "639c167541202fcbf41ed5cec619ce0fcf1d5ab8"; + sha256 = "1dcwbzw6rfh5h2yxl17jy5szqp2fmjcss3sfcznis1ccdggh9wnr"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-11-22"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "8aa60ec837eb40689ff1f67e050bd8662202d5be"; - sha256 = "1vjjn1kh4gflp1r97ix7rs4frlk8w9z0k0vfyif0pzl24f8dsvxq"; + rev = "2e2a5f041cb5a9acf3e6ae61735b32fa877ae69e"; + sha256 = "0swrx2ipcxd01df0aplm3066mvy2ad9mj07cybgz4g1qh5f7mpim"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4392,12 +4392,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d9aa848da3905e0f8153e546d7b630d3d13e0435"; - sha256 = "16j5xk75vbi7gdw822dc1xr0a3wlr5b1fimm8d8h5naydx5fvpfc"; + rev = "622b155fb608d5366658de12a08b3050f5ca5772"; + sha256 = "0sadswm4bywsr4vznknqpdzq00jb5zdk1b3gv2g5m938y417pim7"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4428,12 +4428,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "9ac4202ed3c5afa92498b83dd28dcde19576ab1f"; - sha256 = "0ic4vicm7a63h7gs4w4fz2fg4clkd4q1zag7kdklwg7qyrdnacn9"; + rev = "36012703049bc7be9d4de97cb96c6d17ccf978cd"; + sha256 = "0gv3czqrcbbyvcvhz3lb0xzyc2agxf20wgc0mxwsvcn9339ymzmw"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4452,12 +4452,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-10-09"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "fb35d9d7b52985baac5d77ec52d6b6b35403fb8a"; - sha256 = "013gmwrcanvsa95jgl4xd5agci7j05w9yvqayns83gxbsbl7bsjs"; + rev = "b962a67f6bb5ac7c415003748f2088b522ca4390"; + sha256 = "1krj8jjd5x0f5bfzhhasxisp6kxf0jq5nilx5ik4fl6az3p5q2za"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4512,12 +4512,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-09-17"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "47cfda2c6711077625c90902d7722238a8294982"; - sha256 = "14di7qm37m176r0qsbb0vmc3csya72rd5bszm6yk7lby8izfnqxa"; + rev = "8d1547f0bcd0831876678eeb238c3ba9a528189b"; + sha256 = "141ns7ap27v1ybly2jbpp4qi1p1m1g9cfja545iyb1x1936wzcya"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4560,12 +4560,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-11-26"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "380561ee746eac6791d148c6de459f4d92b2fa33"; - sha256 = "08sy36gd3bdz3s69dxlck2a8952cn0gdvb3i3dppm0skjz8d353f"; + rev = "6311b7eeebad214747018a95896f53f0c2485ef0"; + sha256 = "0ndb3hmyr0vrg25178rpbwby7zzjfda5bw63ix5d9b77zk6896ab"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -4704,12 +4704,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2021-11-25"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "4ea622fb56fc0df026e12c768f761bb832bba02d"; - sha256 = "0684q3h3arzcm4m33gxskc96jc5g6y4kdqzzh75hxq0bilfdvy63"; + rev = "d644c85b0193a76c86fe591e378329987f984661"; + sha256 = "19rw1n01qlfil6i2c0m1md12dql6caplx7apqxbgnwxbbawc4ps1"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -4776,12 +4776,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2021-11-03"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "7f62848f3a92eac61ae61def5f59ddb5e2cc6823"; - sha256 = "1sgrwm271pnvw9anl1y8x94bz0w7qvi3bdiqh1wpwvsqic73frq3"; + rev = "db3c3e3379613443d94e677a6ac3f61278e36e47"; + sha256 = "0zn6a11j2fp8lmc6kkkmi5nmz4xmrnrymdxpzrxmq8a5iw9cg2bg"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5329,12 +5329,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2021-11-19"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "a522e1d4affddefd824daefcfe42a7e2cab6626f"; - sha256 = "1h5q33b6bgmj9zf7fm5kbx95gp49jcn8af9rm5jn5bc0b3l7nzls"; + rev = "cdf9fd7a8cb41ad89e8f7dcccdd4a79d186f1f54"; + sha256 = "18irbz0lcg6a8iv7qpyzjssk7j7fvw57jwn9c4w59k5h53yhz0kq"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5546,12 +5546,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-11-11"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "30dd4ae6f844ab0f53ba93eea61068f87886eb03"; - sha256 = "0hwcar6c6n3fvli9pmx1ycvk4128f47hl07c7y7hxzy2rks7s3j8"; + rev = "563280b529405e86464ce0554872f7dc6b6c3f92"; + sha256 = "0syhr5a8jmzv1bv9zpmbqzblpgva6cxgnxkifpd9xvsy63dd0q96"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5679,12 +5679,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-11-17"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "3d86afaa61aa45ca8d849494d9f8ceb5fc424353"; - sha256 = "16wx3wgmrslpsm1h5fskik2lkas390fj2gjz3vwii4c5mz2ijr9m"; + rev = "fca1c02b29d5f54f063122270f3e5ea8777ca958"; + sha256 = "0a5rra4al18m3f175awz118gilg3cqx8i3k1mr0657n5hvkxbs9d"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -6089,12 +6089,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ed4adba6d0083a14cabf5837f2511b2617a45593"; - sha256 = "1ippixq77irl2dslnf4if31v59ij6ycij0bbl6q1ghpvkqkryd81"; + rev = "ef245548a858690fa8f2db1f1a0eaf41b93a6ef6"; + sha256 = "1fsbd4cjc13f1mylpg7i4rdsqj2y4ib2kzph91xnnjf6zsi6bmp0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6246,12 +6246,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2021-10-22"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "2981e4bd0919305675d8d665f9a20281bb33ed06"; - sha256 = "15kv5g1srqsayryf3x469sl2bgaq69ni31imp7yi7dfvmzlxf6q1"; + rev = "3cbf86cf045ea19253f9c8614863e22beb531868"; + sha256 = "0b5r1nsb9gllg75gqr27jj8ksmd42lzfv6alk60fqw6l98avvzr3"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -6462,12 +6462,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2021-11-17"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "31c80d4f77056e89cabd9ea3e617feea076499f8"; - sha256 = "0p64fr5l5khs4p7d677zkjq6j81mxkh5aailzk9jr82q5sskv3wf"; + rev = "a737e93a97254681473313a606c66cc810291a87"; + sha256 = "0b59rhngw1xwv0pccwsql7gyrmj55b7c4bkighqkk3kd0mbqy4qh"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -6978,12 +6978,12 @@ final: prev: vim-buffergator = buildVimPluginFrom2Nix { pname = "vim-buffergator"; - version = "2018-05-02"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "jeetsukumaran"; repo = "vim-buffergator"; - rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916"; - sha256 = "0g7ymflzfdsj5793s32gc83bidqys5dxmw455viwpqgmgjxnar5c"; + rev = "0514af606a3b41bbe82c33875179b53300a3cb86"; + sha256 = "1g1g2agj9dzgrk6ccr4ampyrsqjs4j6gqmvv75avq7q068glglzz"; }; meta.homepage = "https://github.com/jeetsukumaran/vim-buffergator/"; }; @@ -7458,12 +7458,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2021-11-25"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "9d8b2327bc7054fcc81fcdc6e8e94639a63f9b25"; - sha256 = "1hwcp6kz7hb0fawdb59ppg852zw2hjvmx9l9mh92b0zq72h7rq9w"; + rev = "f2ae53daaab394dfe3ffe5a0d8a80420f46d81c7"; + sha256 = "1yrmxpy9dfzgrjqfzzprz2layrcz45a2hf9yzxd3q76gr5qmf1kx"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -7938,12 +7938,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-11-26"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "ca5c6d07d23573c7ed0ef85d891c86d45545a6fc"; - sha256 = "18f1i10r8hqldl0d00p102niwn0pz7dfbnwx0hyhhjrv109pcjv3"; + rev = "56285b71871e16e214480042c729b12d193f3537"; + sha256 = "1z9gp8ljrh1vwwq461h2kdf4bgg7nkjpi5nd3y7g3f850glph293"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -8672,12 +8672,12 @@ final: prev: vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2021-09-24"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "dd5243a34e97c15e1a128b6ec440a0368e583900"; - sha256 = "0kn4w2i83fwhjcpmj1zym9hr4lvl27vcl0f1cz3n3lv3jhr7g7zg"; + rev = "fd2f0017fbc50f214db2f57c207c34cda3aa1522"; + sha256 = "1z9bmcx13py56phr8djdnykw3a933chhv6ypcfigkjp6cyqkj1mc"; }; meta.homepage = "https://github.com/tpope/vim-liquid/"; }; @@ -8732,12 +8732,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-11-02"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "0c8a35d899202f7a7d94aefd290f3c7a1590e9c5"; - sha256 = "02h2z8j1w083hjvgafxrclz0a1r2q4lrsc56yllswpk8yq1x30pb"; + rev = "a91419ea0ace6f791a43e0697946599fe7a9ae60"; + sha256 = "0rs3f8nfw8qyhl61y56qv7k96l0wprybx56bdbhqpjzan0ir3ci6"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8841,12 +8841,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-11-24"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "2c3227b3de50d248ad6c8900b3e12f1dd21994ac"; - sha256 = "129bqyg611swh9rhahvfybc9n0wdrgkknk0b2bx1zx634078n9x8"; + rev = "ef044ee012baa01d6f4ad79a04eeb5edb5bc7d84"; + sha256 = "19hfg4ihx36rs14mcmr60s6mk1v28db2aba2w44cnisq4mm6y4qy"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9753,12 +9753,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "17eb132421e7e4915a2b9b67c1034ee4581fb13a"; - sha256 = "1cvm31iaqlmwvyrx3lb3gkky70zsn3h1b1z1vicr96sn0hqp903q"; + rev = "cfe8b70e4f404e3bbb9d4e97e082a4294a5762a4"; + sha256 = "0mcx85knnfmyjz0lbz6zbrv6gry8d9bp2z21af7riz93g7zi01z7"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -10426,12 +10426,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-11-12"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "be9cd2c8cd007088f69019f18fb61aff457adb8c"; - sha256 = "1r2wvkgziil4bik3g7b19cscg17skhx98pgsvm2m00czrrfdxq6v"; + rev = "109fd94dcb15a37a21735ac458071ab2dfacd4f3"; + sha256 = "1s1xk9wvcznj2sffdfkwr599jypyrsjmqs93lgxiq224sj2161j9"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -10486,12 +10486,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "30738e5101a3070e622c33c7ca2a026c5cf1a7ad"; - sha256 = "0lxv56668rbd104l0q8pzf2wlwffzvp2w4zxis790p2rivqaaasf"; + rev = "f925585c8cd6d062b62ba94cd0a4d9bc1d61844c"; + sha256 = "0mz721biz6yqipy5c3ab1aqmacs1kn5glv10jlj0sdmzwjziqrgi"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -10906,12 +10906,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-11-24"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "93ccc361334c4de1095a9a2b59d3a212d227e3e0"; - sha256 = "079pg4nabj6q7kkv3wv73998zvyhwsqfkn8c12y84h664l460265"; + rev = "49ad167416e58bdfadc181e3cc225683c8a82851"; + sha256 = "0hqc0jpgm1z9qm25fzk5ygjr6467jw9bf9iigv78g505qp4g3l8z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10919,12 +10919,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-11-24"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "d9e05f5e8010ce43670d19655058a6dc8cad300e"; - sha256 = "1a79qsyv7j269vlnm0b81x07p8c5dwxwyq7bqal3cm0ifsmy78w7"; + rev = "3e079a1a35235847c6d767df5709fc246a2f05f8"; + sha256 = "04zrll1lk93yxcalygdp1iry85jp5jrsplkh40d50kgz4mkl5nf2"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From 3a972acb377a06a6356aa0e45cd0eae778609bf8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 12:33:50 +0100 Subject: [PATCH 20/84] python3Packages.mypy-boto3-s3: 1.20.12 -> 1.20.17 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 426d0e6942d6..b26086f00ae0 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.20.12"; + version = "1.20.17"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J0EqIMSQEvev8sZ1XLgxPD68xlgPtlRTW/yBPyrekFQ="; + sha256 = "sha256-7Zw8NxOEXDRmLChxHQXVU/HzR8z6HuLxX8bB3pZuCqc="; }; propagatedBuildInputs = [ From 6074436c1bb0576402968638c3e8ac2790772bc9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 12:37:23 +0100 Subject: [PATCH 21/84] python3Packages.md-toc: 8.0.1 -> 8.1.0 --- pkgs/development/python-modules/md-toc/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 754ed78cff70..58670c49a90b 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.0.1"; + version = "8.1.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-nh9KxjwF+O4n0qVo9yPP6fvKB5XFICh+Ak6oD2fQVdk="; + sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo="; }; propagatedBuildInputs = [ @@ -28,11 +28,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "fpyutils>=2.0,<2.1" "fpyutils>=2.0,<3" - ''; - pytestFlagsArray = [ "md_toc/tests/*.py" ]; From cc084edc89974e7d98ae329585956b9d27bc349e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 13:08:02 +0100 Subject: [PATCH 22/84] kubeval: 0.16.0 -> 0.16.1 --- .../networking/cluster/kubeval/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index af8e04667b7f..774efb044af1 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,17 +1,21 @@ -{ lib, fetchFromGitHub, buildGoModule, makeWrapper }: +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +}: buildGoModule rec { pname = "kubeval"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "instrumenta"; repo = "kubeval"; - rev = version; - sha256 = "sha256-c5UESyWK1rfnD0etOuIroBUSqZQuu57jio7/ArItMP0="; + rev = "v${version}"; + sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg="; }; - vendorSha256 = "sha256-SqYNAUYPUJYmHj4cFEYqQ8hEkYWmmpav9AGOSFDc/M4="; + vendorSha256 = "sha256-OAFxEb7IWhyRBEi8vgmekDSL/YpmD4EmUfildRaPR24="; doCheck = false; From 06473a1c6faf8c085449550d2bb7192cc070886b Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 1 Dec 2021 08:09:07 -0500 Subject: [PATCH 23/84] lunatic: 0.6.2 -> 0.7.0 --- .../interpreters/lunatic/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index de0c927567d1..cf4339c69ac4 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -1,33 +1,24 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch, cmake, stdenv }: +{ lib, rustPlatform, fetchFromGitHub, cmake, stdenv }: rustPlatform.buildRustPackage rec { pname = "lunatic"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = pname; rev = "v${version}"; - sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r"; + sha256 = "sha256-+4014p+4QJ7nytFHHszAOYQHXLYXqR+Cip+vHxsH9l8="; }; - cargoPatches = [ - # NOTE: remove on next update - # update dependencies to resolve incompatibility with rust 1.56 - (fetchpatch { - name = "update-wasmtime.patch"; - url = "https://github.com/lunatic-solutions/lunatic/commit/cd8db51732712c19a8114db290882d1bb6b928c0.patch"; - sha256 = "sha256-eyoIOTqGSU/XNfF55FG+WrQPSMvt9L/S/KBsUQB5z1k="; - }) - ]; - - cargoSha256 = "sha256-yoG4gCk+nHE8pBqV6ND9NCegx4bxbdGEU5hY5JauloM="; + cargoSha256 = "sha256-RnaAiumTP4cW2eHUbnwyPdgJQLK65gqDI/NP2SOrO4E="; nativeBuildInputs = [ cmake ]; meta = with lib; { description = "An Erlang inspired runtime for WebAssembly"; homepage = "https://lunatic.solutions"; + changelog = "https://github.com/lunatic-solutions/lunatic/blob/v${version}/RELEASES.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; broken = stdenv.isDarwin; From c6ee63259a744b204ef2283a931de9f4e246f238 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 18 Nov 2021 08:53:54 -0800 Subject: [PATCH 24/84] nixos/test-driver: more context when step finishes When displaying the amount of time some step took, with no other context, it becomes nigh impossible (especially in longer tests) to see when specific steps finished. --- nixos/lib/test-driver/test-driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 643446f313e3..7b8912acf503 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -171,7 +171,7 @@ class Logger: yield self.drain_log_queue() toc = time.time() - self.log("({:.2f} seconds)".format(toc - tic)) + self.log("(finished: {}, in {:.2f} seconds)".format(message, toc - tic)) self.xml.endElement("nest") From af765f3abd7193ec5256cea3d5e8b7692dc99931 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 18 Nov 2021 09:10:51 -0800 Subject: [PATCH 25/84] nixos/test-driver: give more functions nested labels This will make it easier to trace through the test execution without having to scroll through the entire kernel output. --- nixos/lib/test-driver/test-driver.py | 71 +++++++++++++++------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 7b8912acf503..da5a6cec4ec4 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -490,23 +490,24 @@ class Machine: return rootlog.nested(msg, my_attrs) def wait_for_monitor_prompt(self) -> str: - assert self.monitor is not None - answer = "" - while True: - undecoded_answer = self.monitor.recv(1024) - if not undecoded_answer: - break - answer += undecoded_answer.decode() - if answer.endswith("(qemu) "): - break - return answer + with self.nested("waiting for monitor prompt"): + assert self.monitor is not None + answer = "" + while True: + undecoded_answer = self.monitor.recv(1024) + if not undecoded_answer: + break + answer += undecoded_answer.decode() + if answer.endswith("(qemu) "): + break + return answer def send_monitor_command(self, command: str) -> str: - message = ("{}\n".format(command)).encode() - self.log("sending monitor command: {}".format(command)) - assert self.monitor is not None - self.monitor.send(message) - return self.wait_for_monitor_prompt() + with self.nested("sending monitor command: {}".format(command)): + message = ("{}\n".format(command)).encode() + assert self.monitor is not None + self.monitor.send(message) + return self.wait_for_monitor_prompt() def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None: """Wait for a systemd unit to get into "active" state. @@ -533,7 +534,12 @@ class Machine: return state == "active" - retry(check_active) + with self.nested( + "waiting for unit {}{}".format( + unit, f" with user {user}" if user is not None else "" + ) + ): + retry(check_active) def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]: status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user) @@ -752,7 +758,8 @@ class Machine: status, _ = self.execute("nc -z localhost {}".format(port)) return status != 0 - retry(port_is_closed) + with self.nested("waiting for TCP port {} to be closed"): + retry(port_is_closed) def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: return self.systemctl("start {}".format(jobname), user) @@ -886,20 +893,20 @@ class Machine: retry(screen_matches) def wait_for_console_text(self, regex: str) -> None: - self.log("waiting for {} to appear on console".format(regex)) - # Buffer the console output, this is needed - # to match multiline regexes. - console = io.StringIO() - while True: - try: - console.write(self.last_lines.get()) - except queue.Empty: - self.sleep(1) - continue - console.seek(0) - matches = re.search(regex, console.read()) - if matches is not None: - return + with self.nested("waiting for {} to appear on console".format(regex)): + # Buffer the console output, this is needed + # to match multiline regexes. + console = io.StringIO() + while True: + try: + console.write(self.last_lines.get()) + except queue.Empty: + self.sleep(1) + continue + console.seek(0) + matches = re.search(regex, console.read()) + if matches is not None: + return def send_key(self, key: str) -> None: key = CHAR_TO_KEY.get(key, key) @@ -1014,7 +1021,7 @@ class Machine: ) return any(pattern.search(name) for name in names) - with self.nested("Waiting for a window to appear"): + with self.nested("waiting for a window to appear"): retry(window_is_visible) def sleep(self, secs: int) -> None: From f0a01556c72c279fd16f3c52665b1453eef5b334 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 30 Nov 2021 21:20:59 +0000 Subject: [PATCH 26/84] libxc: fix darwin build --- pkgs/development/libraries/libxc/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 046d630888c4..5ed5ef1fc373 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" + # needed for tests to link + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # Force compilation of higher derivatives "-DDISABLE_VXC=0" "-DDISABLE_FXC=0" @@ -27,10 +29,6 @@ stdenv.mkDerivation rec { "-DDISABLE_LXC=0" ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd) - ''; - doCheck = true; meta = with lib; { From 5dfface8d549fdc80100c7dd06f00fe5e6226bd2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 1 Dec 2021 16:24:38 -0300 Subject: [PATCH 27/84] pinta: 1.6 -> 1.7.1 --- pkgs/applications/graphics/pinta/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 66804fc3110b..c2704cbf265b 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -11,7 +11,7 @@ let in buildDotnetPackage rec { baseName = "Pinta"; - version = "1.6"; + version = "1.7.1"; outputFiles = [ "bin/*" ]; buildInputs = [ gtksharp mono-addins gettext ]; @@ -21,7 +21,7 @@ buildDotnetPackage rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - sha256 = "0vgswy981c7ys4q7js5k85sky7bz8v32wsfq3br4j41vg92pw97d"; + sha256 = "sha256-yRp/dpJ9T4DieqHTj3vhyuASPGe4vjHw0rSXFrTNZVc="; }; # Remove version information from nodes @@ -74,6 +74,8 @@ buildDotnetPackage rec { --replace _Comment Comment \ --replace _GenericName GenericName \ --replace _X-GNOME-FullName X-GNOME-FullName + substitute xdg/pinta.appdata.xml.in xdg/pinta.appdata.xml \ + --replace _p p xbuild /target:CompileTranslations Pinta.Install.proj xbuild /target:Install Pinta.Install.proj From 97d8492ac54aa9f22c9469e274dbc5345e6fbc1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Wed, 1 Dec 2021 20:39:14 +0100 Subject: [PATCH 28/84] sumneko-lua-language-server: Add darwin support --- .../sumneko-lua-language-server/default.nix | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index d8916ce3e9a8..85cdb9d53b45 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper }: - +{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, darwin }: +let + target = if stdenv.isDarwin then "macOS" else "Linux"; +in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; version = "2.5.1"; @@ -17,12 +19,32 @@ stdenv.mkDerivation rec { makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Foundation + ]; + preBuild = '' cd 3rd/luamake + '' + + lib.optionalString stdenv.isDarwin '' + # Needed for the test + export HOME=/var/empty + # This package uses the program clang for C and C++ files. The language + # is selected via the command line argument -std, but this do not work + # in combination with the nixpkgs clang wrapper. Therefor we have to + # find all c++ compiler statements and replace $cc (which expands to + # clang) with clang++. + sed -i compile/ninja/macos.ninja \ + -e '/c++/s,$cc,clang++,' \ + -e '/test.lua/s,= .*,= true,' \ + -e '/ldl/s,$cc,clang++,' + sed -i scripts/compiler/gcc.lua \ + -e '/cxx_/s,$cc,clang++,' ''; ninjaFlags = [ - "-fcompile/ninja/linux.ninja" + "-fcompile/ninja/${lib.toLower target}.ninja" ]; postBuild = '' @@ -33,15 +55,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dt "$out"/share/lua-language-server/bin/Linux bin/Linux/lua-language-server - install -m644 -t "$out"/share/lua-language-server/bin/Linux bin/Linux/*.* + install -Dt "$out"/share/lua-language-server/bin/${target} bin/${target}/lua-language-server + install -m644 -t "$out"/share/lua-language-server/bin/${target} bin/${target}/*.* install -m644 -t "$out"/share/lua-language-server {debugger,main}.lua cp -r locale meta script "$out"/share/lua-language-server # necessary for --version to work: install -m644 -t "$out"/share/lua-language-server changelog.md - makeWrapper "$out"/share/lua-language-server/bin/Linux/lua-language-server \ + makeWrapper "$out"/share/lua-language-server/bin/${target}/lua-language-server \ $out/bin/lua-language-server \ --add-flags "-E $out/share/lua-language-server/main.lua \ --logpath='~/.cache/sumneko_lua/log' \ @@ -55,7 +77,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sumneko/lua-language-server"; license = licenses.mit; maintainers = with maintainers; [ mjlbach ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; mainProgram = "lua-language-server"; }; } From e87aec124e710d3ccbf7c6a0d4f7538ec62ffa68 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 1 Dec 2021 21:37:38 +0100 Subject: [PATCH 29/84] maintainers: update patryk27's email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8851889ef566..3fac740a11ee 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8923,7 +8923,7 @@ name = "pasqui23"; }; patryk27 = { - email = "wychowaniec.patryk@gmail.com"; + email = "pwychowaniec@pm.me"; github = "Patryk27"; githubId = 3395477; name = "Patryk Wychowaniec"; From 33b9a3048d1201c4abb610908aecad664c75b872 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 1 Dec 2021 21:38:11 +0100 Subject: [PATCH 30/84] clang-tools: update maintainers --- pkgs/development/tools/clang-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index ba829f2c41df..bfc00fb6e3d3 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -34,6 +34,6 @@ in stdenv.mkDerivation { meta = unwrapped.meta // { description = "Standalone command line tools for C++ development"; - maintainers = with lib.maintainers; [ aherrmann ]; + maintainers = with lib.maintainers; [ patryk27 ]; }; } From 82aef7957db4f08ff7415761321ace9ec77d89e3 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 2 Dec 2021 08:03:17 +1100 Subject: [PATCH 31/84] fastp: 0.23.1 -> 0.23.2 --- pkgs/applications/science/biology/fastp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix index 2e44113f40ef..4dace9e63b42 100644 --- a/pkgs/applications/science/biology/fastp/default.nix +++ b/pkgs/applications/science/biology/fastp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-vRJlNtg2JabBAUaX91Y04z8MdyxEnreBAlIHn7VB+u4="; + sha256 = "sha256-W1mXTfxD7/gHJhao6qqbNcyM3t2cfrUYiBYPJi/O1RI="; }; buildInputs = [ zlib libdeflate isa-l ]; From 9859ef861c9fd45ad50da5bed54fae5ee645536e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 22:06:12 +0100 Subject: [PATCH 32/84] python3Packages.tailscale: 0.1.2 -> 0.1.3 --- pkgs/development/python-modules/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index a2e58322cea3..d560b5e89c2a 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-tailscale"; rev = "v${version}"; - sha256 = "1jqx2i8rghfxlb1c76f37viz9fc1vq95xb2jm3bpnx5yy4n5dly1"; + sha256 = "sha256-0qWuOSQncEldA073ByFWkpW97HY0JANSvnv8xX/NSs8="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Tailscale API"; - homepage = "https://github.com/frenck/python-wled"; + homepage = "https://github.com/frenck/python-tailscale"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 1c5f50daf3919d636475026a9100286dbcc78731 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 22:14:21 +0100 Subject: [PATCH 33/84] python3Packages.cloudsplaining: 0.4.6 -> 0.4.8 --- pkgs/development/python-modules/cloudsplaining/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index 6dbb3f91d1e8..2a5dc7efcdf8 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.6"; + version = "0.4.8"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = version; - sha256 = "sha256-TFUOsfQ1QxdpmRUJPoHMCuCpmYpQodLkP5EVXKm+qsw="; + sha256 = "sha256-t1eSPa1KqzUB2xYGkU10lVIZQ3CcIHiZZtTa0j2TUGc="; }; propagatedBuildInputs = [ From 52209dc538b144b997f8365f76d1cbf0dcc240fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 22:34:27 +0100 Subject: [PATCH 34/84] python3Packages.vehicle: 0.2.0 -> 0.2.2 --- pkgs/development/python-modules/vehicle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index b7b7fbc32738..9d5f15a3e1b1 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vehicle"; - version = "0.2.0"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "v${version}"; - sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg"; + sha256 = "sha256-3DkfS8gx3C1/Vj8+IE7uxZ5i0cKJk0mJpBWQqAgb2Xo="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client providing RDW vehicle information"; - homepage = "https://github.com/frenck/python-wled"; + homepage = "https://github.com/frenck/python-vehicle"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 8fafb2d3cf04df3d6ae5d5931cd49c07cb6747e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 22:46:24 +0100 Subject: [PATCH 35/84] python39Packages.open-meteo: init at 0.2.0 --- .../python-modules/open-meteo/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/open-meteo/default.nix diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix new file mode 100644 index 000000000000..6a7d5cfeb6e0 --- /dev/null +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -0,0 +1,60 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "open-meteo"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-open-meteo"; + rev = "v${version}"; + sha256 = "tuAuY43HRz8zFTOhsm4TxSppP4CYTGPqQndDMxW3URs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + aresponses + pydantic + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" \ + --replace 'aiohttp = "^3.8.1"' 'aiohttp = "^3.8.0"' + ''; + + pythonImportsCheck = [ + "open_meteo" + ]; + + meta = with lib; { + description = "Python client for the Open-Meteo API"; + homepage = "https://github.com/frenck/python-open-meteo"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bf6e52459c7..6fa682290567 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5359,6 +5359,8 @@ in { open-garage = callPackage ../development/python-modules/open-garage { }; + open-meteo = callPackage ../development/python-modules/open-meteo { }; + openant = callPackage ../development/python-modules/openant { }; openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { }; From ecb836f4dd22665a6cf1e3ddd7b06f26cbafff8e Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 1 Dec 2021 23:40:56 +0100 Subject: [PATCH 36/84] hydrus: 463 -> 464 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 787aace163b8..45b3c5563771 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "463"; + version = "464"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-GT5aIMskOVn4eAd4612YYA8uAQC8tuJzpEHNhc7pMuc="; + sha256 = "sha256-ZAndODbl6cH0H1rA3Bhn3AlfIuba0LjxWxusGPDYvlA="; }; nativeBuildInputs = [ From 3b2742e7bb3c262301481345288e35cbf7b4a406 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Wed, 1 Dec 2021 17:01:05 -0600 Subject: [PATCH 37/84] asmrepl: init at 1.0.2 --- pkgs/development/interpreters/asmrepl/Gemfile | 3 +++ .../interpreters/asmrepl/Gemfile.lock | 18 +++++++++++++++ .../interpreters/asmrepl/default.nix | 17 ++++++++++++++ .../interpreters/asmrepl/gemset.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 63 insertions(+) create mode 100644 pkgs/development/interpreters/asmrepl/Gemfile create mode 100644 pkgs/development/interpreters/asmrepl/Gemfile.lock create mode 100644 pkgs/development/interpreters/asmrepl/default.nix create mode 100644 pkgs/development/interpreters/asmrepl/gemset.nix diff --git a/pkgs/development/interpreters/asmrepl/Gemfile b/pkgs/development/interpreters/asmrepl/Gemfile new file mode 100644 index 000000000000..0b617ffb90b2 --- /dev/null +++ b/pkgs/development/interpreters/asmrepl/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' do + gem 'asmrepl' +end diff --git a/pkgs/development/interpreters/asmrepl/Gemfile.lock b/pkgs/development/interpreters/asmrepl/Gemfile.lock new file mode 100644 index 000000000000..f845e91b6c90 --- /dev/null +++ b/pkgs/development/interpreters/asmrepl/Gemfile.lock @@ -0,0 +1,18 @@ +GEM + specs: + +GEM + remote: https://rubygems.org/ + specs: + asmrepl (1.0.3) + fisk (~> 2) + fisk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + asmrepl! + +BUNDLED WITH + 2.2.24 diff --git a/pkgs/development/interpreters/asmrepl/default.nix b/pkgs/development/interpreters/asmrepl/default.nix new file mode 100644 index 000000000000..797e8121b428 --- /dev/null +++ b/pkgs/development/interpreters/asmrepl/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "asmrepl"; + gemdir = ./.; + exes = [ "asmrepl" ]; + + passthru.updateScript = bundlerUpdateScript "asmrepl"; + + meta = with lib; { + description = "A REPL for x86-64 assembly language"; + homepage = "https://github.com/tenderlove/asmrepl"; + license = licenses.asl20; + maintainers = with maintainers; [ legendofmiracles ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/interpreters/asmrepl/gemset.nix b/pkgs/development/interpreters/asmrepl/gemset.nix new file mode 100644 index 000000000000..a7af8d50c685 --- /dev/null +++ b/pkgs/development/interpreters/asmrepl/gemset.nix @@ -0,0 +1,23 @@ +{ + asmrepl = { + dependencies = ["fisk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10d0zvkhk3ja48vvx28hfsqfrzfl66vdpmk3gcgb5viy174c72v6"; + type = "gem"; + }; + version = "1.0.3"; + }; + fisk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mq2a7hjs9xfg514ci0xw90c33rzq1y58ywpnmhp7w767ll6wldd"; + type = "gem"; + }; + version = "2.3.0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 031e293860f2..51485de570ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1996,6 +1996,8 @@ with pkgs; asmfmt = callPackage ../development/tools/asmfmt { }; + asmrepl = callPackage ../development/interpreters/asmrepl { }; + aspcud = callPackage ../tools/misc/aspcud { }; at = callPackage ../tools/system/at { }; From b9e6351d30996e660dc5deceb5810535b21d0345 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Wed, 1 Dec 2021 17:19:48 -0600 Subject: [PATCH 38/84] maintainers: rename legendofmiracles to lom --- maintainers/maintainer-list.nix | 2 +- pkgs/applications/audio/noisetorch/default.nix | 2 +- pkgs/applications/graphics/weylus/default.nix | 2 +- pkgs/applications/misc/ArchiSteamFarm/default.nix | 2 +- pkgs/applications/misc/cfm/default.nix | 2 +- pkgs/applications/networking/tmpmail/default.nix | 2 +- pkgs/applications/video/giph/default.nix | 2 +- pkgs/applications/video/mpv/scripts/cutter.nix | 2 +- pkgs/applications/window-managers/eww/default.nix | 2 +- pkgs/development/interpreters/asmrepl/default.nix | 2 +- pkgs/development/python-modules/python-pidfile/default.nix | 2 +- pkgs/games/ddnet/default.nix | 2 +- pkgs/games/rpg-cli/default.nix | 2 +- pkgs/games/steam-tui/default.nix | 2 +- pkgs/misc/cliscord/default.nix | 2 +- pkgs/misc/present/default.nix | 2 +- pkgs/misc/wiki-tui/default.nix | 2 +- pkgs/tools/misc/keymapviz/default.nix | 2 +- pkgs/tools/misc/xcp/default.nix | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8851889ef566..6ee0585f7e61 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6580,7 +6580,7 @@ githubId = 4158274; name = "Michiel Leenaars"; }; - legendofmiracles = { + lom = { email = "legendofmiracles@protonmail.com"; matrix = "@legendofmiracles:matrix.org"; github = "legendofmiracles"; diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index b24c2eebcf7a..b18f2b52f94c 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -37,6 +37,6 @@ buildGoModule rec { homepage = "https://github.com/lawl/NoiseTorch"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ panaeon legendofmiracles ]; + maintainers = with maintainers; [ panaeon lom ]; }; } diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index f2cdfa2990e9..3c408ff5fc81 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { description = "Use your tablet as graphic tablet/touch screen on your computer"; homepage = "https://github.com/H-M-H/Weylus"; license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index bae763972d12..d88bc71348c8 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -47,6 +47,6 @@ buildDotnetModule rec { homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; platforms = dotnetCorePackages.aspnetcore_5_0.meta.platforms; - maintainers = with maintainers; [ SuperSandro2000 legendofmiracles ]; + maintainers = with maintainers; [ SuperSandro2000 lom ]; }; } diff --git a/pkgs/applications/misc/cfm/default.nix b/pkgs/applications/misc/cfm/default.nix index 50442f62b65e..4e56f376c806 100644 --- a/pkgs/applications/misc/cfm/default.nix +++ b/pkgs/applications/misc/cfm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple and fast TUI file manager with no dependencies"; license = licenses.mpl20; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; homepage = "https://github.com/willeccles/cfm"; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index 70e144cb05ca..4deada8d7b3b 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/sdushantha/tmpmail"; description = "A temporary email right from your terminal written in POSIX sh "; license = licenses.mit; - maintainers = [ maintainers.legendofmiracles ]; + maintainers = [ maintainers.lom ]; }; } diff --git a/pkgs/applications/video/giph/default.nix b/pkgs/applications/video/giph/default.nix index 431f267e4c87..3255544ff8b3 100644 --- a/pkgs/applications/video/giph/default.nix +++ b/pkgs/applications/video/giph/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/phisch/giph"; description = "Simple gif recorder"; license = licenses.mit; - maintainers = [ maintainers.legendofmiracles ]; + maintainers = [ maintainers.lom ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index a4f6255fae85..498fcb530a41 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -42,6 +42,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/rushmj/mpv-video-cutter"; # repo doesn't have a license license = licenses.unfree; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index a987c6c2e0e5..e593a95a1519 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { description = "ElKowars wacky widgets"; homepage = "https://github.com/elkowar/eww"; license = licenses.mit; - maintainers = with maintainers; [ figsoda legendofmiracles ]; + maintainers = with maintainers; [ figsoda lom ]; broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/interpreters/asmrepl/default.nix b/pkgs/development/interpreters/asmrepl/default.nix index 797e8121b428..a046a3c60175 100644 --- a/pkgs/development/interpreters/asmrepl/default.nix +++ b/pkgs/development/interpreters/asmrepl/default.nix @@ -11,7 +11,7 @@ bundlerApp { description = "A REPL for x86-64 assembly language"; homepage = "https://github.com/tenderlove/asmrepl"; license = licenses.asl20; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; platforms = platforms.x86_64; }; } diff --git a/pkgs/development/python-modules/python-pidfile/default.nix b/pkgs/development/python-modules/python-pidfile/default.nix index 7ba39341516e..6626f0b77b3c 100644 --- a/pkgs/development/python-modules/python-pidfile/default.nix +++ b/pkgs/development/python-modules/python-pidfile/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Python context manager for managing pid files"; homepage = "https://github.com/mosquito/python-pidfile"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index a922ae751e23..6eada3412b3f 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ddnet.tw"; license = licenses.asl20; - maintainers = with maintainers; [ sirseruju legendofmiracles ]; + maintainers = with maintainers; [ sirseruju lom ]; mainProgram = "DDNet"; }; } diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 23396ebf978d..8128a67ebeee 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { description = "Your filesystem as a dungeon"; homepage = "https://github.com/facundoolano/rpg-cli"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix index 968f529421d6..66e17b1752ea 100644 --- a/pkgs/games/steam-tui/default.nix +++ b/pkgs/games/steam-tui/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { description = "Rust TUI client for steamcmd"; homepage = "https://github.com/dmadisetti/steam-tui"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; # steam only supports that platform platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 7307fc607009..485a6c050417 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Simple command-line tool to send text and files to discord"; homepage = "https://github.com/somebody1234/cliscord"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; mainProgram = "cliscord"; }; } diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix index e087db6f8d2e..6eb489e1f8bd 100644 --- a/pkgs/misc/present/default.nix +++ b/pkgs/misc/present/default.nix @@ -26,6 +26,6 @@ python3Packages.buildPythonPackage rec { description = "A terminal-based presentation tool with colors and effects."; homepage = "https://github.com/vinayak-mehta/present"; license = licenses.asl20; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 13bc877ea8fc..cc483cd66ad6 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { description = "A simple and easy to use Wikipedia Text User Interface"; homepage = "https://github.com/builditluc/wiki-tui"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; mainProgram = "wiki-tui"; }; } diff --git a/pkgs/tools/misc/keymapviz/default.nix b/pkgs/tools/misc/keymapviz/default.nix index 14c56d48dfc9..c31fbd6e3256 100644 --- a/pkgs/tools/misc/keymapviz/default.nix +++ b/pkgs/tools/misc/keymapviz/default.nix @@ -17,6 +17,6 @@ python3.pkgs.buildPythonApplication rec { description = "A qmk keymap.c visualizer"; homepage = "https://github.com/yskoht/keymapviz"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix index 907e39a3f27b..4b649aecb698 100644 --- a/pkgs/tools/misc/xcp/default.nix +++ b/pkgs/tools/misc/xcp/default.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { description = "An extended cp(1)"; homepage = "https://github.com/tarka/xcp"; license = licenses.gpl3Only; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } From ee36cb7d2c90faac15a670aa867387dbe31df208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 2 Dec 2021 01:24:35 +0100 Subject: [PATCH 39/84] nss: 3.72 -> 3.73 (#148219) Update done by running the `nss` and `cacert` update scripts, then running nixpkgs-check to validate things look good enough to be thrown at hydra --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index ad212e1b1d78..4a69ad54c4e4 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -27,7 +27,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.72"; + version = "3.73"; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "bqYKn/ET5JPqKrJfQep1qfvRCveQPyb3A9rIaAcy0C4="; + sha256 = "1rfqjq02rfv0ycdmvic51pi093rg33zb8kpqkvddf44vv9l3lvan"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 5b0af75786ec92a997c8db73b2492a429cb2f587 Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Wed, 1 Dec 2021 20:21:40 -0300 Subject: [PATCH 40/84] materia-theme: 20200916 -> 20210322 --- pkgs/data/themes/materia-theme/default.nix | 23 +++++++--------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index f9e3463f2fdc..da79f68638b9 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -11,30 +12,20 @@ stdenv.mkDerivation rec { pname = "materia-theme"; - version = "20200916"; + version = "20210322"; src = fetchFromGitHub { owner = "nana-4"; repo = pname; rev = "v${version}"; - sha256 = "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74"; + sha256 = "1fsicmcni70jkl4jb3fvh7yv0v9jhb8nwjzdq8vfwn256qyk0xvl"; }; - nativeBuildInputs = [ - meson - ninja - sassc - ]; + nativeBuildInputs = [ meson ninja sassc ]; - buildInputs = [ - gnome.gnome-themes-extra - gdk-pixbuf - librsvg - ]; + buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontBuild = true; From 1526faf075bdb52ece4fd5c259c54c66d1fcf003 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Wed, 1 Dec 2021 16:22:44 +0000 Subject: [PATCH 41/84] julia_17-bin: init at 1.7.0 https://github.com/JuliaLang/julia/blob/v1.7.0/NEWS.md --- pkgs/development/compilers/julia/1.7-bin.nix | 71 +++++++++++++++++++ ...able-parallel-unit-tests-for-sandbox.patch | 30 ++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/julia/1.7-bin.nix create mode 100644 pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch diff --git a/pkgs/development/compilers/julia/1.7-bin.nix b/pkgs/development/compilers/julia/1.7-bin.nix new file mode 100644 index 000000000000..99677636b282 --- /dev/null +++ b/pkgs/development/compilers/julia/1.7-bin.nix @@ -0,0 +1,71 @@ +{ autoPatchelfHook, fetchurl, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "julia-bin"; + version = "1.7.0"; + + src = { + x86_64-linux = fetchurl { + url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; + sha256 = "0h0d9kfg00vglg2qmcx0k8c2gzn445i0xbsfw6wy1idf72kg76bj"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + # Julia’s source files are in different locations for source and binary + # releases. Thus we temporarily create a symlink to allow us to share patches + # with source releases. + prePatch = '' + ln -s share/julia/test + ''; + patches = [ + # Source release Nix patch(es) relevant for binary releases as well. + ./patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch + ]; + postPatch = '' + # Revert symlink hack. + rm test + + # Julia fails to pick up our Certification Authority root certificates, but + # it provides its own so we can simply disable the test. Patching in the + # dynamic path to ours require us to rebuild the Julia system image. + substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \ + --replace '@test ca_roots_path() != bundled_ca_roots()' \ + '@test_skip ca_roots_path() != bundled_ca_roots()' + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + cp -r . $out + runHook postInstall + ''; + + # Breaks backtraces, etc. + dontStrip = true; + + doInstallCheck = true; + preInstallCheck = '' + # Some tests require read/write access to $HOME. + export HOME="$TMPDIR" + ''; + installCheckPhase = '' + runHook preInstallCheck + # Command lifted from `test/Makefile`. + $out/bin/julia \ + --check-bounds=yes \ + --startup-file=no \ + --depwarn=error \ + $out/share/julia/test/runtests.jl + runHook postInstallCheck + ''; + + meta = { + description = "High-level, high-performance dynamic language for technical computing."; + homepage = "https://julialang.org"; + # Bundled and linked with various GPL code, although Julia itself is MIT. + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ninjin raskin ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch new file mode 100644 index 000000000000..243a9cfd76ae --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch @@ -0,0 +1,30 @@ +From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Thu, 8 Apr 2021 04:37:44 +0000 +Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox + +Disabled by default due to lack of networking in the Nix sandbox. This +greatly speeds up the build process on a multi-core system. +--- + test/runtests.jl | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test/runtests.jl b/test/runtests.jl +index 2f9cd058bb..2f8c19fa32 100644 +--- a/test/runtests.jl ++++ b/test/runtests.jl +@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) + import LinearAlgebra + cd(@__DIR__) do + n = 1 +- if net_on +- n = min(Sys.CPU_THREADS, length(tests)) ++ if net_on || haskey(ENV, "NIX_BUILD_CORES") ++ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS ++ n = min(x, Sys.CPU_THREADS, length(tests)) + n > 1 && addprocs_with_testenv(n) + LinearAlgebra.BLAS.set_num_threads(1) + end +-- +2.29.3 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 031e293860f2..18d29b659ca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12440,9 +12440,10 @@ with pkgs; julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { }; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; + julia_17-bin = callPackage ../development/compilers/julia/1.7-bin.nix { }; julia-lts-bin = julia_10-bin; - julia-stable-bin = julia_16-bin; + julia-stable-bin = julia_17-bin; julia-bin = julia-stable-bin; jwasm = callPackage ../development/compilers/jwasm { }; From 36afb5849371a1898dc605b0905f4d351cee4b39 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Wed, 1 Dec 2021 17:11:15 +0000 Subject: [PATCH 42/84] julia_10-bin and julia_16-bin: update LTS alias In line with the upstream announcement: https://discourse.julialang.org/t/julia-v1-7-0-has-been-released-and-v1-6-is-now-lts/72336 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18d29b659ca1..5c05c1688975 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12442,7 +12442,7 @@ with pkgs; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; julia_17-bin = callPackage ../development/compilers/julia/1.7-bin.nix { }; - julia-lts-bin = julia_10-bin; + julia-lts-bin = julia_16-bin; julia-stable-bin = julia_17-bin; julia-bin = julia-stable-bin; From 6e176f712be1dd51c2c53528f4ee1b3efb6ac222 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Wed, 1 Dec 2021 17:22:02 +0000 Subject: [PATCH 43/84] julia_10-bin: deprecate No longer supported upstream: https://discourse.julialang.org/t/julia-v1-7-0-has-been-released-and-v1-6-is-now-lts/72336 --- pkgs/development/compilers/julia/1.0-bin.nix | 80 ----------------- ...ip-tests-that-require-network-access.patch | 87 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 pkgs/development/compilers/julia/1.0-bin.nix delete mode 100644 pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch diff --git a/pkgs/development/compilers/julia/1.0-bin.nix b/pkgs/development/compilers/julia/1.0-bin.nix deleted file mode 100644 index dfda8da9e4de..000000000000 --- a/pkgs/development/compilers/julia/1.0-bin.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ autoPatchelfHook, fetchurl, lib, makeWrapper, openssl, stdenv }: - -stdenv.mkDerivation rec { - pname = "julia-bin"; - version = "1.0.5"; - - src = { - x86_64-linux = fetchurl { - url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "00vbszpjmz47nqy19v83xa463ajhzwanjyg5mvcfp9kvfw9xdvcx"; - }; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - # Julia’s source files are in different locations for source and binary - # releases. Thus we temporarily create symlinks to allow us to share patches - # with source releases. - prePatch = '' - ln -s share/julia/stdlib/v${lib.versions.majorMinor version} stdlib - ln -s share/julia/test - ''; - patches = [ - # Source release Nix patch(es) relevant for binary releases as well. - ./patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch - ]; - postPatch = '' - # Revert symlink hack. - rm stdlib test - ''; - - buildInputs = [ makeWrapper ]; - nativeBuildInputs = [ autoPatchelfHook ]; - - installPhase = '' - runHook preInstall - cp -r . $out - # Setting `LD_LIBRARY_PATH` resolves `Libdl` failures. Not sure why this is - # only necessary on v1.0.x and a cleaner solution is welcome, but after - # staring at `strace` for a few hours this is as clean as I could make it. - wrapProgram $out/bin/julia \ - --suffix LD_LIBRARY_PATH : $out/lib - runHook postInstall - ''; - - # Breaks backtraces, etc. - dontStrip = true; - - doInstallCheck = true; - installCheckInputs = [ openssl ]; - preInstallCheck = '' - # Some tests require read/write access to $HOME. - export HOME="$TMPDIR" - ''; - installCheckPhase = '' - runHook preInstallCheck - # Command lifted from `test/Makefile`. - $out/bin/julia \ - --check-bounds=yes \ - --startup-file=no \ - --depwarn=error \ - $out/share/julia/test/runtests.jl - runHook postInstallCheck - ''; - - meta = { - description = "High-level, high-performance dynamic language for technical computing"; - homepage = "https://julialang.org"; - # Bundled and linked with various GPL code, although Julia itself is MIT. - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ninjin raskin ]; - platforms = [ "x86_64-linux" ]; - knownVulnerabilities = [ - # Built with libgit2 v0.27.2: - # https://github.com/JuliaLang/julia/blob/e0837d1e64a9e4d17534a9f981e9a2a3f221356f/deps/libgit2.version - # https://nvd.nist.gov/vuln/detail/CVE-2020-12278 - "CVE-2020-12278" - # https://nvd.nist.gov/vuln/detail/CVE-2020-12279 - "CVE-2020-12279" - ]; - }; -} diff --git a/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch b/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch deleted file mode 100644 index 0de1f7c010d3..000000000000 --- a/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 4954b99efae367da49412edd31a7bd832ec62c69 Mon Sep 17 00:00:00 2001 -From: Pontus Stenetorp -Date: Mon, 15 Mar 2021 05:55:18 +0000 -Subject: [PATCH 2/3] nix: Skip tests that require network access - -Necessary as the Nix build sandbox does not permit network access. ---- - stdlib/Sockets/test/runtests.jl | 40 ++++++++++++++++----------------- - test/file.jl | 4 ++-- - 2 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/stdlib/Sockets/test/runtests.jl b/stdlib/Sockets/test/runtests.jl -index 6145f87616..9cc7a001e5 100644 ---- a/stdlib/Sockets/test/runtests.jl -+++ b/stdlib/Sockets/test/runtests.jl -@@ -151,33 +151,33 @@ defaultport = rand(2000:4000) - end - - @testset "getnameinfo on some unroutable IP addresses (RFC 5737)" begin -- @test getnameinfo(ip"192.0.2.1") == "192.0.2.1" -- @test getnameinfo(ip"198.51.100.1") == "198.51.100.1" -- @test getnameinfo(ip"203.0.113.1") == "203.0.113.1" -- @test getnameinfo(ip"0.1.1.1") == "0.1.1.1" -- @test getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" -- @test getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" -- @test getnameinfo(ip"2001:db8::1") == "2001:db8::1" -+ @test_skip getnameinfo(ip"192.0.2.1") == "192.0.2.1" -+ @test_skip getnameinfo(ip"198.51.100.1") == "198.51.100.1" -+ @test_skip getnameinfo(ip"203.0.113.1") == "203.0.113.1" -+ @test_skip getnameinfo(ip"0.1.1.1") == "0.1.1.1" -+ @test_skip getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" -+ @test_skip getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" -+ @test_skip getnameinfo(ip"2001:db8::1") == "2001:db8::1" - end - - @testset "getnameinfo on some valid IP addresses" begin - @test !isempty(getnameinfo(ip"::")::String) -- @test !isempty(getnameinfo(ip"0.0.0.0")::String) -- @test !isempty(getnameinfo(ip"10.1.0.0")::String) -- @test !isempty(getnameinfo(ip"10.1.0.255")::String) -- @test !isempty(getnameinfo(ip"10.1.255.1")::String) -- @test !isempty(getnameinfo(ip"255.255.255.255")::String) -- @test !isempty(getnameinfo(ip"255.255.255.0")::String) -- @test !isempty(getnameinfo(ip"192.168.0.1")::String) -- @test !isempty(getnameinfo(ip"::1")::String) -+ @test_skip !isempty(getnameinfo(ip"0.0.0.0")::String) -+ @test_skip !isempty(getnameinfo(ip"10.1.0.0")::String) -+ @test_skip !isempty(getnameinfo(ip"10.1.0.255")::String) -+ @test_skip !isempty(getnameinfo(ip"10.1.255.1")::String) -+ @test_skip !isempty(getnameinfo(ip"255.255.255.255")::String) -+ @test_skip !isempty(getnameinfo(ip"255.255.255.0")::String) -+ @test_skip !isempty(getnameinfo(ip"192.168.0.1")::String) -+ @test_skip !isempty(getnameinfo(ip"::1")::String) - end - - @testset "getaddrinfo" begin -- let localhost = getnameinfo(ip"127.0.0.1")::String -- @test !isempty(localhost) && localhost != "127.0.0.1" -- @test !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) -- @test getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" -- @test try -+ let localhost = getnameinfo(ip"::")::String -+ @test_skip !isempty(localhost) && localhost != "127.0.0.1" -+ @test_skip !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) -+ @test_skip getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" -+ @test_skip try - getaddrinfo(localhost, IPv6)::IPv6 != ip"::" - catch ex - isa(ex, Sockets.DNSError) && ex.code == Base.UV_EAI_NONAME && ex.host == localhost -diff --git a/test/file.jl b/test/file.jl -index e86476f975..579276f82c 100644 ---- a/test/file.jl -+++ b/test/file.jl -@@ -874,8 +874,8 @@ if !Sys.iswindows() || (Sys.windows_version() >= Sys.WINDOWS_VISTA_VER) - else - @test_throws ErrorException symlink(file, "ba\0d") - end --@test_throws ArgumentError download("good", "ba\0d") --@test_throws ArgumentError download("ba\0d", "good") -+@test_skip @test_throws ArgumentError download("good", "ba\0d") -+@test_skip @test_throws ArgumentError download("ba\0d", "good") - - ################### - # walkdir # --- -2.29.3 - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7e89081aef3c..a6518b062b8b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -394,6 +394,7 @@ mapAliases ({ julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13 julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15 julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13 + julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # added 2021-12-02 kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 kdiff3-qt5 = kdiff3; # added 2017-02-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c05c1688975..2e64257eb62c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12438,7 +12438,6 @@ with pkgs; julia-stable = julia_15; julia = julia-stable; - julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { }; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; julia_17-bin = callPackage ../development/compilers/julia/1.7-bin.nix { }; From 6cbd21cb02170f8f53fd5c8410a62af1fab2b46f Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Thu, 2 Dec 2021 01:08:09 +0000 Subject: [PATCH 44/84] julia_16-bin and julia_17-bin: punctuation fixes Thank you @7c6f434c for spotting these. --- pkgs/development/compilers/julia/1.6-bin.nix | 2 +- pkgs/development/compilers/julia/1.7-bin.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix index 5743681ae7f0..abd2235189e7 100644 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "High-level, high-performance dynamic language for technical computing."; + description = "High-level, high-performance, dynamic language for technical computing"; homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; diff --git a/pkgs/development/compilers/julia/1.7-bin.nix b/pkgs/development/compilers/julia/1.7-bin.nix index 99677636b282..0743fe3fdd72 100644 --- a/pkgs/development/compilers/julia/1.7-bin.nix +++ b/pkgs/development/compilers/julia/1.7-bin.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "High-level, high-performance dynamic language for technical computing."; + description = "High-level, high-performance, dynamic language for technical computing"; homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; From e57ef4569e04e2db61a2f1057491dae52079b338 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 1 Dec 2021 16:17:44 -0800 Subject: [PATCH 45/84] starship: build with notification support --- pkgs/tools/misc/starship/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 47a81989cde6..753a25eb3561 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -25,6 +25,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildFeatures = lib.optional (!stdenv.isDarwin) "notify-rust"; + postInstall = '' for shell in bash fish zsh; do STARSHIP_CACHE=$TMPDIR $out/bin/starship completions $shell > starship.$shell From d86329b7cd29d1fb6c261d6a022a4de9dacc942d Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Wed, 1 Dec 2021 23:43:22 -0300 Subject: [PATCH 46/84] flat-remix-gtk: 20201129 -> 20211130 --- pkgs/data/themes/flat-remix-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index afdf478fea03..722c3cbc41e5 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20201129"; + version = "20211130"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-lAlHRVB/P3A1qWsXQZPZ3uhgctR4FLa+ocUrsbleXJU="; + sha256 = "0n6djx346bzk558yd9nk0r6hqszcbkj0h1pv2n8n15ps2j9lyvw8"; }; dontBuild = true; From 8db9c46d69ac92675a9b675e41193d6376265b7e Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Wed, 1 Dec 2021 22:25:09 -0500 Subject: [PATCH 47/84] python3Packages.rdkit: fix on aarch64-darwin --- pkgs/development/python-modules/rdkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 97f2e5a6afc2..1ec7301dabd1 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -4,7 +4,7 @@ , fetchzip , cmake , boost -, catch +, catch2 , inchi , cairo , eigen @@ -75,7 +75,7 @@ buildPythonPackage rec { buildInputs = [ boost - catch + catch2 inchi eigen cairo @@ -107,7 +107,7 @@ buildPythonPackage rec { ''; cmakeFlags = [ - "-DCATCH_DIR=${catch}/include/catch" + "-DCATCH_DIR=${catch2}/include/catch2" "-DINCHI_LIBRARY=${inchi}/lib/libinchi.so" "-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so" "-DINCHI_INCLUDE_DIR=${inchi}/include/inchi" From bf8af0b8d454d6ec9609a3295cc8e26ffbf671c7 Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Thu, 2 Dec 2021 00:56:08 -0300 Subject: [PATCH 48/84] pop-gtk-theme: 2020-06-30 -> 2021-08-19 --- pkgs/data/themes/pop-gtk/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index ec17be3261d8..022e1dd81b2f 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2020-06-30"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "8c31be9f9257375bf7a049069cb4ecbac7d281a1"; - sha256 = "16dxxazpllcxlbiblynqq4b65wfn9k1jab8dl69l819v73z303ky"; + rev = "6615e4510485c5dc0b379746acc40f538d987c86"; + sha256 = "16h03x2m4j4hfwp7pdmw1navcy5q7di38jvigfgf263wajyxbznr"; }; nativeBuildInputs = [ From b952a9b16ee8a8b6c45d16d84aa298717624e34f Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Wed, 1 Dec 2021 22:04:14 -0600 Subject: [PATCH 49/84] adopt multiple packages --- pkgs/applications/science/astronomy/celestia/default.nix | 1 + pkgs/development/libraries/boost/generic.nix | 1 + .../development/libraries/science/astronomy/cfitsio/default.nix | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 6b76c2de4b05..3f21987661cf 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { description = "Real-time 3D simulation of space"; changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ hjones2199 ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index fdc8f7c21f18..6358df1a555c 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -137,6 +137,7 @@ stdenv.mkDerivation { badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" ++ optionals (versionOlder version "1.73") lib.platforms.riscv; + maintainers = with maintainers; [ hjones2199 ]; }; preConfigure = optionalString useMpi '' diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index e38c384009c9..9f9545e52f3b 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; license = licenses.mit; - maintainers = [ maintainers.xbreak ]; + maintainers = with maintainers; [ xbreak hjones2199 ]; platforms = with platforms; linux ++ darwin; }; } From 552f9ca7652861e6dcc6ab2c0ba80d3c68bdab1e Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Thu, 2 Dec 2021 01:24:12 -0300 Subject: [PATCH 50/84] flat-remix-icon-theme: 20200710 -> 20211106 --- pkgs/data/icons/flat-remix-icon-theme/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index 743bcba54de2..69e18beec32d 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; - version = "20200710"; + version = "20211106"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; rev = version; - sha256 = "0rlrmgimvs9rrj64g5jn04jgyi7wmn2dnsk7ckmxk6p8cdfjd0hx"; + sha256 = "1dlz88bg764zzd0s3yqci4m1awhwdrrql9l9plsjjzgdx9r7ndmf"; }; nativeBuildInputs = [ From 559edc03590da7bf77bfa262a111cf0834473aa7 Mon Sep 17 00:00:00 2001 From: Devin Singh Date: Wed, 1 Dec 2021 17:43:01 -0600 Subject: [PATCH 51/84] bunnyfetch: unstable-2021-06-19 -> 0.2.0 --- pkgs/tools/misc/bunnyfetch/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix index e2b99da82db0..d03fea2cefd2 100644 --- a/pkgs/tools/misc/bunnyfetch/default.nix +++ b/pkgs/tools/misc/bunnyfetch/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bunnyfetch"; - version = "unstable-2021-06-19"; + version = "0.2.0"; src = fetchFromGitHub { owner = "Rosettea"; repo = "bunnyfetch"; - rev = "24370338b936bae1ebdefea73e8372ac0b4d2858"; - sha256 = "09wcffx6ak4djm2lrxq43n27p9qmczng4rf11qpwx3w4w67jvpz9"; + rev = "v${version}"; + sha256 = "sha256-6MnjCXc9/8twdf8PHKsVJY1yWYwUf5R01vtQFJbyy7M="; }; - vendorSha256 = "1vv69y0x06kn99lw995sbkb7vgd0yb18flkr2ml8ss7q2yvz37vi"; + vendorSha256 = "sha256-w+O1dU8t7uNvdlFnYhCdJCDixpWWZAnj9GrtsCbu9SM="; # No upstream tests doCheck = false; From 9487f3aeba776f7f28b1befd6c0f5a17982cc531 Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Thu, 2 Dec 2021 02:40:11 -0300 Subject: [PATCH 52/84] pop-icon-theme: 2020-03-04 -> 2021-11-17 --- pkgs/data/icons/pop-icon-theme/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index 1bcfab57b4a9..3f980539a110 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -11,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pop-icon-theme"; - version = "2020-03-04"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "pop-os"; repo = "icon-theme"; - rev = "11f18cb48455b47b6535018f1968777100471be1"; - sha256 = "1s4pjwv2ynw400gnzgzczlxzw3gxh5s8cxxbi9zpxq4wzjg6jqyv"; + rev = "9998b20b78f3ff65ecbf2253bb863d1e669abe74"; + sha256 = "0lwdmaxs9xj4bm21ldh64bzyb6iz5d5k1256iwvyjp725l7686cl"; }; nativeBuildInputs = [ From 41304a957cf8bf38c3f0ecfc356b1abfd1448e85 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Thu, 2 Dec 2021 06:45:46 +0100 Subject: [PATCH 53/84] lldpd: 1.0.11 -> 1.0.13 Also update the homepage. --- pkgs/tools/networking/lldpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index a4e5d565756b..29ca9961546a 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.11"; + version = "1.0.13"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-tR0VcA+678t/uFw1BrSdMxc6DxXXAPkz7wRAZ7QtRuQ="; + sha256 = "sha256-1jmCf9iidyDRv9lLxS7KJK9j3cw8nS2mB4h3iInYRwE="; }; configureFlags = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"; - homepage = "https://vincentbernat.github.io/lldpd/"; + homepage = "https://lldpd.github.io/"; license = licenses.isc; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; From cf6fc1fd1734373a5dc9dc6c223caaaad2a8592e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 2 Dec 2021 01:26:52 +0300 Subject: [PATCH 54/84] =?UTF-8?q?podman-compose:=202021-05-18=20=E2=86=92?= =?UTF-8?q?=200.1.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualization/podman-compose/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index 2a6d2a20c44e..c18790c1b887 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,19 +1,15 @@ { lib, buildPythonApplication, fetchFromGitHub, pyyaml }: buildPythonApplication rec { - version = "0.2.0pre-2021-05-18"; + version = "0.1.8"; pname = "podman-compose"; # "This project is still under development." -- README.md - # - # As of May 2021, the latest release (0.1.5) has fewer than half of all - # commits. This project seems to have no release management, so the last - # commit is the best one until proven otherwise. src = fetchFromGitHub { repo = "podman-compose"; owner = "containers"; - rev = "62d2024feecf312e9591cc145f49cee9c70ab4fe"; - sha256 = "17992imkvi6129wvajsp0iz5iicfmh53i20qy2mzz17kcz30r2pp"; + rev = version; + sha256 = "sha256-BN6rG46ejYY6UCNjKYQpxPQGTW3x12zpGDnH2SKn304="; }; propagatedBuildInputs = [ pyyaml ]; @@ -21,7 +17,7 @@ buildPythonApplication rec { meta = { description = "An implementation of docker-compose with podman backend"; homepage = "https://github.com/containers/podman-compose"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; }; From 932ab304f0b8e3241c1311b9b731d3d330291715 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Thu, 2 Dec 2021 10:27:29 +0800 Subject: [PATCH 55/84] emacsPackages.orgPackages: deprecated org elpa is deprecated and moved into gnu elpa and nongnu elpa. link: nix-community/emacs-overlay#191 --- .../from_md/release-notes/rl-2205.section.xml | 13 +++++++- .../manual/release-notes/rl-2205.section.md | 5 +++ .../emacs/elisp-packages/org-packages.nix | 33 ------------------- .../emacs/elisp-packages/update-from-overlay | 4 --- .../editors/emacs/elisp-packages/update-org | 4 --- pkgs/top-level/emacs-packages.nix | 6 ---- 6 files changed, 17 insertions(+), 48 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/org-packages.nix delete mode 100755 pkgs/applications/editors/emacs/elisp-packages/update-org diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index baefa0d369e5..4752cad6c7b0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -24,7 +24,7 @@
Backward Incompatibilities - + pkgs.ghc now refers to @@ -46,6 +46,17 @@ haskellPackages.callPackage). + + + pkgs.emacsPackages.orgPackages is removed + because org elpa is deprecated. The packages in the top level + of pkgs.emacsPackages, such as org and + org-contrib, refer to the ones in + pkgs.emacsPackages.elpaPackages and + pkgs.emacsPackages.nongnuPackages where the + new versions will release. + +
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a66e29bdb5f8..b0526a1fb3b4 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -22,4 +22,9 @@ In addition to numerous new and upgraded packages, this release has the followin instead to ensure cross compilation keeps working (or switch to `haskellPackages.callPackage`). +* `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated. + The packages in the top level of `pkgs.emacsPackages`, such as org and + org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and + `pkgs.emacsPackages.nongnuPackages` where the new versions will release. + ## Other Notable Changes {#sec-release-22.05-notable-changes} diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix deleted file mode 100644 index 12680336e0e8..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* - -# Updating - -To update the list of packages from Org (ELPA), - -1. Run `./update-org`. -2. Check for evaluation errors: - env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages -3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` - -*/ - -{ lib }: - -self: let - - generateOrg = lib.makeOverridable ({ - generated ? ./org-generated.nix - }: let - - imported = import generated { - inherit (self) callPackage; - }; - - super = imported; - - overrides = { - }; - - in super // overrides); - -in generateOrg { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 41cde07a211c..052364c803c1 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -11,10 +11,6 @@ curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/ nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix -curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix -nix-instantiate ../../../../../ -A emacs.pkgs.orgPackages --show-trace -git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix - curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-org b/pkgs/applications/editors/emacs/elisp-packages/update-org deleted file mode 100755 index 2119a1672287..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/update-org +++ /dev/null @@ -1,4 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell --show-trace ./emacs2nix.nix -i bash - -exec org-packages.sh --names $EMACS2NIX/names.nix -o org-generated.nix diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ba1ed113ab60..0ac3ae8b4339 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -45,10 +45,6 @@ let inherit lib pkgs; }; - mkOrgPackages = { lib }: import ../applications/editors/emacs/elisp-packages/org-packages.nix { - inherit lib; - }; - mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/manual-packages.nix { inherit lib pkgs; }; @@ -66,14 +62,12 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ , nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self - , orgPackages ? mkOrgPackages { inherit lib; } self , manualPackages ? mkManualPackages { inherit pkgs lib; } self }: ({} // elpaPackages // { inherit elpaPackages; } // nongnuPackages // { inherit nongnuPackages; } // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } - // orgPackages // { inherit orgPackages; } // manualPackages // { inherit manualPackages; } // { From 089fdb8dfaa3070b37c66fcf5b1445f343255a05 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 2 Dec 2021 09:28:23 +0100 Subject: [PATCH 56/84] libbpf: 0.5.0 -> 0.6.0 Signed-off-by: Sascha Grunert --- pkgs/os-specific/linux/libbpf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index f2ebcbdcc1cf..5debfd2ef2c8 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -7,13 +7,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-L23Ba+slJW/ALj8AepwByrrHgYMY5/Jh+AoD0p4qryI="; + sha256 = "sha256-p9wUDC7r6+ElbheNkTkZW4eMNAvPbvpUyQjTjCE34ck="; }; nativeBuildInputs = [ pkg-config ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Upstream mirror of libbpf"; homepage = "https://github.com/libbpf/libbpf"; license = with licenses; [ lgpl21 /* or */ bsd2 ]; - maintainers = with maintainers; [ thoughtpolice vcunat ]; + maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert ]; platforms = platforms.linux; }; } From 82470faf7dab753c113ccdb76abb5b8a1159a526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Dec 2021 09:45:28 +0100 Subject: [PATCH 57/84] nixpkgs-review: 2.6.3 -> 2.6.4 --- pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index ea2b565be27e..d21c9b3c568f 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "sha256-DzqttjYkCSgsHjF1YN93zioGpTGDm9H0F8JzKmHPHro="; + sha256 = "sha256-6vKMaCTilPXd8K3AuLqtYInVyyFhdun0o9cX1WRMmWo="; }; makeWrapperArgs = [ From 56ea0c9308e084acdf59b46721619cc847ae8b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Dec 2021 09:54:49 +0100 Subject: [PATCH 58/84] qemu: fix darwin build --- pkgs/applications/virtualization/qemu/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b4a31c657cdc..5c22b1649239 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -228,8 +228,7 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' - cp -- $emitKvmWarningsPath $out/libexec/emit-kvm-warnings - chmod a+x -- $out/libexec/emit-kvm-warnings + install -m755 -D $emitKvmWarningsPath $out/libexec/emit-kvm-warnings if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ $out/bin/qemu-kvm \ From 28731a2d43e7771259a3ba63a8afbe8b2a43ceb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 22 Nov 2021 14:56:55 +0100 Subject: [PATCH 59/84] csvdiff: Init at 1.4.0 --- pkgs/tools/text/csvdiff/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/text/csvdiff/default.nix diff --git a/pkgs/tools/text/csvdiff/default.nix b/pkgs/tools/text/csvdiff/default.nix new file mode 100644 index 000000000000..f85d725d6ca4 --- /dev/null +++ b/pkgs/tools/text/csvdiff/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "csvdiff"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "aswinkarthik"; + repo = "csvdiff"; + rev = "v${version}"; + sha256 = "0cd1ikxsypjqisfnmr7zix3g7x8p892w77086465chyd39gpk97b"; + }; + + vendorSha256 = "1612s4kc0r8zw5y2n6agwdx9kwhxkdrjzagn4g22lzmjq02a64xf"; + + meta = with lib; { + homepage = "https://aswinkarthik.github.io/csvdiff/"; + description = "A fast diff tool for comparing csv files"; + license = licenses.mit; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e64257eb62c..dc81aeb9e789 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2632,6 +2632,8 @@ with pkgs; csv2odf = callPackage ../applications/office/csv2odf { }; + csvdiff = callPackage ../tools/text/csvdiff { }; + csview = callPackage ../tools/text/csview { }; csvkit = callPackage ../tools/text/csvkit { }; From ba798538d076f5dea9e5f8bafdec0384fef9b1d6 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Thu, 2 Dec 2021 10:36:16 +0100 Subject: [PATCH 60/84] terraform-providers.dhall: init at 0.0.1 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 03d2797fe391..012cd1e1caec 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -268,6 +268,15 @@ "vendorSha256": null, "version": "2.16.0" }, + "dhall": { + "owner": "awakesecurity", + "provider-source-address": "registry.terraform.io/awakesecurity/dhall", + "repo": "terraform-provider-dhall", + "rev": "v0.0.1", + "sha256": "1cymabpa03a5avf0j6jj2mpnc62ap9b82zmpsgzwdjrb3mf954fa", + "vendorSha256": "0m11cpis171j9aicw0c66y4m1ckg41gjknj86qvblh57ai96gc1n", + "version": "0.0.1" + }, "dme": { "owner": "terraform-providers", "repo": "terraform-provider-dme", From f524d70519b45e79c4bcee5055e6f5710f783779 Mon Sep 17 00:00:00 2001 From: Anund Date: Thu, 2 Dec 2021 20:26:44 +1100 Subject: [PATCH 61/84] mcomix: fix invalid .desktop icon name The postInstall step for this package copies an icon to the hicolor icon theme under the name mcomix3.png (${pname}). The applications mcomix.desktop references the icon by Icon=mcomix. The means the copied icon ends up with the "wrong" filename making lookup following the xdg standard break. This change updates the icon reference in the .desktop file to match what is currently being installed. --- pkgs/applications/graphics/mcomix3/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix index db777b3bd77d..30a056738975 100644 --- a/pkgs/applications/graphics/mcomix3/default.nix +++ b/pkgs/applications/graphics/mcomix3/default.nix @@ -47,7 +47,8 @@ python3.pkgs.buildPythonApplication rec { runHook preInstall substituteInPlace mime/*.desktop \ - --replace "Exec=mcomix" "Exec=mcomix3" + --replace "Exec=mcomix" "Exec=mcomix3" \ + --replace "Icon=mcomix" "Icon=${pname}" ${python3.executable} installer.py --srcdir=mcomix --target=$libdir mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname} mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb From 2d024825827bfb95576938b01bc7f7a4bfd5f330 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 2 Dec 2021 11:28:15 +0100 Subject: [PATCH 62/84] clipman: 1.6.0 -> 1.6.1 ChangeLog: https://github.com/yory8/clipman/releases/tag/v1.6.1 --- pkgs/tools/wayland/clipman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/tools/wayland/clipman/default.nix index d5ed6ae88ffe..3c974f4cb779 100644 --- a/pkgs/tools/wayland/clipman/default.nix +++ b/pkgs/tools/wayland/clipman/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clipman"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yq71nYNL3bFvwhVzrQ1g8n7/4tMmLuYUJ9pMBmxL8e8="; + sha256 = "sha256-aZvtgeaS3xxl5/A/Pwlbu0sI7bw2MONbEIK42IDcMy0="; }; vendorSha256 = "sha256-Z/sVCJz/igPDdeczC6pemLub6X6z4ZGlBwBmRsEnXKI="; From e5690827b5b6fc5aef4c8e135653ff507412b2d8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 2 Dec 2021 05:32:04 -0500 Subject: [PATCH 63/84] python3Packages.pyarrow: fix darwin build for when a build flag is false MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nix-repl> with import {}; stdenv.mkDerivation { name="test"; true = true; false = false; } «derivation /nix/store/2xk4hhfnaqymwq0iw9hxi5a34a8dbywz-test.drv» nix show-derivation /nix/store/2xk4hhfnaqymwq0iw9hxi5a34a8dbywz-test.drv | grep -E '(true|false)' "false": "", "true": "1" File "setup.py", line 77, in strtobool raise ValueError("invalid truth value %r" % (val,)) ValueError: invalid truth value '' --- pkgs/development/python-modules/pyarrow/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 9c74f0a5ea6a..c47cdaa02b70 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: let + zero_or_one = cond: if cond then 1 else 0; + _arrow-cpp = arrow-cpp.override { python3 = python; }; in @@ -18,9 +20,9 @@ buildPythonPackage rec { PYARROW_BUILD_TYPE = "release"; - PYARROW_WITH_DATASET = true; - PYARROW_WITH_FLIGHT = _arrow-cpp.enableFlight; - PYARROW_WITH_PARQUET = true; + PYARROW_WITH_DATASET = zero_or_one true; + PYARROW_WITH_FLIGHT = zero_or_one _arrow-cpp.enableFlight; + PYARROW_WITH_PARQUET = zero_or_one true; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" From 38f9e483a5b60452c29d9ffc5272b6130184e414 Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 2 Dec 2021 09:24:30 +0200 Subject: [PATCH 64/84] zerotierone: 1.8.3 -> 1.8.4 --- pkgs/tools/networking/zerotierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 94cd645d177c..3062befe2d3b 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-668KZ2E0jx/s+w4pl+oJbPlfdRGr6ypP2/FoFEBReIk="; + sha256 = "sha256-aM0FkcrSd5dEJVdJryIGuyWNFwvKH0SBfOuy4dIMK4A="; }; preConfigure = '' From 5dd8c34e3b96bae34c5ab93323e4b7968a277d85 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:05:36 +1000 Subject: [PATCH 65/84] terraform-providers.github: 4.18.0 -> 4.18.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 012cd1e1caec..b4d4df030f90 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -380,10 +380,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.18.0", - "sha256": "0vr7vxlpq1lbp85qm2084w7mqkz5yp7gxj5ln29plhm7xjpd87bp", + "rev": "v4.18.2", + "sha256": "1m4ddj4bm84ljrkg8i98gdgbf5c89chv3yz13xbmyl2iga2x5bf7", "vendorSha256": null, - "version": "4.18.0" + "version": "4.18.2" }, "gitlab": { "owner": "gitlabhq", From d5a8b6e06353f72007d68176d4d23ab1c49e50f0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:06:02 +1000 Subject: [PATCH 66/84] terraform-providers.kubernetes: 2.6.1 -> 2.7.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b4d4df030f90..e482caa69779 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -581,10 +581,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.6.1", - "sha256": "164x0ddgqk3bj0za4h9kz69npgr4cw7w5hnl0pmxsgvsb04vwc0g", + "rev": "v2.7.0", + "sha256": "07rqk60k87dff2wgg72ar7sdg99hd210k8afvvz9xh1arj63ixxi", "vendorSha256": null, - "version": "2.6.1" + "version": "2.7.0" }, "launchdarkly": { "owner": "terraform-providers", From d871541f064d33666e23d8128a01c066b45e5837 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:06:23 +1000 Subject: [PATCH 67/84] terraform-providers.nomad: 1.4.15 -> 1.4.16 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e482caa69779..8594dd98224c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -708,10 +708,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", - "rev": "v1.4.15", - "sha256": "18rrvp7h27f51di8hajl2jb53v7wadqv4241rxdx1d180fas69k1", - "vendorSha256": "1y5wpilnqn17zbi88z23159gx2p57a9c10ajb7gn9isbxfdqj9mb", - "version": "1.4.15" + "rev": "v1.4.16", + "sha256": "11pw1ss4rk8hmfk0q9n8nim441ig0cgl1qxsjzcfsznkp5bb11rw", + "vendorSha256": "0b813dnkn15sdgvi4lh1l5fppgivzrcv5w56w0yf98vyy8wq7p0j", + "version": "1.4.16" }, "ns1": { "owner": "terraform-providers", From fbdfa32356a8275824db809636eeb46c4da3960f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:06:56 +1000 Subject: [PATCH 68/84] terraform-providers.vault: 3.0.0 -> 3.0.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8594dd98224c..822308419ca6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1129,10 +1129,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.0.0", - "sha256": "0k6wwkjxj9ywv16713k6r3ybni9041jx0y0ma7ygcxwk3mciac1z", + "rev": "v3.0.1", + "sha256": "0ppx8kc4zf0yp09vbkmj875sqvklbx0p8a1ganpzdm3462zskra4", "vendorSha256": "03l8bk9jsqf4c7gv0hs1rli7wmlcvpdxmxhra9vndnz6g0jvkvyx", - "version": "3.0.0" + "version": "3.0.1" }, "vcd": { "owner": "terraform-providers", From 160682f3487ac9f2ccbd8b51d98ae43610e0c2e0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 20:01:32 +1000 Subject: [PATCH 69/84] terraform-providers: sort Merged ba798538d076f5dea9e5f8bafdec0384fef9b1d6 out of order. --- .../cluster/terraform-providers/providers.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 822308419ca6..e2f181d02abe 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -259,15 +259,6 @@ "vendorSha256": "1i5ph7p4pj5ph9rkynii50n3npjprrcsmd15i430wpyjxvsjnw8c", "version": "3.6.0" }, - "digitalocean": { - "owner": "digitalocean", - "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", - "repo": "terraform-provider-digitalocean", - "rev": "v2.16.0", - "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw", - "vendorSha256": null, - "version": "2.16.0" - }, "dhall": { "owner": "awakesecurity", "provider-source-address": "registry.terraform.io/awakesecurity/dhall", @@ -277,6 +268,15 @@ "vendorSha256": "0m11cpis171j9aicw0c66y4m1ckg41gjknj86qvblh57ai96gc1n", "version": "0.0.1" }, + "digitalocean": { + "owner": "digitalocean", + "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", + "repo": "terraform-provider-digitalocean", + "rev": "v2.16.0", + "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw", + "vendorSha256": null, + "version": "2.16.0" + }, "dme": { "owner": "terraform-providers", "repo": "terraform-provider-dme", From 1304435f48c4b07f2886f240b674a38069f94758 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 2 Dec 2021 12:55:38 +0100 Subject: [PATCH 70/84] i3: 4.20 -> 4.20.1 (#148253) https://github.com/i3/i3/blob/next/RELEASE-NOTES-4.20.1 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 0617e8572398..5c2db7d47a53 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.20"; + version = "4.20.1"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-jPTxdPbPVU84VjOAaBq+JYaOmVWIN5HgmG7NicU6wyI="; + sha256 = "1rpwdgykcvmrmdz244f0wm7446ih1dcw8rlc1hm1c7cc42pyrq93"; }; nativeBuildInputs = [ From d24027a6846d64d081f5a1c74aa02c49bf44d288 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 25 Nov 2021 18:43:49 +0000 Subject: [PATCH 71/84] =?UTF-8?q?coqPackages.coqprime:=208.12=20=E2=86=92?= =?UTF-8?q?=208.14.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coqprime/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index d738041d5d23..127d630752fe 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -6,12 +6,13 @@ with lib; mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.12" "8.13"; out = "8.12"; } + { case = range "8.12" "8.14"; out = "8.14.1"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } { case = "8.7"; out = "8.7.2"; } ] null; + release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7"; release."8.12".sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj"; release."8.10".sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz"; release."8.8".sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; From a810f7676c1b6e23b317b5f792145de3147faea3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 2 Dec 2021 14:21:52 +0200 Subject: [PATCH 72/84] snappy: add patch to re-enable RTTI --- pkgs/development/libraries/snappy/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 71209295b9fd..797db5b69b0c 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -20,6 +20,14 @@ stdenv.mkDerivation rec { url = "https://github.com/google/snappy/pull/142/commits/658cb2fcf67b626fff2122a3dbf7a3560c58f7ee.patch"; sha256 = "1kg3lxjwmhc7gjx36nylilnf444ddbnr3px1wpvyc6l1nh6zh4al"; }) + # Re-enable RTTI, without which other applications can't subclass + # snappy::Source (this breaks Ceph, as one example) + # https://tracker.ceph.com/issues/53060 + # https://build.opensuse.org/package/show/openSUSE:Factory/snappy + (fetchpatch { + url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; + sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; + }) ]; outputs = [ "out" "dev" ]; From b5b4a6ac4fab75aa857c16fe7c27647d8215fd55 Mon Sep 17 00:00:00 2001 From: qbg Date: Thu, 2 Dec 2021 07:17:23 -0600 Subject: [PATCH 73/84] mathematica: Install desktop items (#147641) --- .../applications/science/math/mathematica/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 10301f062e57..af8826388977 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -90,7 +90,16 @@ stdenv.mkDerivation rec { cd Installer # don't restrict PATH, that has already been done sed -i -e 's/^PATH=/# PATH=/' MathInstaller - sed -i -e 's/\/bin\/bash/\/bin\/sh/' MathInstaller + + # Fix the installation script as follows: + # 1. Adjust the shebang + # 2. Use the wrapper in the desktop items + substituteInPlace MathInstaller \ + --replace "/bin/bash" "/bin/sh" \ + --replace "Executables/Mathematica" "../../bin/mathematica" + + # Install the desktop items + export XDG_DATA_HOME="$out/share" echo "=== Running MathInstaller ===" ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent From 8580bda6863fa0cf2f926b650938fc422184efd6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Dec 2021 11:22:44 +0100 Subject: [PATCH 74/84] libcpuid: fix cross compilation to NetBSD Applies an upstreamed patch which works around a double definition of popcount64. This change is all needed to cross compile nix to NetBSD, so we can extend the cross-trunk jobset as well. --- pkgs/tools/misc/libcpuid/default.nix | 8 +++++++- pkgs/top-level/release-cross.nix | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 8c4cb5c1a759..5abe5673bf29 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "libcpuid"; @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { patches = [ # Work around https://github.com/anrieff/libcpuid/pull/102. ./stdint.patch + # Fixes cross-compilation to NetBSD, remove me for libcpuid > 0.5.1 + (fetchpatch { + name = "use-popcount-from-libc.patch"; + url = "https://github.com/anrieff/libcpuid/commit/1acaf9980b55ae180cc08db218b9face28202519.patch"; + sha256 = "0lvsv9baq0sria1f1ncn1b2783js29lfs5fv8milp54pg1wd5b7q"; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index dae1244786e3..888401d16720 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -166,8 +166,7 @@ in i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; - # TODO: fix cross compilation of nix{,Unstable} to netbsd and switch to common - x86_64-netbsd = mapTestOnCross lib.systems.examples.x86_64-netbsd embedded; + x86_64-netbsd = mapTestOnCross lib.systems.examples.x86_64-netbsd common; # we test `embedded` instead of `linuxCommon` because very few packages # successfully cross-compile to Redox so far From d0cb903609e044bfec9815561ba47b4c5c9f1517 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 2 Dec 2021 13:32:44 +0100 Subject: [PATCH 75/84] strace: 5.14 -> 5.15 ChangeLog: https://github.com/strace/strace/releases/tag/v5.15 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 7e5490fcc3d4..0b73355863c0 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.14"; + version = "5.15"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kBvubbXhfeutRTDdn/tNyalsSmVu2+HDFBt8swexHnM="; + sha256 = "sha256-68rCLylzNSlNxlRCXLw84BM0O+zm2iaZ467Iau6Nctw="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 2ae84eb551220de68abf5ac55a0d95c1cefc69da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 2 Dec 2021 11:30:02 -0300 Subject: [PATCH 76/84] pop-icon-theme: remove some dependencies - Some third-party inherits have been removed from the icon theme by upstream. See https://github.com/pop-os/icon-theme/pull/100 --- pkgs/data/icons/pop-icon-theme/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index 3f980539a110..bb94a36d98d7 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -4,9 +4,7 @@ , meson , ninja , gtk3 -, breeze-icons -, gnome -, pantheon +, adwaita-icon-theme , hicolor-icon-theme }: @@ -28,9 +26,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - breeze-icons - gnome.adwaita-icon-theme - pantheon.elementary-icon-theme + adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc81aeb9e789..b3a336b2a0ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23615,7 +23615,7 @@ with pkgs; pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; pop-icon-theme = callPackage ../data/icons/pop-icon-theme { - inherit (plasma5Packages) breeze-icons; + inherit (gnome) adwaita-icon-theme; }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; From fa06cf556e84ed7991ba78d92a4093a8dc0d5056 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Wed, 1 Dec 2021 11:31:10 -0500 Subject: [PATCH 77/84] ec2-amis: add release 21.11 --- .../virtualisation/amazon-ec2-amis.nix | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-ec2-amis.nix b/nixos/modules/virtualisation/amazon-ec2-amis.nix index b3459ba3d650..91b5237e3371 100644 --- a/nixos/modules/virtualisation/amazon-ec2-amis.nix +++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix @@ -402,5 +402,43 @@ let self = { "21.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-06dc98082bc55c1fc"; "21.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-04737dd49b98936c6"; - latest = self."21.05"; + # 21.11.333823.96b4157790f-x86_64-linux + "21.11".eu-west-1.x86_64-linux.hvm-ebs = "ami-01d0304a712f2f3f0"; + "21.11".eu-west-2.x86_64-linux.hvm-ebs = "ami-00e828bfc1e5d09ac"; + "21.11".eu-west-3.x86_64-linux.hvm-ebs = "ami-0e1ea64430d8103f2"; + "21.11".eu-central-1.x86_64-linux.hvm-ebs = "ami-0fcf28c07e86142c5"; + "21.11".eu-north-1.x86_64-linux.hvm-ebs = "ami-0ee83a3c6590fd6b1"; + "21.11".us-east-1.x86_64-linux.hvm-ebs = "ami-099756bfda4540da0"; + "21.11".us-east-2.x86_64-linux.hvm-ebs = "ami-0b20a80b82052d23f"; + "21.11".us-west-1.x86_64-linux.hvm-ebs = "ami-088ea590004b01752"; + "21.11".us-west-2.x86_64-linux.hvm-ebs = "ami-0025b9d4831b911a7"; + "21.11".ca-central-1.x86_64-linux.hvm-ebs = "ami-0e67089f898e74443"; + "21.11".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0dc8d718279d3402d"; + "21.11".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0155e842329970187"; + "21.11".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-07c95eda953bf5435"; + "21.11".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-04167df3cd952b3bd"; + "21.11".ap-south-1.x86_64-linux.hvm-ebs = "ami-0680e05531b3db677"; + "21.11".ap-east-1.x86_64-linux.hvm-ebs = "ami-0835a3e481dc240f9"; + "21.11".sa-east-1.x86_64-linux.hvm-ebs = "ami-0f7c354c421348e51"; + + # 21.11.333823.96b4157790f-aarch64-linux + "21.11".eu-west-1.aarch64-linux.hvm-ebs = "ami-048f3eea6a12c4b3b"; + "21.11".eu-west-2.aarch64-linux.hvm-ebs = "ami-0e6f18f2009806add"; + "21.11".eu-west-3.aarch64-linux.hvm-ebs = "ami-0a28d593f5e938d80"; + "21.11".eu-central-1.aarch64-linux.hvm-ebs = "ami-0b9c95d926ab9474c"; + "21.11".eu-north-1.aarch64-linux.hvm-ebs = "ami-0f2d400b4a2368a1a"; + "21.11".us-east-1.aarch64-linux.hvm-ebs = "ami-05afb75585567d386"; + "21.11".us-east-2.aarch64-linux.hvm-ebs = "ami-07f360673c2fccf8d"; + "21.11".us-west-1.aarch64-linux.hvm-ebs = "ami-0a6892c61d85774db"; + "21.11".us-west-2.aarch64-linux.hvm-ebs = "ami-04eaf20283432e852"; + "21.11".ca-central-1.aarch64-linux.hvm-ebs = "ami-036b69828502e7fdf"; + "21.11".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-0d52e51e68b6954ef"; + "21.11".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-000a3019e003f4fb9"; + "21.11".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-09b0c7928780e25b6"; + "21.11".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-05f80f3c83083ff62"; + "21.11".ap-south-1.aarch64-linux.hvm-ebs = "ami-05b2a3ff8489c3f59"; + "21.11".ap-east-1.aarch64-linux.hvm-ebs = "ami-0aa3b50a4f2822a00"; + "21.11".sa-east-1.aarch64-linux.hvm-ebs = "ami-00f68eff453d3fe69"; + + latest = self."21.11"; }; in self From 7bb2729d0a642677442e2f4733152d676c21bd76 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 2 Dec 2021 17:30:02 +0100 Subject: [PATCH 78/84] diffoscope: 192 -> 194 ChangeLogs: * https://diffoscope.org/news/diffoscope-193-released/ * https://diffoscope.org/news/diffoscope-194-released/ --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index f6f799a9b0c0..e3f045f6292a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "192"; + version = "194"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-ZaSE1yYznZIQV7yKyeBlqQzkgUn3CoadZY2fDA1/SnE="; + sha256 = "sha256-9JU8srcn7UMdMPAdQlpDzr/Ife5joGJTTqJIN1IJGLk="; }; outputs = [ "out" "man" ]; From 18bab16610d79366aa635e763e480a0de1a458c0 Mon Sep 17 00:00:00 2001 From: nixinator <33lockdown33@protonmail.com> Date: Sun, 28 Nov 2021 21:21:07 +0000 Subject: [PATCH 79/84] xsos:init at 0.7.19 --- pkgs/os-specific/linux/xsos/default.nix | 52 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/os-specific/linux/xsos/default.nix diff --git a/pkgs/os-specific/linux/xsos/default.nix b/pkgs/os-specific/linux/xsos/default.nix new file mode 100644 index 000000000000..56516aee8b7b --- /dev/null +++ b/pkgs/os-specific/linux/xsos/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, installShellFiles +, dmidecode +, ethtool +, pciutils +, multipath-tools +, iproute2 +, sysvinit +}: +let + binPath = [ + iproute2 + dmidecode + ethtool + pciutils + multipath-tools + iproute2 + sysvinit + ]; +in + +stdenv.mkDerivation rec { + pname = "xsos"; + version = "0.7.19"; + + src = fetchFromGitHub { + owner = "ryran"; + repo = "xsos"; + rev = "v${version}"; + sha256 = "11cc8z3pz4gl0mwl2fc701mn4cgx50fybygx0rvs9bhvb0jnphay"; + }; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + installPhase = '' + mkdir -p $out/bin + cp -a xsos $out/bin + wrapProgram "$out/bin/xsos" --prefix PATH : ${lib.makeBinPath binPath} + installShellCompletion --bash --name xsos.bash xsos-bash-completion.bash + ''; + + meta = with lib; { + description = "Summarize system info from sosreports"; + homepage = "https://github.com/ryran/xsos"; + license = licenses.gpl3; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ maintainers.nixinator ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be01f212939d..5ab6704bd797 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33815,6 +33815,8 @@ with pkgs; xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; + xsos = callPackage ../os-specific/linux/xsos { }; + zesarux = callPackage ../misc/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; From d1da5658a64eae7b22d87b8ac928310a59ab3196 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Dec 2021 18:45:04 +0100 Subject: [PATCH 80/84] nixos/doc/manual/release-notes/rl-2111: move highlights introduction --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 8 ++++---- nixos/doc/manual/release-notes/rl-2111.section.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index fb98b6a4b01c..4776d2bfad19 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1,9 +1,5 @@
Release 21.11 (“Porcupine”, 2021/11/30) - - In addition to numerous new and upgraded packages, this release has - the following highlights: - @@ -14,6 +10,10 @@
Highlights + + In addition to numerous new and upgraded packages, this release + has the following highlights: + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 5abfa6beb106..6ac1acf67494 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -1,11 +1,11 @@ # Release 21.11 (“Porcupine”, 2021/11/30) {#sec-release-21.11} -In addition to numerous new and upgraded packages, this release has the following highlights: - - Support is planned until the end of June 2022, handing over to 22.05. ## Highlights {#sec-release-21.11-highlights} +In addition to numerous new and upgraded packages, this release has the following highlights: + - Nix has been updated to version 2.4, reference its [release notes](https://discourse.nixos.org/t/nix-2-4-released/15822) for more information on what has changed. The previous version of Nix, 2.3.16, remains available for the time being in the `nix_2_3` package. - `iptables` now uses `nf_tables` backend. From 82ee5f20c7a3881a00257978f98b2e2c4622330c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 2 Dec 2021 14:45:28 -0300 Subject: [PATCH 81/84] pop-icon-theme: restrict platforms to linux --- pkgs/data/icons/pop-icon-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index bb94a36d98d7..7254e8bc2139 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Icon theme for Pop!_OS with a semi-flat design and raised 3D motifs"; homepage = "https://github.com/pop-os/icon-theme"; license = with licenses; [ cc-by-sa-40 gpl3 ]; - platforms = platforms.unix; + platforms = platforms.linux; # hash mismatch on darwin due to file names differing only in case maintainers = with maintainers; [ romildo ]; }; } From 34d4676e9d9d8778523235e52b9e9c5bd1f8d6d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Dec 2021 18:57:18 +0100 Subject: [PATCH 82/84] nixos/doc/manual/release-notes/rl-2111: fix multiple option links --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 6 +++--- nixos/doc/manual/release-notes/rl-2111.section.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 4776d2bfad19..ed5ffe352323 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -255,14 +255,14 @@ Kea, ISCs 2nd generation DHCP and DDNS server suite. Available at - services.kea. + services.kea. owncast, self-hosted video live streaming solution. Available at - services.owncast. + services.owncast. @@ -270,7 +270,7 @@ PeerTube, developed by Framasoft, is the free and decentralized alternative to video platforms. Available at - services.peertube. + services.peertube. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 6ac1acf67494..61bcd745a356 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -68,11 +68,11 @@ In addition to numerous new and upgraded packages, this release has the followin - [Jibri](https://github.com/jitsi/jibri), a service for recording or streaming a Jitsi Meet conference. Available as [services.jibri](options.html#opt-services.jibri.enable). -- [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea). +- [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea.dhcp4). -- [owncast](https://owncast.online/), self-hosted video live streaming solution. Available at [services.owncast](options.html#opt-services.owncast). +- [owncast](https://owncast.online/), self-hosted video live streaming solution. Available at [services.owncast](options.html#opt-services.owncast.enable). -- [PeerTube](https://joinpeertube.org/), developed by Framasoft, is the free and decentralized alternative to video platforms. Available at [services.peertube](options.html#opt-services.peertube). +- [PeerTube](https://joinpeertube.org/), developed by Framasoft, is the free and decentralized alternative to video platforms. Available at [services.peertube](options.html#opt-services.peertube.enable). - [sourcehut](https://sr.ht), a collection of tools useful for software development. Available as [services.sourcehut](options.html#opt-services.sourcehut.enable). From ea90c516e79a9231acef34e369c544836242ef34 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Tue, 30 Nov 2021 19:16:08 +0000 Subject: [PATCH 83/84] nixos/shairport-sync: add firewall rules Add an option to automatically open the firewall for shairport. --- .../modules/services/networking/shairport-sync.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index ac526c0e9f6f..bd24931abb01 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -36,6 +36,14 @@ in ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to automatically open ports in the firewall. + ''; + }; + user = mkOption { type = types.str; default = "shairport"; @@ -66,6 +74,12 @@ in extraGroups = [ "audio" ] ++ optional config.hardware.pulseaudio.enable "pulse"; }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 5000 ]; + allowedUDPPortRanges = [ { from = 6001; to = 6011; } ]; + }; + systemd.services.shairport-sync = { description = "shairport-sync"; From b0819012c4d3bcbe68024d6da3576a7e5607606d Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Fri, 3 Dec 2021 01:51:38 +0530 Subject: [PATCH 84/84] gh: 2.2.0 -> 2.3.0 --- .../version-management/git-and-tools/gh/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 17484ea31398..ab9d08f6db5d 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/czexUqpdsFQAteZ75ur2SFibrtZWffHpPBEPlLQXSY="; + sha256 = "sha256-l6MwBxPWIL5oEaq9c0HJZumZf17WzZymZtytyWZOwWE="; }; - vendorSha256 = "sha256-slMl5dCyyVNBgDbpYECfYUbpJJ7sWuSGSutYR3rTzj0="; + vendorSha256 = "sha256-ONeeFZbD5RJXWiXejUt5VKzGl0pz+3Hn73/Y5a+gJRw="; nativeBuildInputs = [ installShellFiles ]; @@ -45,6 +45,7 @@ buildGoModule rec { meta = with lib; { description = "GitHub CLI tool"; homepage = "https://cli.github.com/"; + changelog = "https://github.com/cli/cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ zowoq ]; };