From a31607f904723295e4dc702c579efd8cc8d7b506 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 6 Jan 2021 13:02:19 +0100 Subject: [PATCH 01/25] dockerTools: Don't apologize Warning about future breaking changes is wrong. - It suggests that the maintainers don't value backwards compatibility. They do. - It implies that other parts of Nixpkgs won't ever break. They will. - It implies that a well-defined "public" interface exists. It doesn't. - If the reasons above didn't apply, it should have been in the manual instead. Breaking changes will come, especially to the interface. That can be the only way we can make progress without breaking the image _contents_. I don't think dockerTools is any different from most of Nixpkgs in these regards. --- pkgs/build-support/docker/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 276c7cd1bdb..ae97d569133 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -35,7 +35,6 @@ system, # Note: This is the cross system we're compiling for }: -# WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. let mkDbExtraCommand = contents: let From 0d880dbc889d3a6a8a00c6e4345581cee665ad7a Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 7 Jan 2021 19:10:42 +0000 Subject: [PATCH 02/25] starboard: 0.7.1 -> 0.8.0 --- pkgs/applications/networking/cluster/starboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index e8ffa353539..3850eb75638 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0p0c459xih580ix3279fr45mm3q9w887rs7w1yrikh09xpcisdfr"; + sha256 = "sha256-KRVMgrJ7xtv2SYa249sSDV8PObStAe+UGEgZWv43sk4="; }; - vendorSha256 = "07cz4p8k927ash5ncw1r56bcn592imgywbyzkvhnn50pap91m0q0"; + vendorSha256 = "sha256-AIMa0lUXFGvhnt8v7l+NIhXLlik5cGYL1OqINNElnx0="; subPackages = [ "cmd/starboard" ]; From e91eaf445150c5e0be84db81c783e6118e14f133 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 7 Jan 2021 15:21:42 -0500 Subject: [PATCH 03/25] jnoortheen.nix-ide: init at 0.1.7 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 4c644643658..c0ff4b17896 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -143,6 +143,18 @@ let }; }; + jnoortheen.nix-ide = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nix-ide"; + publisher = "jnoortheen"; + version = "0.1.7"; + sha256 = "1bw4wyq9abimxbhl7q9g8grvj2ax9qqq6mmqbiqlbsi2arvk0wrm"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + justusadam.language-haskell = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-haskell"; From 2252558551cf8451077b77fdb69d96767f4e05da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Thu, 7 Jan 2021 22:33:36 +0100 Subject: [PATCH 04/25] vimPlugins.vim-capslock: init at 2021-01-07 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 6e2d0be5a5a..cae16b15377 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4429,6 +4429,18 @@ let meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; + vim-capslock = buildVimPluginFrom2Nix { + pname = "vim-capslock"; + version = "2021-01-07"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-capslock"; + rev = "84c9e467a7b8e5aabf33674ed17c6356cf98777c"; + sha256 = "1c2fr8s9im3vxrszsrzm6wvad6disbdslmq6lqdp4603ialy4kja"; + }; + meta.homepage = "https://github.com/tpope/vim-capslock/"; + }; + vim-carbon-now-sh = buildVimPluginFrom2Nix { pname = "vim-carbon-now-sh"; version = "2020-10-28"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 35ee65fb2f1..855e45b84ae 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -547,6 +547,7 @@ tommcdo/vim-ninja-feet tomtom/tcomment_vim tomtom/tlib_vim tpope/vim-abolish +tpope/vim-capslock tpope/vim-commentary tpope/vim-dadbod tpope/vim-dispatch From 0fcff7d1af40e0a6bed603a8f09cb0a8bf91166d Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 7 Jan 2021 23:44:08 +0100 Subject: [PATCH 05/25] vscode-extensions.brettm12345.nixfmt-vscode: init at 0.0.1 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 4c644643658..73715ffd1ff 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -63,6 +63,18 @@ let }; }; + brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nixfmt-vscode"; + publisher = "brettm12345"; + version = "0.0.1"; + sha256 = "07w35c69vk1l6vipnq3qfack36qcszqxn8j3v332bl0w6m02aa7k"; + }; + meta = with stdenv.lib; { + license = licenses.mpl20; + }; + }; + cmschuetz12.wal = buildVscodeMarketplaceExtension { mktplcRef = { name = "wal"; From 0231df9cb59332a8df11183d1dd66400edded01d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 8 Jan 2021 01:42:32 +0300 Subject: [PATCH 06/25] =?UTF-8?q?mtPaint:=203.49.12=20=E2=86=92=203.50.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applications/graphics/mtpaint/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 91278c9881f..c002e2a8d05 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -1,26 +1,28 @@ { stdenv, fetchFromGitHub -, pkgconfig -, freetype, giflib, gtk2, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle +, pkg-config +, freetype, giflib, gtk3, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle }: stdenv.mkDerivation rec { p_name = "mtPaint"; - ver_maj = "3.49"; - ver_min = "12"; + ver_maj = "3.50"; + ver_min = "01"; name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchFromGitHub { owner = "wjaguar"; repo = p_name; - rev = "6aed1b0441f99055fc7d475942f8bd5cb23c41f8"; - sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1"; + rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f"; + sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle + freetype giflib gtk3 lcms2 libjpeg libpng libtiff openjpeg gifsicle ]; + configureFlags = [ "gtk3" "intl" "man" ]; + meta = { description = "A simple GTK painting program"; longDescription = '' @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { GNU/Linux, Windows and older PC hardware. ''; homepage = "http://mtpaint.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vklquevs ]; }; From c745b25bd9467ac98bc6226ed0be44c766ecdc40 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 8 Jan 2021 00:30:30 +0100 Subject: [PATCH 07/25] vscode-extensions.vincaslt.highlight-matching-tag: init at 0.10.0 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 4c644643658..2bf0346c67e 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -301,6 +301,18 @@ let lldb = llvmPackages_latest.lldb; }; + vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "highlight-matching-tag"; + publisher = "vincaslt"; + version = "0.10.0"; + sha256 = "1albwz3lc9i20if77inm1ipwws8apigvx24rbag3d1h3p4vwda49"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {}; vscodevim.vim = buildVscodeMarketplaceExtension { From 540f8866834b19b5ab9dad23aaa2534e8416d5fc Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 8 Jan 2021 00:46:06 +0100 Subject: [PATCH 08/25] vscode-extensions.formulahendry.auto-rename-tag: init at 0.1.5 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 4c644643658..07963f17cb2 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -107,6 +107,18 @@ let }; }; + formulahendry.auto-rename-tag = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "auto-rename-tag"; + publisher = "formulahendry"; + version = "0.1.5"; + sha256 = "1ic3nxpcan8wwwzwm099plkn7fdy0zz2575rh4znc4sqgcqywh2i"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + golang.Go = buildVscodeMarketplaceExtension { mktplcRef = { name = "Go"; From a8a46f821566e9712a18a4613320c4bac4a7b1b9 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 8 Jan 2021 00:52:21 +0100 Subject: [PATCH 09/25] vscode-extensions.tyriar.sort-lines: init at 1.9.0 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 4c644643658..b16faf4b5d8 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -297,6 +297,18 @@ let }; }; + tyriar.sort-lines = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sort-lines"; + publisher = "Tyriar"; + version = "1.9.0"; + sha256 = "0l4wibsjnlbzbrl1wcj18vnm1q4ygvxmh347jvzziv8f1l790qjl"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { lldb = llvmPackages_latest.lldb; }; From e00392cad0a24bb569cb62b64b7878423dd1feb0 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 8 Jan 2021 01:15:03 +0100 Subject: [PATCH 10/25] vscode-extensions.ibm.output-colorizer: init at 0.1.2 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 4c644643658..ca11b18a88b 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -131,6 +131,18 @@ let }; }; + ibm.output-colorizer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "output-colorizer"; + publisher = "IBM"; + version = "0.1.2"; + sha256 = "0i9kpnlk3naycc7k8gmcxas3s06d67wxr3nnyv5hxmsnsx5sfvb7"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; From cf58429db8dcd6a5541581ad4784402ef46c96f4 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 8 Jan 2021 00:16:41 +0000 Subject: [PATCH 11/25] factorio-experimental, factorio-headless-experimental: 1.1.7 -> 1.1.8 --- pkgs/games/factorio/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 840913550f7..f484d3304cb 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.7.tar.xz", + "name": "factorio_alpha_x64-1.1.8.tar.xz", "needsAuth": true, - "sha256": "0wqrs5w5giybq47hfv5wwg7c36351kfsa5x06nvxls2znyl43qv8", + "sha256": "1zvjmdmvp05yr8lln4hsa184hl115sv9xz1dwxa3cb827f5ndd6m", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.7/alpha/linux64", - "version": "1.1.7" + "url": "https://factorio.com/get-download/1.1.8/alpha/linux64", + "version": "1.1.8" }, "stable": { "name": "factorio_alpha_x64-1.0.0.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.7.tar.xz", + "name": "factorio_headless_x64-1.1.8.tar.xz", "needsAuth": false, - "sha256": "1s52p6cvd2v0pmj4gppc2pf8r6bpbzkmwpw8451j3ic58fhjvypr", + "sha256": "1j2nmm61c99qis8fkc1gp5i3fj3vmc2mfds7lw4gfr9kr956cjhf", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.7/headless/linux64", - "version": "1.1.7" + "url": "https://factorio.com/get-download/1.1.8/headless/linux64", + "version": "1.1.8" }, "stable": { "name": "factorio_headless_x64-1.0.0.tar.xz", From 623bc4704d6397e3d2ed0367559c9b1af9adb98c Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 8 Jan 2021 09:36:43 +0100 Subject: [PATCH 12/25] vscode-extensions.formulahendry.auto-rename-tag: 0.1.5 -> 0.1.6 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 07963f17cb2..627ca436ec1 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -111,8 +111,8 @@ let mktplcRef = { name = "auto-rename-tag"; publisher = "formulahendry"; - version = "0.1.5"; - sha256 = "1ic3nxpcan8wwwzwm099plkn7fdy0zz2575rh4znc4sqgcqywh2i"; + version = "0.1.6"; + sha256 = "0cqg9mxkyf41brjq2c764w42lzyn6ffphw6ciw7xnqk1h1x8wwbs"; }; meta = { license = stdenv.lib.licenses.mit; From 2839e588d8ee4d02f914405cd412166023368e22 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 8 Jan 2021 10:50:13 +0100 Subject: [PATCH 13/25] vscode-extensions.bracket-pair-colorizer-2: init at 0.2.0 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 4c644643658..58206a9f916 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -75,6 +75,18 @@ let }; }; + coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "bracket-pair-colorizer-2"; + publisher = "CoenraadS"; + version = "0.2.0"; + sha256 = "0nppgfbmw0d089rka9cqs3sbd5260dhhiipmjfga3nar9vp87slh"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; + dhall.dhall-lang = buildVscodeMarketplaceExtension { mktplcRef = { name = "dhall-lang"; From 757889019b1f23430c88ac45a376a7030449c41f Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Fri, 8 Jan 2021 11:12:07 +0100 Subject: [PATCH 14/25] golangci-lint: 1.33.0 -> 1.35.0 --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index ddcbbb12758..e91f8cfeb76 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.33.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1yqq5jai0npkjzfk2h121nv3pgqfqi5c3vs22wyv6qwnlia97yin"; + sha256 = "03pg8qfysjdbpxzdcs4y5cn0gshr5k53p7rjqak7q8vdykva60s1"; }; - vendorSha256 = "1kmsfsa5z41mjxi15a4zra1qhskm5pjcfbk09c99xbv27pin5yrj"; + vendorSha256 = "18dgx087jixwcfcab546qhy5qq1n1ahrsr7i7d7d3v9vklslics8"; doCheck = false; From add5d113757e7f6bd00039e68c00920985802e86 Mon Sep 17 00:00:00 2001 From: David Terry Date: Fri, 8 Jan 2021 12:07:40 +0100 Subject: [PATCH 15/25] lieer: 1.2 -> 1.3 --- pkgs/applications/networking/lieer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 700ad011dff..a2c05bda638 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lieer"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "gauteh"; repo = "lieer"; rev = "v${version}"; - sha256 = "0qp8sycclzagkiszqk1pw2fr8s8s195bzy8r27dj7f5zx350nxk5"; + sha256 = "12sl7d381l1gjaam419xc8gxmsprxf0hgksz1f974qmmijvr02bh"; }; propagatedBuildInputs = with python3Packages; [ @@ -16,6 +16,7 @@ python3Packages.buildPythonApplication rec { oauth2client google_api_python_client tqdm + setuptools ]; meta = with stdenv.lib; { From 78620e28d6b2082cafa0393cf5e2124882216152 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Fri, 8 Jan 2021 12:43:09 +0100 Subject: [PATCH 16/25] pijul: 1.0.0-alpha.24 -> 1.0.0-alpha.31 --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 1439f792248..4a64057cf11 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.24"; + version = "1.0.0-alpha.31"; src = fetchCrate { inherit version pname; - sha256 = "1h1vgx0zlymnhalqsgmp9gv6sxbizmyryldx5vzl6djl23dvzd6s"; + sha256 = "sha256-dSwQlALN0E87o86sasuNFPTZN6SRCuxP6pI7wi4uRf4"; }; - cargoSha256 = "1yx7qqfyabhrf6mcca4frdcp9a426khp90nznhshhm71liqr9y44"; + cargoSha256 = "sha256-Xwk5bX9o41M/1BmkOpAscGQHikhzV+9qAwVz0qI7FRA"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; From ff1d77d7882049fb84c22752c0ea60f19908bb0e Mon Sep 17 00:00:00 2001 From: 1000101 Date: Thu, 7 Jan 2021 22:02:56 +0100 Subject: [PATCH 17/25] postgresqlPackages.timescaledb: 1.7.4-> 2.0.0 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 76619b83c14..55d2cd81a21 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.7.4"; + version = "2.0.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0w0sl5izwic3j1k94xhky2y4wkd8l18m5hcknj5vqxq3ryhxaszc"; + sha256 = "0id1h46490mjqp8ijhv2qswpdli2nh2z15mgh6gfc2wl3bhwhi1g"; }; - cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; + # -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream + cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DWARNINGS_AS_ERRORS=OFF" ]; # Fix the install phase which tries to install into the pgsql extension dir, # and cannot be manually overridden. This is rather fragile but works OK. From 0e061a859577bee26f602330eccfb08123c0bf33 Mon Sep 17 00:00:00 2001 From: Rob Ashton Date: Tue, 12 Nov 2019 09:08:03 +0000 Subject: [PATCH 18/25] intel-media-driver: Fix runtime issues due to the libX11 dependency X11 is an optional run-time and optional build-time dependency of iHD. A patchelf is required to join these two worlds together, and a lot of machines that'll run the intel-media-driver won't have X11 on them, so make it optional. Fix #73236. Co-Authored-By: Michael Weiss --- .../libraries/intel-media-driver/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 153e41a777c..6f2f543af06 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub , cmake, pkg-config -, libva, libpciaccess, intel-gmmlib, libX11 +, libva, libpciaccess, intel-gmmlib +, enableX11 ? true, libX11 }: stdenv.mkDerivation rec { @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libva libpciaccess intel-gmmlib libX11 ]; + buildInputs = [ libva libpciaccess intel-gmmlib ] + ++ stdenv.lib.optional enableX11 libX11; meta = with stdenv.lib; { description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; @@ -38,4 +40,9 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ primeos jfrankenau ]; }; + + postFixup = stdenv.lib.optionalString enableX11 '' + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${stdenv.lib.makeLibraryPath [ libX11 ]}" \ + $out/lib/dri/iHD_drv_video.so + ''; } From 8694e7de2593139ea46c3e6d1431d6803a2d5a8a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 5 Jan 2021 16:44:43 +0000 Subject: [PATCH 19/25] nixos/getty: add services.getty.loginOptions This corresponds to agetty's --login-options argument. With this change, I can set services.getty.autologinUser = "qyliss"; services.getty.loginOptions = "-- \\u"; and have my username prefilled, but with my password still required (unlike the normal autologinUser behaviour). --- nixos/modules/services/ttys/getty.nix | 31 +++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 68ab8183777..ecfabef5fb1 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -3,9 +3,19 @@ with lib; let + cfg = config.services.getty; - autologinArg = optionalString (config.services.getty.autologinUser != null) "--autologin ${config.services.getty.autologinUser}"; - gettyCmd = extraArgs: "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}"; + loginArgs = [ + "--login-program" "${pkgs.shadow}/bin/login" + ] ++ optionals (cfg.autologinUser != null) [ + "--autologin" cfg.autologinUser + ] ++ optionals (cfg.loginOptions != null) [ + "--login-options" cfg.loginOptions + ]; + + gettyCmd = extraArgs: + "@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs loginArgs} " + + extraArgs; in @@ -30,6 +40,23 @@ in ''; }; + loginOptions = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Template for arguments to be passed to + login + 1. + + See agetty + 1 for details, + including security considerations. If unspecified, agetty + will not be invoked with a + option. + ''; + example = "-h darkstar -- \u"; + }; + greetingLine = mkOption { type = types.str; description = '' From 63d40a90c916c5096d79fdb4d29aa22f86714381 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 8 Jan 2021 08:59:23 -0500 Subject: [PATCH 20/25] python3Packages.botocore: 1.19.50 -> 1.19.51 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 04690e86f5e..8e4812e868e 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.50"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.51"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-cJCQumG7p9+oMbQ31hy0aahSmNjzzluOEs30G9KyvGE="; + sha256 = "sha256-sgTFtHewQ8f2HLpdtHnGsl9oT3QJtxqOzbWms/V7XLQ="; }; propagatedBuildInputs = [ From 583bde3965677a9ba525f84c02d698303d188946 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 8 Jan 2021 08:59:33 -0500 Subject: [PATCH 21/25] python3Packages.boto3: 1.16.50 -> 1.16.51 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index de2095bd728..d4bcb9381e8 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.50"; # N.B: if you change this, change botocore too + version = "1.16.51"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-TVAqhCuB/axLlQ07iKW5BnzhGCE7Eisg9BkgA8sGeYY="; + sha256 = "sha256-EdxJJoLPKk+P85ewoQmDc0Dvk+d8ouZXFc4k7PBDcXw="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 137859bc9d884cc2215e4d8ae293d2674fa9e032 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 8 Jan 2021 09:00:19 -0500 Subject: [PATCH 22/25] awscli: 1.18.210 -> 1.18.211 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 2a0e5959b91..772c4a2f3b9 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.210"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.211"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-kt12Dc58UpsdlMen3IeTvRzcZ0HnwArs2q3ojqUBEPw="; + sha256 = "sha256-dkPdr0Q05CjeNg1FKbye4Ndtfakido0wKR22Afls3Mk="; }; postPatch = '' From f621108dbc431b16b2277df9de734541d99351dd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 8 Jan 2021 14:03:09 +0000 Subject: [PATCH 23/25] =?UTF-8?q?oh-my-zsh:=202021-01-05=20=E2=86=92=20202?= =?UTF-8?q?1-01-07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 2d13bf8e925..429d1c55c8b 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-01-05"; + version = "2021-01-07"; pname = "oh-my-zsh"; - rev = "86f805280f6a8cf65d8d0a9380489aae4b72f767"; + rev = "c9bf8b4a84d4ae392cf1bdd6a4a7c7c4f7710b92"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1wf4g1z7fvravsp020xdqvczf4kcw1nh3b22djlsgd97n8qgziaz"; + sha256 = "13i4r2bhffdjcln5cml29m9gzw9m39yxcln49h3shpp7s1gl3z4a"; }; installPhase = '' From 26dedb83988154d3f6af3bcbba1a3bb9abe770e9 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Thu, 7 Jan 2021 23:46:47 -0500 Subject: [PATCH 24/25] vtk: use system png VTK doesn't seem produce png symbols on aarch64. We could probably figure out how to fix that but we can also just tell it to use the libpng we already have, which already works on aarch64. --- pkgs/development/libraries/vtk/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 7bfd8d9fcff..2cb0fe33d52 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -1,5 +1,5 @@ { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: -{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff +{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch , enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools , enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given." @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libtiff ] + buildInputs = [ libpng libtiff ] ++ optionals enableQt [ qtbase qtx11extras qttools ] ++ optionals stdenv.isLinux [ libGLU @@ -65,6 +65,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" + "-DVTK_USE_SYSTEM_PNG=ON" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DCMAKE_INSTALL_LIBDIR=lib" From 72d906a0eafd089c90a6daab24ef344a79b00046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 5 Jan 2021 20:29:52 +0100 Subject: [PATCH 25/25] nixos: fix "nixos-rebuild build-vm-with-bootloader" for EFI systems (The first version of this change, in commit 39fad297fd, broke `nix-build -A nixosTests.installer.simpleUefiSystemdBoot`. This is the 2nd version, which hopefully does not break anything.) `nixos-rebuild build-vm-with-bootloader` currently fails with the default NixOS EFI configuration: $ cat >configuration.nix <