From ec0dc734c3f0644ea653749eb65c368a66025c5e Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 9 May 2021 10:33:08 +0200 Subject: [PATCH 01/62] python3Packages.hg-commitsigs: init at unstable-2021-01-08 A Mercurial extension for signing changesets. --- .../python-modules/hg-commitsigs/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/hg-commitsigs/default.nix diff --git a/pkgs/development/python-modules/hg-commitsigs/default.nix b/pkgs/development/python-modules/hg-commitsigs/default.nix new file mode 100644 index 000000000000..5c195bfe19f1 --- /dev/null +++ b/pkgs/development/python-modules/hg-commitsigs/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchhg +, stdenv +, python3 +}: + +stdenv.mkDerivation rec { + pname = "hg-commitsigs"; + # Latest tag is 11 years old. + version = "unstable-2021-01-08"; + + src = fetchhg { + url = "https://foss.heptapod.net/mercurial/commitsigs"; + rev = "b53eb6862bff"; + sha256 = "sha256-PS1OhC9MiVFD7WYlIn6FavD5TyhM50WoV6YagI2pLxU="; + }; + + # Not sure how the tests are supposed to be run, and they 10 years old... + doCheck = false; + dontBuild = true; + + installPhase = '' + mkdir -p $out/lib/${python3.libPrefix}/site-packages/hgext3rd/ + install -D $src/commitsigs.py \ + $out/lib/${python3.libPrefix}/site-packages/hgext3rd/ + ''; + + meta = with lib; { + description = "Automatic signing of changeset hashes"; + longDescription = '' + This packages provides a Mercurial extension that lets you sign + the changeset hash when you commit. The signature is embedded + directly in the changeset itself; there wont be any extra + commits. Either GnuPG or OpenSSL can be used to sign the hashes. + ''; + homepage = "https://foss.heptapod.net/mercurial/commitsigs"; + maintainers = with maintainers; [ yoctocell ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; # same as Mercurial + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33559777930e..d3a2a8b8c53f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3025,6 +3025,8 @@ in { heudiconv = callPackage ../development/python-modules/heudiconv { }; + hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { }; + hg-evolve = callPackage ../development/python-modules/hg-evolve { }; hglib = callPackage ../development/python-modules/hglib { }; From 20b48c37275fe931a46233a7f3f2cb6aa8cf68e2 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Wed, 25 Aug 2021 10:33:48 +0000 Subject: [PATCH 02/62] Revert "neovim: use luajit_openresty on aarch64-darwin" This reverts commit fb5156c0e8508d82ac4e750c134cb8f4fc92c9f8. --- pkgs/top-level/all-packages.nix | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982122bf59ed..b2b6e710314f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28017,11 +28017,31 @@ with pkgs; wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # See: - # - https://github.com/NixOS/nixpkgs/issues/129099 - # - https://github.com/NixOS/nixpkgs/issues/128959 + # neovim doesn't build with luajit on aarch64-darwin : + # ./luarocks init + # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: + # no field package.preload['luarocks.core.hardcoded'] + # no file '/private/tmp/nix-build-luarocks-3.2.1.drv-0/source/src/luarocks/core/hardcoded.lua' + # no file './luarocks/core/hardcoded.lua' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/luajit-2.1.0-beta3/luarocks/core/hardcoded.lua' + # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded.lua' + # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded/init.lua' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded.lua' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded/init.lua' + # no file './luarocks/core/hardcoded.so' + # no file '/usr/local/lib/lua/5.1/luarocks/core/hardcoded.so' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks/core/hardcoded.so' + # no file '/usr/local/lib/lua/5.1/loadall.so' + # no file './luarocks.so' + # no file '/usr/local/lib/lua/5.1/luarocks.so' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks.so' + # no file '/usr/local/lib/lua/5.1/loadall.so') + # make: *** [GNUmakefile:57: luarocks] Error 1 + # + # See https://github.com/NixOS/nixpkgs/issues/129099 + # Possibly related: https://github.com/neovim/neovim/issues/7879 lua = - if (stdenv.isDarwin && stdenv.isAarch64) then luajit_openresty else + if (stdenv.isDarwin && stdenv.isAarch64) then lua5_1 else luajit; }; From d5fe0d2b6e2117b08d5c1adac86a2e42ca93c5c5 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Wed, 25 Aug 2021 10:33:56 +0000 Subject: [PATCH 03/62] Revert "luajit_openresty: init" This reverts commit 0b467dfa956485833713374d015bc2a8dcbd9133. --- pkgs/development/interpreters/lua-5/default.nix | 5 ----- pkgs/development/interpreters/luajit/2.0.nix | 2 -- pkgs/development/interpreters/luajit/2.1.nix | 2 -- pkgs/development/interpreters/luajit/default.nix | 6 +++--- pkgs/development/interpreters/luajit/openresty.nix | 10 ---------- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/interpreters/luajit/openresty.nix diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index f2b2961c4c77..3e36f77dab43 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -54,9 +54,4 @@ rec { inherit callPackage; }; - luajit_openresty = import ../luajit/openresty.nix { - self = luajit_openresty; - inherit callPackage; - }; - } diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index ceb796f0433e..153b11aaa5fc 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,8 +1,6 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - owner = "LuaJIT"; - repo = "LuaJIT"; version = "2.0.5-2021-06-08"; rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46"; isStable = true; diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 87976a45dfe1..d11514c07c62 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,6 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - owner = "LuaJIT"; - repo = "LuaJIT"; version = "2.1.0-2021-06-25"; rev = "e957737650e060d5bf1c2909b741cc3dffe073ac"; isStable = false; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 728161598282..860642b0fd2f 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchFromGitHub, buildPackages , name ? "luajit-${version}" , isStable -, owner -, repo , sha256 , rev , version @@ -43,7 +41,9 @@ in stdenv.mkDerivation rec { inherit name version; src = fetchFromGitHub { - inherit owner repo sha256 rev; + owner = "LuaJIT"; + repo = "LuaJIT"; + inherit sha256 rev; }; luaversion = "5.1"; diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix deleted file mode 100644 index 78e06f46f1d0..000000000000 --- a/pkgs/development/interpreters/luajit/openresty.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ self, callPackage }: -callPackage ./default.nix rec { - inherit self; - owner = "openresty"; - repo = "luajit2"; - version = "2.1-20210510"; - rev = "v${version}"; - isStable = true; - sha256 = "1h21w5axwka2j9jb86yc69qrprcavccyr2qihiw4b76r1zxzalvd"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2b6e710314f..40d4d549004a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12691,7 +12691,7 @@ with pkgs; ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_openresty luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; From a15ee4845bec7dd5dfe74971d23b788cb2d49885 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Wed, 25 Aug 2021 10:35:49 +0000 Subject: [PATCH 04/62] luajit: format with nixpkgs-fmt --- .../interpreters/luajit/default.nix | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 860642b0fd2f..2a94f9f69e7c 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,13 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages +{ lib +, stdenv +, fetchFromGitHub +, buildPackages , name ? "luajit-${version}" , isStable , sha256 , rev , version -, extraMeta ? {} +, extraMeta ? { } , callPackage , self -, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: { }) , enableFFI ? true , enableJIT ? true , enableJITDebugModule ? enableJIT @@ -24,25 +27,25 @@ assert enableJITDebugModule -> enableJIT; assert enableGDBJITSupport -> enableJIT; assert enableValgrindSupport -> valgrind != null; let - luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; + luaPackages = callPackage ../../lua-modules { lua = self; overrides = packageOverrides; }; XCFLAGS = with lib; - optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" - ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" - ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" - ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" - ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" - ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" - ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" - ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" - ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" + optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" + ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" + ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" + ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" + ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" + ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" + ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" + ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" + ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" ; in stdenv.mkDerivation rec { inherit name version; src = fetchFromGitHub { - owner = "LuaJIT"; - repo = "LuaJIT"; + owner = "LuaJIT"; + repo = "LuaJIT"; inherit sha256 rev; }; @@ -82,8 +85,10 @@ stdenv.mkDerivation rec { ''; LuaPathSearchPaths = [ - "lib/lua/${luaversion}/?.lua" "share/lua/${luaversion}/?.lua" - "share/lua/${luaversion}/?/init.lua" "lib/lua/${luaversion}/?/init.lua" + "lib/lua/${luaversion}/?.lua" + "share/lua/${luaversion}/?.lua" + "share/lua/${luaversion}/?/init.lua" + "lib/lua/${luaversion}/?/init.lua" "share/${name}/?.lua" ]; LuaCPathSearchPaths = [ "lib/lua/${luaversion}/?.so" "share/lua/${luaversion}/?.so" ]; @@ -94,16 +99,16 @@ stdenv.mkDerivation rec { lua = self; inherit (luaPackages) requiredLuaModules; }; - withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages;}; + withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages; }; pkgs = luaPackages; interpreter = "${self}/bin/lua"; }; meta = with lib; { description = "High-performance JIT compiler for Lua 5.1"; - homepage = "http://luajit.org"; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; + homepage = "http://luajit.org"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ thoughtpolice smironov vcunat andir lblasc ]; } // extraMeta; } From d01533ceabdd84674a90691969bf4294e9d97ce1 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 25 Aug 2021 21:05:28 +0200 Subject: [PATCH 05/62] pkgsCross.avr.buildPackages.gcc{10,11}: avoid log limit on hydra When upgrading from gcc 9 to 10, avr-gcc started to hit the hydra log limit, preventing the binary cache from being populated. This commit tries to workaround this issue by passing `-s` to make for avr-gcc 10 and 11 which seem to exhibit this problem. Reference #135605. --- pkgs/development/compilers/gcc/10/default.nix | 1 + pkgs/development/compilers/gcc/11/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 58a4dfbe36e1..a1598d3d3f07 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation ({ else "") + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( + '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' ) ''; diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 15d935618712..7b7f542de0cf 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -152,6 +152,7 @@ stdenv.mkDerivation ({ else "") + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( + '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' ) ''; From 9634784777d48ce6352c0a7cd7ebde5abbd02ef3 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Wed, 25 Aug 2021 11:02:11 +0000 Subject: [PATCH 06/62] luajit: disable unwind external on aarch64-darwin see: https://github.com/LuaJIT/LuaJIT/issues/698 --- .../aarch64-darwin-disable-unwind-external.patch | 14 ++++++++++++++ pkgs/development/interpreters/luajit/default.nix | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch diff --git a/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch b/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch new file mode 100644 index 000000000000..dcfb1e9d4e7f --- /dev/null +++ b/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch @@ -0,0 +1,14 @@ +diff --git a/src/Makefile b/src/Makefile +index 2538503f..7e6380da 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -320,7 +320,9 @@ ifeq (Darwin,$(TARGET_SYS)) + $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY) + endif + TARGET_STRIP+= -x ++ ifneq (arm64,$(shell uname -m)) + TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL ++ endif + TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC + TARGET_DYNXLDOPTS= + TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 2a94f9f69e7c..6a163c4b562f 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { luaversion = "5.1"; + # Fix for pcall on aarch64-darwin. + # Upstream issue: https://github.com/LuaJIT/LuaJIT/issues/698 + patches = lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ ./aarch64-darwin-disable-unwind-external.patch ]; + postPatch = '' substituteInPlace Makefile --replace ldconfig : if test -n "''${dontStrip-}"; then From fff205f4a31f2960c4daf8b5810200473b20d53e Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Wed, 25 Aug 2021 11:04:24 +0000 Subject: [PATCH 07/62] neovim: use luajit on aarch64-darwin --- pkgs/top-level/all-packages.nix | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40d4d549004a..02a8ab333909 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28017,32 +28017,7 @@ with pkgs; wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # neovim doesn't build with luajit on aarch64-darwin : - # ./luarocks init - # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: - # no field package.preload['luarocks.core.hardcoded'] - # no file '/private/tmp/nix-build-luarocks-3.2.1.drv-0/source/src/luarocks/core/hardcoded.lua' - # no file './luarocks/core/hardcoded.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/luajit-2.1.0-beta3/luarocks/core/hardcoded.lua' - # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded.lua' - # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded/init.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded/init.lua' - # no file './luarocks/core/hardcoded.so' - # no file '/usr/local/lib/lua/5.1/luarocks/core/hardcoded.so' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks/core/hardcoded.so' - # no file '/usr/local/lib/lua/5.1/loadall.so' - # no file './luarocks.so' - # no file '/usr/local/lib/lua/5.1/luarocks.so' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks.so' - # no file '/usr/local/lib/lua/5.1/loadall.so') - # make: *** [GNUmakefile:57: luarocks] Error 1 - # - # See https://github.com/NixOS/nixpkgs/issues/129099 - # Possibly related: https://github.com/neovim/neovim/issues/7879 - lua = - if (stdenv.isDarwin && stdenv.isAarch64) then lua5_1 else - luajit; + lua = luajit; }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; From d1d5367da79f327007c9069880f8ca23bf966de3 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Wed, 25 Aug 2021 11:12:02 +0000 Subject: [PATCH 08/62] luajit_2_0: 2.1.0-2021-06-08 -> 2.1.0-2021-07-27 --- pkgs/development/interpreters/luajit/2.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 153b11aaa5fc..d66f6af5e751 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2021-06-08"; - rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46"; + version = "2.0.5-2021-07-27"; + rev = "3a654999c6f00de4cb9e61232d23579442e544a0"; isStable = true; - sha256 = "1pdmhk5syp0nir80xcnkf6xy2w5rwslak8hgmjpgaxzlnrjcgs7p"; + sha256 = "0q187vn6bspn9i33hrvfy59mh83nd8jjmik5qkkkc3vls13jxr6z"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); From 737e7314bc754c67fd896e69601189251bf06c09 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Wed, 25 Aug 2021 11:12:32 +0000 Subject: [PATCH 09/62] luajit_2_1: 2.1.0-2021-06-25 -> 2.1.0-2021-08-12 --- pkgs/development/interpreters/luajit/2.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index d11514c07c62..6ac47a6c3359 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2021-06-25"; - rev = "e957737650e060d5bf1c2909b741cc3dffe073ac"; + version = "2.1.0-2021-08-12"; + rev = "8ff09d9f5ad5b037926be2a50dc32b681c5e7597"; isStable = false; - sha256 = "04i7n5xdd1nci4mv2p6bv71fq5b1nkswz12hcgirsxqbnkrlbbcj"; + sha256 = "18wp8sgmiwlslnvgs35cy35ji2igksyfm3f8hrx07hqmsq2d77vr"; } From 13a1ac5421780914bb35569a72956b8c5bf90c54 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Thu, 26 Aug 2021 10:55:08 +0000 Subject: [PATCH 10/62] luajit_2_0: make it unsupported on all aarch64 platform variants --- pkgs/development/interpreters/luajit/2.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index d66f6af5e751..efae91c17bc7 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -6,7 +6,7 @@ callPackage ./default.nix { isStable = true; sha256 = "0q187vn6bspn9i33hrvfy59mh83nd8jjmik5qkkkc3vls13jxr6z"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build - platforms = with lib; filter (p: p != "aarch64-linux") + platforms = with lib; filter (p: !hasPrefix "aarch64-" p) (platforms.linux ++ platforms.darwin); }; } From 477dc156477ef10650ca3a5a5e41be61ade6e3f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 14:27:25 +0000 Subject: [PATCH 11/62] tempo: 1.0.1 -> 1.1.0 --- pkgs/servers/tracing/tempo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index b22e8c29b9ab..3380a0e99d12 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "1.0.1"; + version = "1.1.0"; pname = "tempo"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "tempo"; - sha256 = "sha256-4QrCoz4taNXV13g+Pi0j7pTWy0hLY/qAdTOIMMuDWIA="; + sha256 = "sha256-qKsgcc62HTwl7Usmp8zk4vKDo4XEJnwL+A3hoLhgBkk="; }; vendorSha256 = null; From c460e15a46bb3c0655400e7a309542b0c2f31df1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 27 Aug 2021 09:28:40 -0300 Subject: [PATCH 12/62] fluxcd: 0.16.2 -> 0.17.0 --- .../networking/cluster/fluxcd/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 729f7e472280..9afc9f02c898 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.16.2"; + version = "0.17.0"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; - sha256 = "05khmpbv42wjpkdb4n51pnq678la6hjfhkyy49d0j2kcnvfd1m5p"; + sha256 = "15ffb8damn935sfnqpshiyaazpldjcq411xrcfngpp7ncl9vbgwm"; stripRoot = false; }; in @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-hP2HQI9Oc7IlzVS5r7yqGAgSgqECOSZVe2B3vO2sgKA="; + sha256 = "1pw558d64c6ynqnnadhg8vbi4ql6f5y81l9hpxi0ki5myj2kx6an"; }; - vendorSha256 = "sha256-6ABnX0GV3HmhpUpPWS0bigubRqpXGoikEeQ/LqO6Ybs="; + vendorSha256 = "sha256-FUASe7EQ8YVv3R6fPPLtsvMibe00Ox596GoTyKt0S+E="; nativeBuildInputs = [ installShellFiles ]; @@ -34,6 +34,10 @@ buildGoModule rec { cp -r ${manifests} source/cmd/flux/manifests ''; + # Required to workaround test error: + # panic: mkdir /homeless-shelter: permission denied + HOME="$TMPDIR"; + doInstallCheck = true; installCheckPhase = '' $out/bin/flux --version | grep ${version} > /dev/null From 4f7012bef7c767b46027ef885e6e3c0ad914189d Mon Sep 17 00:00:00 2001 From: kraem Date: Wed, 25 Aug 2021 19:38:43 +0200 Subject: [PATCH 13/62] sonic-pi: wrap sonic-pi-server.rb as standalone executable --- pkgs/applications/audio/sonic-pi/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index c84aa039c52e..f7a3e2e36744 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -102,7 +102,12 @@ mkDerivation rec { dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/sonic-pi" \ - --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2}/bin \ + --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \ + --set AUBIO_LIB "${aubio}/lib/libaubio.so" + makeWrapper \ + $out/app/server/ruby/bin/sonic-pi-server.rb \ + $out/bin/sonic-pi-server \ + --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \ --set AUBIO_LIB "${aubio}/lib/libaubio.so" ''; From bfeebdf0fac06f13927a8f7d62ba5ba49109d1aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 22:06:59 +0000 Subject: [PATCH 14/62] sstp: 1.0.13 -> 1.0.15 --- pkgs/tools/networking/sstp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 97e35949b15a..2fb82871c2b7 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sstp-client"; - version = "1.0.13"; + version = "1.0.15"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz"; - sha256 = "06rjyncmgdy212xf9l9z6mfh4gdmgk7l4y841gb8lpbrl3y5h4ln"; + sha256 = "sha256-hISqUfv75Big661YrSCo7hxG7XH4AL4YvNI7Qua6rWQ="; }; patchPhase = From 53b917498bc2887c0a6f99a61fbb8fe1665e574c Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sat, 28 Aug 2021 06:56:27 -0600 Subject: [PATCH 15/62] winetricks: 20210206 -> 20210825 --- pkgs/misc/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 59a24c106654..9d505ae34038 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -75,8 +75,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20210206"; - sha256 = "sha256-tnwownY9A05nYlkYaoCQZjeGGHuE+kJYzA7MPE2bXnQ="; + version = "20210825"; + sha256 = "sha256-exMhj3dS8uXCEgOaWbftaq94mBOmtZIXsXb9xNX5ha8="; owner = "Winetricks"; repo = "winetricks"; rev = version; From a693aca24d35d1f560b47c74820ac4a779b024ef Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 28 Aug 2021 20:50:44 +0100 Subject: [PATCH 16/62] pax-utils: 1.2.8 -> 1.3.3 --- pkgs/os-specific/linux/pax-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 40159cd2acd8..2e757b8d2a1d 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.2.8"; + version = "1.3.3"; src = fetchurl { url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-urTIhG4dLMNmnPqSMdIdszWEHX1Y+eGc0Jn+bOYmsVc="; + sha256 = "sha256-7sp/vZi8Zr6tSncADCAl2fF+qCAbhCRYgkBs4AubaxQ="; }; makeFlags = [ "PREFIX=$(out)" ]; From e1ce3ce0c457ef2e46e66947f657705793c51707 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 30 Aug 2021 18:21:26 -0300 Subject: [PATCH 17/62] tfk8s: 0.1.6 -> 0.1.7 --- pkgs/tools/misc/tfk8s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index 8ca102444a9d..71c6129b0ef9 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tfk8s"; - version = "0.1.6"; + version = "0.1.7"; tag = "v${version}"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; rev = tag; - sha256 = "sha256-pjgacKyOAlaFqHCKcLmjTl/uWpjMzkHH0UcaIEb+IZI="; + sha256 = "0mkfggwjrsp0rzh7ll6nmp9kqcw4fl8q81vk67z5mbd276dkyxrb"; }; vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; From 7a750b53e53804b971d9b197473b2dc460e28a47 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Tue, 31 Aug 2021 17:17:56 +0800 Subject: [PATCH 18/62] pipes-rs: init at 1.4.4 --- pkgs/misc/screensavers/pipes-rs/default.nix | 33 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/misc/screensavers/pipes-rs/default.nix diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/misc/screensavers/pipes-rs/default.nix new file mode 100644 index 000000000000..5e55f13c2b43 --- /dev/null +++ b/pkgs/misc/screensavers/pipes-rs/default.nix @@ -0,0 +1,33 @@ +{ rustPlatform, fetchFromGitHub, lib }: + +rustPlatform.buildRustPackage rec { + pname = "pipes-rs"; + version = "1.4.4"; + + src = fetchFromGitHub { + owner = "lhvy"; + repo = pname; + rev = "v${version}"; + sha256 = "drqoKkju1EkcWGNnliEah37wVhtU2ddJSOZ5MnCNbuo="; + }; + + cargoSha256 = "0j6b5697ichw4ly7lsj3nbm0mw6bvjma81nd0fl7v1ra9kbmsysk"; + + doInstallCheck = true; + + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "${pname} ${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + + meta = with lib; { + description = "An over-engineered rewrite of pipes.sh in Rust"; + homepage = "https://github.com/lhvy/pipes-rs"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.vanilla ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982122bf59ed..d8d0d421b0fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21947,6 +21947,8 @@ with pkgs; pipes = callPackage ../misc/screensavers/pipes { }; + pipes-rs = callPackage ../misc/screensavers/pipes-rs { }; + pipework = callPackage ../os-specific/linux/pipework { }; pktgen = callPackage ../os-specific/linux/pktgen { }; From 38d0c7c35a407cff1ce95621ed68ac72090dc18f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Aug 2021 17:59:06 +0000 Subject: [PATCH 19/62] python38Packages.google-cloud-speech: 2.7.0 -> 2.8.0 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 80f53182843b..7c414cc1321f 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "3c2d533a524d35c036d0387e8b2e0c7ce6aa7cdaa80392ec7fe68bce6cd2f152"; + sha256 = "3750fd988082b880ed1ec6f3d59c4f29f4cd0df3804a58d6c151d4bf15d3a597"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From f42ac9bd1f3bc223507c34b28d55eb41cd5315f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Aug 2021 18:04:02 +0000 Subject: [PATCH 20/62] python38Packages.google-cloud-spanner: 3.8.0 -> 3.9.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index c6e1021f3430..e84e7cc06dbf 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.8.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K8K0JjKHWojSVFnUr3GhJP4gflYTXH6V7Mywu4hTvRQ="; + sha256 = "53fe3d903363fb17db155fd05f5356d9b310a519fbebd53903aa426a31cad706"; }; propagatedBuildInputs = [ From f4333041545ed41ba350f40b6cf5588e7982f7c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Aug 2021 19:31:44 +0000 Subject: [PATCH 21/62] python38Packages.google-cloud-os-config: 1.3.2 -> 1.4.0 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index d86a40d57b6a..33bbb00c306e 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sC80RGY4lDVebpoz2hDGH5WfyrAjaOKTSDp/BhGmZS0="; + sha256 = "d12622901fb2ef5b736606fd00e77900105944c35d737ff794a59fd9a3d71325"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From b00e4cb942648fef36a30617e9fc4197652e10d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Aug 2021 19:36:37 +0000 Subject: [PATCH 22/62] python38Packages.google-cloud-kms: 2.5.0 -> 2.6.0 --- pkgs/development/python-modules/google-cloud-kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 9992dc7bc76f..98c4fc55044d 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OuvpnIJeG+O+2Teopq8FYJOHIyi1V3RdlmJEq/fFSxM="; + sha256 = "44be4673ad0a327ea6447967216e124fcd4c7487ca886f000446f6db209988af"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; From f452146df8a5b6ac8920ddecbcec41a817dffff0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 22:58:52 +0200 Subject: [PATCH 23/62] cowpatty: 4.6 -> 4.8 --- pkgs/tools/security/cowpatty/default.nix | 50 +++++++++++++++++------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix index 4cd420650f3b..934b31a35da6 100644 --- a/pkgs/tools/security/cowpatty/default.nix +++ b/pkgs/tools/security/cowpatty/default.nix @@ -1,26 +1,48 @@ -{ lib, stdenv, fetchurl, openssl, libpcap +{ lib +, stdenv +, clang +, fetchFromGitHub +, installShellFiles +, openssl +, libpcap }: -with lib; - stdenv.mkDerivation rec { pname = "cowpatty"; - version = "4.6"; + version = "4.8"; - buildInputs = [ openssl libpcap ]; - - src = fetchurl { - url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz"; - sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd"; + src = fetchFromGitHub { + owner = "joswr1ght"; + repo = pname; + rev = version; + sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s"; }; - installPhase = "make DESTDIR=$out BINDIR=/bin install"; + nativeBuildInputs = [ + clang + installShellFiles + ]; - meta = { + buildInputs = [ + openssl + libpcap + ]; + + makeFlags = [ + "DESTDIR=$(out)" + "BINDIR=/bin" + ]; + + postInstall = '' + installManPage cowpatty.1 + installManPage genpmk.1 + ''; + + meta = with lib; { description = "Offline dictionary attack against WPA/WPA2 networks"; - license = licenses.gpl2; - homepage = "https://www.willhackforsushi.com/?page_id=50"; - maintainers = with maintainers; [ nico202 ]; + homepage = "https://github.com/joswr1ght/cowpatty"; + license = licenses.bsd3; + maintainers = with maintainers; [ nico202 fab ]; platforms = platforms.linux; }; } From 5acfdf2ce072838c475c9929462b75c0bb205073 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Aug 2021 21:23:14 +0000 Subject: [PATCH 24/62] python38Packages.google-cloud-firestore: 2.3.0 -> 2.3.1 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 8c4b964b2b83..00276d581761 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gc68S+utdcO2OSCRAxyTCjnXBfUxWN/D7PfNg3cUzQ8="; + sha256 = "8f8e513cae105ba17c4d3949091bd816cbf6075c6ac91b1f7acb4d40359f8a5a"; }; propagatedBuildInputs = [ From d84b3e685deeede364adb1ee5f1c0d1398c48e5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Aug 2021 21:28:10 +0000 Subject: [PATCH 25/62] python38Packages.google-cloud-monitoring: 2.4.2 -> 2.5.0 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index c2a08fd7bee5..9a5469d9891a 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PQjTAqSzjCBPH58nZHAc6Oa12NSDVvt2E0ZHewTFZfY="; + sha256 = "d3d436fab7f50f69bdd47655871ac923e4dcbaf8538808bbe31cf0a3cbdf3514"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From 5c3289c3580a01f00a28ec18d0b093a1c7aa4656 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Aug 2021 21:35:39 +0000 Subject: [PATCH 26/62] python38Packages.google-cloud-translate: 3.3.2 -> 3.4.0 --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index f750e7bd54ef..697489602daf 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.3.2"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XkHNIu7KWPUpgBceIBqzWgYPCay+Ud1/nM0KbeRnHk0="; + sha256 = "7da158734db646867deb125c144a7a1692a48a134692c4dc54ba420f89db64ae"; }; propagatedBuildInputs = [ From 5f16358e015926e2cb980102cd1d160b8a3ae28a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 1 Sep 2021 04:52:18 -0400 Subject: [PATCH 27/62] python3Packages.uproot: 4.0.8 -> 4.1.1 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 8a687534005e..120a0fc436fd 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.0.8"; + version = "4.1.1"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; rev = version; - sha256 = "sha256-E9BRgyMz+3Xl8Q1zsnVtvW44FXTqs29U1oK4te0myq4="; + sha256 = "sha256-qh/rtZDE6L1IQJjzE+ns0eSG1BKbES7s3A/35hc+tXg="; }; propagatedBuildInputs = [ From 4cacbf474659a9bb5af4ad8a8474f2dfda2067cf Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 1 Sep 2021 12:11:44 +0200 Subject: [PATCH 28/62] fig2dev: 3.2.8a -> 3.2.8b This appears to fix a serie of buffer overflow. https://sourceforge.net/p/mcj/fig2dev/ci/8f11139e53174e90e5132cc7633327ae92b65322/ --- pkgs/applications/graphics/fig2dev/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 31d14185dcd9..8fa85803bfd8 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , ghostscript , libpng , makeWrapper @@ -14,22 +13,13 @@ stdenv.mkDerivation rec { pname = "fig2dev"; - version = "3.2.8a"; + version = "3.2.8b"; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; - sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; + sha256 = "1jv8rg71dsy00lpg434r5zqs5qrg8mxqvv2gpcjjvmzsm551d2j1"; }; - patches = [ - (fetchpatch { - name = "CVE-2021-3561.patch"; - # Using Debian patch since it is not possible to download it directly from Sourceforge - url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch"; - sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpng ]; From 10ba2633e48d31e03cd9d666e6a7e0ec3b0c8b73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Sep 2021 11:17:35 +0000 Subject: [PATCH 29/62] python38Packages.cogapp: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/cogapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index c996c23d9ae8..022ab5a0b29c 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "5e5da2bcfc4e4750c66cecb80ea4eaed1ef4fddd3787c989d4f5bfffb1152d6a"; + sha256 = "c43e374ee5ca2a35fbc68556f598bd8578eabe8a890487980bba56945b5ce9c6"; }; # there are no tests From 1e93f306ad3d865c36e5765b3a14197acb5562f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Sep 2021 13:22:48 +0000 Subject: [PATCH 30/62] python38Packages.google-resumable-media: 2.0.0 -> 2.0.1 --- .../python-modules/google-resumable-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index c76cd53a8296..67ee4cb22d4c 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CUwDgXNGSayTkIPqODO9I5t/upBNJGNC0SaJhAKfIWc="; + sha256 = "cac55be7802e3424b8f022d8a572a8349327e7ce8494eee5e0f4df02458b1813"; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; From 25bc11e43b5be36fc205f08739f53f8adc191fbb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Sep 2021 15:03:58 +0000 Subject: [PATCH 31/62] python38Packages.exchangelib: 4.5.0 -> 4.5.1 --- pkgs/development/python-modules/exchangelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index c568583dd378..d278b8bcf410 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.5.0"; + version = "4.5.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MtWcqsbKls9I7Oj0UlJzWtHsNfAxk4+ojSgK50ljEfs="; + sha256 = "0pj6rcink4awjyq1v30camilqr03kd0sb2p03fk9v4lm63d8w28f"; }; propagatedBuildInputs = [ From 5ea6fde01160311e88859343461c7147a114bbfe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Sep 2021 19:48:43 +0000 Subject: [PATCH 32/62] python38Packages.numpy-stl: 2.16.0 -> 2.16.2 --- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index f9c27b4c79a3..bc8f6159bbba 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.16.0"; + version = "2.16.2"; src = fetchPypi { inherit pname version; - sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742"; + sha256 = "3e635b6fb6112a3c5e00e9e20eedab93b9b0c45ff1cc34eb7bdc0b3e922e2d77"; }; checkInputs = [ pytest pytest-runner ]; From d3a994ea5f4e8b80de4eeae70fca58f07d2144ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Sep 2021 23:33:09 +0000 Subject: [PATCH 33/62] python38Packages.python-nomad: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/python-nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index 4bb12ab7237c..d0fac3a2abf9 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-nomad"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0ivkfdrmb4wpyawvwrgm3jvx6hn49vqjpwbkmkmamigghqqwacx3"; + sha256 = "67731d050472923581c43a39a8f01567468e8b3c8e83465b762c99eb0e5e23bc"; }; propagatedBuildInputs = [ requests ]; From c7b320cc3943b5c4fdd5408628bdbe6f8a3f1498 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Sep 2021 08:53:02 +0000 Subject: [PATCH 34/62] python38Packages.google-cloud-bigquery: 2.25.1 -> 2.26.0 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 4895661cb421..89d0c1f873dc 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.25.1"; + version = "2.26.0"; src = fetchPypi { inherit pname version; - sha256 = "5ecf7c802cc6cf9cd79e79924616d8b7d35ba026f3313a4d90b8b4a28c72d93d"; + sha256 = "15ca1f9c8165b584c2d593620354cd3b17c007e87cfd1abd1eebd2c08eb5d109"; }; propagatedBuildInputs = [ From 5111ac576445177a7b0edf9a53960f95b0dfb130 Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 3 Sep 2021 08:43:35 +0530 Subject: [PATCH 35/62] jibri: init at 8.0-93-g51fe7a2 --- pkgs/servers/jibri/default.nix | 41 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/servers/jibri/default.nix diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix new file mode 100644 index 000000000000..39377e09964b --- /dev/null +++ b/pkgs/servers/jibri/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, dpkg, jre_headless, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "jibri"; + version = "8.0-93-g51fe7a2"; + src = fetchurl { + url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; + sha256 = "1w78aa3rfdc4frb68ymykrbazxqrcv8mcdayqmcb72q1aa854c7j"; + }; + + dontBuild = true; + nativeBuildInputs = [ dpkg makeWrapper ]; + unpackCmd = "dpkg-deb -x $src debcontents"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,opt/jitsi/jibri,etc/jitsi/jibri} + mv etc/jitsi/jibri/* $out/etc/jitsi/jibri/ + mv opt/jitsi/jibri/* $out/opt/jitsi/jibri/ + + makeWrapper ${jre_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" + + runHook postInstall + ''; + + meta = with lib; { + description = "JItsi BRoadcasting Infrastructure"; + longDescription = '' + Jibri provides services for recording or streaming a Jitsi Meet conference. + It works by launching a Chrome instance rendered in a virtual framebuffer and capturing and + encoding the output with ffmpeg. It is intended to be run on a separate machine (or a VM), with + no other applications using the display or audio devices. Only one recording at a time is + supported on a single jibri. + ''; + homepage = "https://github.com/jitsi/jibri"; + license = licenses.asl20; + maintainers = teams.jitsi.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 454180cbf111..562d985335f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19828,6 +19828,8 @@ in jetty = callPackage ../servers/http/jetty { }; + jibri = callPackage ../servers/jibri { }; + jicofo = callPackage ../servers/jicofo { }; jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; From c418c4f8c6d4fc35c6381e5da430e2b17f2c3145 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 3 Sep 2021 14:34:18 +0000 Subject: [PATCH 36/62] mercurial: 5.8 -> 5.9.1 --- .../version-management/mercurial/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 128b70c38e85..3780be96fd6f 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -13,26 +13,13 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.8"; + version = "5.9.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw"; + sha256 = "09wzyhyajy1dbp5kxkmvs9x8jk964wri19p5jgf83mv27i1zkvrj"; }; - patches = [ - # https://phab.mercurial-scm.org/D10638, needed for below patch to apply - (fetchpatch { - url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c365850b611490a5fdb235eb1cea310a542c2f84"; - sha256 = "1gn3xvahbjdhbglffqpmj559w1bkqqsk70wqcanwv7nh972aqy9g"; - }) - # https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514 - (fetchpatch { - url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c8f62920f07a40af3403ba9aefa1dac8a97d53ea"; - sha256 = "1kw0xjg2c4jby0ncarjvpa5qafsyl1wzbk6jxls4hnxlxdl53nmn"; - }) - ]; - format = "other"; passthru = { inherit python; }; # pass it so that the same version can be used in hg2git @@ -40,7 +27,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd"; + sha256 = "1f7q0kmp46rphw38rlzh1yvpn3rdjdnzzbxzjkrjks8n1gm8baca"; sourceRoot = "${pname}-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; From ed471ccf22e3bc11de7f67f7ba89c948d20003f0 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 3 Sep 2021 14:34:28 +0000 Subject: [PATCH 37/62] tortoisehg: 5.8 -> 5.9 --- pkgs/applications/version-management/tortoisehg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 73d8f3aa5ec2..3e1b6e4cd8cb 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -4,11 +4,11 @@ python3Packages.buildPythonApplication rec { pname = "tortoisehg"; - version = "5.8"; + version = "5.9"; src = fetchurl { url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3"; + sha256 = "1y8nb2b9j9qx11k1wrb9hydc94dgbsqx4yf2bv8y878hqmk1z57a"; }; # Extension point for when thg's mercurial is lagging behind mainline. From a53cae021ab54d9bcbdadffb98a063ef36ef3858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 3 Sep 2021 10:48:50 -0500 Subject: [PATCH 38/62] =?UTF-8?q?android-studio:=202020.3.1.23=20=E2=86=92?= =?UTF-8?q?=202020.3.1.24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f31265c2e4c1..502c68d3269f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.23"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "06xjdibb5lxiga3jg9akmvbazjwk11akyhy3g4pc562hcifsa5sk"; + version = "2020.3.1.24"; # "Android Studio Arctic Fox (2020.3.1)" + sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l"; }; betaVersion = { version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" From cfd5c58596a5d38459f0c4245598c21fc63282dc Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 3 Sep 2021 13:16:46 -0400 Subject: [PATCH 39/62] vimPlugins.crates-nvim: init at 2021-09-03 --- 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 f7bd56c5c9bf..a9f19ed082e4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1000,6 +1000,18 @@ final: prev: meta.homepage = "https://github.com/nixprime/cpsm/"; }; + crates-nvim = buildVimPluginFrom2Nix { + pname = "crates.nvim"; + version = "2021-09-03"; + src = fetchFromGitHub { + owner = "saecki"; + repo = "crates.nvim"; + rev = "ffec425ab2052850f93e9617f308b26d625e85fc"; + sha256 = "06qjyqpbfv0dj7gpqdrx7dzm3j554n90ic6i7ljb4nh16v17k0dz"; + }; + meta.homepage = "https://github.com/saecki/crates.nvim/"; + }; + csapprox = buildVimPluginFrom2Nix { pname = "csapprox"; version = "2013-07-27"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7b3731d0b6ac..be7d52305fc5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -622,6 +622,7 @@ rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim saadparwaiz1/cmp_luasnip +saecki/crates.nvim sainnhe/edge sainnhe/gruvbox-material sainnhe/sonokai From 08fee95dce40525555d902f740da05d2b53091e5 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Fri, 3 Sep 2021 14:50:53 -0600 Subject: [PATCH 40/62] heisenbridge: 1.0.0 -> 1.0.1 --- pkgs/servers/heisenbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index f4ea4be0060a..ac957f5e38ff 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "hifi"; repo = "heisenbridge"; rev = "v${version}"; - sha256 = "sha256-DmYGP50GsthxvhXUMkwV+mvcfCjCMu90VMe5woNvf1w="; + sha256 = "sha256-PaLOFZTeX7HxBiOc94x5sHuJYKRF1fR9ShmQN7IPuuo="; }; propagatedBuildInputs = with python3Packages; [ From 5f84dad75d24322ffe361a635e76839eee4aaa1f Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Sat, 4 Sep 2021 12:50:41 +0200 Subject: [PATCH 41/62] kak-lsp: 10.0.0 -> 11.0.0 --- pkgs/tools/misc/kak-lsp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 86d858153746..bd955b8136ec 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "10.0.0"; + version = "11.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SmK4G9AoKGqKGbXucn5AO5DTOeVNq3gCBGvDTIJQgRU="; + sha256 = "198y2k3vi8dh9kfqgl7vpgkxvjlfvryi9c8hmb43m0lpwsja0010"; }; - cargoSha256 = "sha256-iY5xT8e/gRN/mBT9v5LhMcl9g1/SyrH/glPBP+toZ9o="; + cargoSha256 = "0sv1a2k5rcf4hl1w50mh041r3w3nir6avyl6xa3rlcc7cy19q21y"; buildInputs = lib.optional stdenv.isDarwin [ Security ]; meta = with lib; { description = "Kakoune Language Server Protocol Client"; - homepage = "https://github.com/ul/kak-lsp"; + homepage = "https://github.com/kak-lsp/kak-lsp"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.spacekookie ]; }; From 287383c61e51b1e11f933550e4a9acfe9d3477c5 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 4 Sep 2021 19:57:51 +0200 Subject: [PATCH 42/62] emacs.pkgs.bqn-mode: init at unstable-2021-09-04 --- .../emacs/elisp-packages/manual-packages.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 015a8e27f8e1..1140eb42c9c8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -78,6 +78,31 @@ }; }; + # may be part of MELPA in the future, see + # https://github.com/mlochbaum/BQN/issues/10#issuecomment-912982874 + bqn-mode = self.trivialBuild { + pname = "bqn-mode"; + version = "unstable-2021-09-04"; + + src = pkgs.fetchFromGitHub { + owner = "mlochbaum"; + repo = "BQN"; + rev = "e623a2fcafdf5fd6c8d31570175284805c4f34d9"; + sha256 = "1a2lpxy3bak4724r0ns4la5d0j6484ngi73kcwp82vgbbpk7lcrp"; + }; + + postUnpack = '' + sourceRoot="$sourceRoot/editors/emacs" + ''; + + meta = { + description = "Emacs mode for BQN"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.sternenseemann ]; + homepage = "https://mlochbaum.github.io/BQN/editors/index.html"; + }; + }; + ghc-mod = melpaBuild { pname = "ghc"; version = pkgs.haskellPackages.ghc-mod.version; From c879a416bbcf94f2895bc80ec970f8dd2b4f3cf8 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Mon, 12 Jul 2021 19:01:40 +0300 Subject: [PATCH 43/62] super-slicer: 2.3.56.5 -> 2.3.56.8 --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 2bf28aa892f5..bc9b83178da0 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; - version = "2.3.56.5"; + version = "2.3.56.8"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -10,13 +10,15 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-Gg+LT1YKyUGNJE9XvWE1LSlIQ6Vq5GfVBTUw/A7Qx7E="; + sha256 = "sha256-em0OgrcPaV2VYM8DpvtVJjgdojStMF/ROUEtZ8iLZfo="; rev = version; fetchSubmodules = true; }; # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; + dontStrip = true; + separateDebugInfo = true; # See https://github.com/supermerill/SuperSlicer/issues/432 cmakeFlags = super.cmakeFlags ++ [ From 2837f7a6944432c7e38365681859635dd81288dc Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sat, 4 Sep 2021 16:22:30 -0700 Subject: [PATCH 44/62] python3Packages.deprecated: remove unused tox dependency --- pkgs/development/python-modules/deprecated/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index c6e309335289..4cb4805b4ca4 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -1,5 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, - wrapt, pytest, tox }: +{ lib, fetchPypi, buildPythonPackage, wrapt, pytest }: buildPythonPackage rec { pname = "Deprecated"; From 96f5319abb2195c877453696c6a906c0b29df3d3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 4 Sep 2021 21:09:53 -0400 Subject: [PATCH 45/62] hck: 0.6.1 -> 0.6.2 --- pkgs/tools/text/hck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix index ab8f461d7616..46c786693a8e 100644 --- a/pkgs/tools/text/hck/default.nix +++ b/pkgs/tools/text/hck/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "1l1v02rvb30bcq13ww56k04nc231f7q73zgf281974d6s2qwjdwh"; + sha256 = "1xjp56asfn37kr0fsrjkil20nf372q70cijqb5ll2sq2zwjnyyzn"; }; - cargoSha256 = "1isgbzi8afbr2xkw70nxakwcb5zjzw28rgp4p7ammhfxjjxw7y93"; + cargoSha256 = "12n33gwxcym5z5n762wmzcck4zmmn42kh04nwpdb3az4apghdp3z"; nativeBuildInputs = [ cmake ]; From 2d1908ac0b1c32cfa2e793212b9f10d0f7be75ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Sep 2021 04:07:08 +0000 Subject: [PATCH 46/62] xplr: 0.14.5 -> 0.14.7 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index b84da33df40d..9ac39d722b56 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.14.5"; + version = "0.14.7"; src = fetchCrate { inherit pname version; - sha256 = "00kgxc4pn07p335dl3d53shiyw4f4anw64qc8axz9nspdq734nj5"; + sha256 = "sha256-rGU9Jf+MHDs3pnuddqxLaWc8YqL+Ka7Rex+fTuU62sM="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "1wmc4frjllj8dgcg4yw4cigm4mhq807pmp3l3ysi70q490g24gwh"; + cargoSha256 = "sha256-GwepsY7PcWjKZpJ7H4D9vtXwd2XGFgG1c+QvinMAG4Q="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From d5327b6de285eaff4d525daa8203467c990f61db Mon Sep 17 00:00:00 2001 From: Manoj Karthick Date: Sat, 4 Sep 2021 23:24:28 -0700 Subject: [PATCH 47/62] reddsaver: 0.3.3 -> 0.4.0 --- pkgs/applications/misc/reddsaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 23fddf3b7ed6..7bcf774b0116 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "reddsaver"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "reddsaver"; rev = "v${version}"; - sha256 = "1czsy1bb0ja650sndwzq9rcbbhcci7s7ablw0agaynhi403shavv"; + sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf"; }; - cargoSha256 = "0wr6y7mfffaqdh6i5nqhx692dih159121sm6k0i37wcdvxhvd51z"; + cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From 4a49353e9b2bd896c13c826a70dc49686363cb74 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 5 Sep 2021 09:05:50 +0200 Subject: [PATCH 48/62] rdfind: 1.4.1 -> 1.5.0 --- pkgs/tools/filesystems/rdfind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 08562aed3635..7be3bed48bf2 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rdfind"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz"; - sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih"; + sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21"; }; buildInputs = [ nettle ]; From e507ca593330a24f0de49cdeb60d4074e5bb3ab9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 5 Sep 2021 16:34:53 +0800 Subject: [PATCH 49/62] timetable: drop package --- .../applications/office/timetable/default.nix | 63 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 pkgs/applications/office/timetable/default.nix diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix deleted file mode 100644 index 9c9df892a047..000000000000 --- a/pkgs/applications/office/timetable/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, nix-update-script -, glib -, gtk3 -, vala -, json-glib -, libgee -, meson -, ninja -, pkg-config -, pantheon -, python3 -, wrapGAppsHook -}: - - -stdenv.mkDerivation rec { - pname = "timetable"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "lainsce"; - repo = pname; - rev = version; - sha256 = "12c8kdrbz6x2mlrvr0nq9y5khj0qiiwlxf7aqc2z3dnrawjgy1rb"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - python3 - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - json-glib - libgee - pantheon.granite - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "Plot out your own timetable for the week and organize it"; - homepage = "https://github.com/lainsce/timetable"; - maintainers = [ maintainers.xiorcale ] ++ pantheon.maintainers; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8ea5ac90350a..ffe10c44bb95 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -893,6 +893,7 @@ mapAliases ({ tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03 timescale-prometheus = promscale; # added 2020-09-29 + timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05 tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16 tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16 tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7760da4a00b9..9602f3d6fda9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9478,8 +9478,6 @@ with pkgs; timetrap = callPackage ../applications/office/timetrap { }; - timetable = callPackage ../applications/office/timetable { }; - timekeeper = callPackage ../applications/office/timekeeper { }; timezonemap = callPackage ../development/libraries/timezonemap { }; From c32fa3f108532b19b6482078dc10b99f752001f2 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 5 Sep 2021 10:45:38 +0200 Subject: [PATCH 50/62] intel-gmmlib: add x686-linux to meta.platforms (#136738) * intel-gmmlib: set meta.platforms ot linux to unbreak it on i686 * Update pkgs/development/libraries/intel-gmmlib/default.nix Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> --- pkgs/development/libraries/intel-gmmlib/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 23e4b2b3508d..71c1efe3f914 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , cmake }: @@ -7,9 +9,9 @@ stdenv.mkDerivation rec { version = "21.2.2"; src = fetchFromGitHub { - owner = "intel"; - repo = "gmmlib"; - rev = "${pname}-${version}"; + owner = "intel"; + repo = "gmmlib"; + rev = "${pname}-${version}"; sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v"; }; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { and buffer management for the Intel(R) Graphics Compute Runtime for OpenCL(TM) and the Intel(R) Media Driver for VAAPI. ''; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ primeos ]; }; } From 219d3e437e55741d7d8e2ce1265ba48b0e05afd0 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 5 Sep 2021 10:46:32 +0200 Subject: [PATCH 51/62] sasquatch: support cross-compilation --- pkgs/tools/filesystems/sasquatch/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index b14dc620e421..238223c4981e 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -48,7 +48,12 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=\${out}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" ] + makeFlags = [ + "XZ_SUPPORT=1" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + "AR=${stdenv.cc.targetPrefix}ar" + ] ++ lib.optional lz4Support "LZ4_SUPPORT=1"; meta = with lib; { From b2480d258065a34a4d8ee50f3e5e53b4cea8ed9a Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 5 Sep 2021 10:48:02 +0200 Subject: [PATCH 52/62] qownnotes: 21.7.4 -> 21.8.12 (#135941) * qownnotes: 21.7.4 -> 21.8.12 * Update pkgs/applications/office/qownnotes/default.nix Co-authored-by: Sandro --- pkgs/applications/office/qownnotes/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 4f3fde81e980..c0d1c8a2a4e5 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -1,15 +1,17 @@ -{ mkDerivation, lib, stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets, qtx11extras -, qtwayland }: +{ mkDerivation, lib, stdenv, fetchurl +, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets +, qtx11extras, qtwayland +}: mkDerivation rec { pname = "qownnotes"; - version = "21.7.4"; + version = "21.8.12"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "3957dc623b419582ef7ccc5cb04b8f97bed4e96e8ecc2e99bef9dca7ce255b8e"; + sha256 = "85fbfb6288411ed585de85dd2cfcf3b3308eb4634824b96c5842d091da4cd476"; }; nativeBuildInputs = [ qmake qttools ]; From 434b9bde936866887c7fa9f9fa7c080d56e352eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 10:50:11 +0200 Subject: [PATCH 53/62] rdfind: clarify license --- pkgs/tools/filesystems/rdfind/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 7be3bed48bf2..912456154744 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rdfind.pauldreik.se/"; description = "Removes or hardlinks duplicate files very swiftly"; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.wmertens ]; platforms = platforms.all; }; From 29cd399d805c66510c097fe1f79c142c9ddc504d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 10:55:58 +0200 Subject: [PATCH 54/62] python3Packages.python-nomad: add pythonImportsCheck --- pkgs/development/python-modules/python-nomad/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index d0fac3a2abf9..1cbb3a3de9d5 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { # Tests require nomad agent doCheck = false; + pythonImportsCheck = [ "nomad" ]; + meta = with lib; { description = "Python client library for Hashicorp Nomad"; homepage = "https://github.com/jrxFive/python-nomad"; From b85d91762a73624ce283528d7201a5e0785dd5e6 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 5 Sep 2021 10:56:49 +0200 Subject: [PATCH 55/62] cramfsprogs: support cross-compilation --- pkgs/os-specific/linux/cramfsprogs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/cramfsprogs/default.nix b/pkgs/os-specific/linux/cramfsprogs/default.nix index 3f3e8a075b19..59fbfed1b728 100644 --- a/pkgs/os-specific/linux/cramfsprogs/default.nix +++ b/pkgs/os-specific/linux/cramfsprogs/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { # So patch the "missing include" bug ourselves. patches = [ ./include-sysmacros.patch ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' install --target $out/bin -D cramfsck mkcramfs ''; From 4dd783a187f71a6735867820233cd50e62f610b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 11:13:58 +0200 Subject: [PATCH 56/62] pax-utils: clarify license --- pkgs/os-specific/linux/pax-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 2e757b8d2a1d..db5763029977 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { binary files. ''; homepage = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice joachifm ]; }; From d705ef6521cfc764d9028d0ab8f51618c37ec69a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 11:20:57 +0200 Subject: [PATCH 57/62] sstp: clarify license --- pkgs/tools/networking/sstp/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 2fb82871c2b7..63b3cc21e0c4 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -22,13 +22,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libevent openssl ppp ]; - meta = { + meta = with lib; { description = "SSTP client for Linux"; homepage = "http://sstp-client.sourceforge.net/"; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.ktosiek ]; - license = lib.licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ ktosiek ]; + license = licenses.gpl2Plus; }; } From 420797fe78cef3c38e724492a32230020f37ce42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 11:22:45 +0200 Subject: [PATCH 58/62] sstp: rename phase --- pkgs/tools/networking/sstp/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 63b3cc21e0c4..151538462a35 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -9,11 +9,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-hISqUfv75Big661YrSCo7hxG7XH4AL4YvNI7Qua6rWQ="; }; - patchPhase = - '' - sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c - sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c - ''; + postPatch = '' + sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c + sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c + ''; configureFlags = [ "--with-openssl=${openssl.dev}" From 51c4e675e293a172ad8d3a84ef99497067841601 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 5 Sep 2021 08:11:28 -0400 Subject: [PATCH 59/62] google-cloud-sdk: add meta.mainProgram (#136713) --- pkgs/tools/admin/google-cloud-sdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 7e4316bf52e6..b4dfcd17aeb3 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -125,5 +125,6 @@ in stdenv.mkDerivation rec { homepage = "https://cloud.google.com/sdk/"; maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + mainProgram = "gcloud"; }; } From ca6cb24b966832c851c01754e069edfe7bccaa77 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 27 Aug 2021 15:36:04 +0200 Subject: [PATCH 60/62] foot: 1.8.2 -> 1.9.0 https://codeberg.org/dnkl/foot/releases/tag/1.9.0 Main change requiring intervention from our side is the new alternative terminfo install location used by foot in order to coexist with ncurses' install location. We want to keep using the normal terminfo install location: * ncurses and foot have separate store paths so there won't be an actual conflict * buildEnv etc. can deal with file conflicts when building the system path Since foot now sets the TERMINFO environment variable to its terminfo directory, we can stop installing foot's terminfo globally always (via propagated-user-env-package) instead `foot.terminfo` now only needs to be installed on remote systems were you want to have the proper terminfo for foot. We'll need to see if this works reliably in the future. NixOS sets TERMINFO_DIRS, so there may be packages that have been patched to respect that, but not TERMINFO. --- .../terminal-emulators/foot/default.nix | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 8e7bbed90978..ec75454514c4 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitea , fetchurl -, fetchpatch , runCommand , fcft , freetype @@ -28,7 +27,7 @@ }: let - version = "1.8.2"; + version = "1.9.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -89,6 +88,8 @@ let # using a compiler which foot's PGO build supports (clang or gcc) doPgo = allowPgo && (stdenv.hostPlatform == stdenv.buildPlatform) && compilerName != "unknown"; + + terminfoDir = "${placeholder "terminfo"}/share/terminfo"; in stdenv.mkDerivation rec { pname = "foot"; @@ -99,18 +100,9 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h"; + sha256 = "0mkzq5lbgl5qp5nj8sk5gyg9hrrklmbjdqzlcr2a6rlmilkxlhwm"; }; - patches = [ - # Fixes PGO builds with clang - (fetchpatch { - url = "https://codeberg.org/dnkl/foot/commit/2acd4b34c57659d86dca76c58e4363de9b0a1f17.patch"; - sha256 = "13xi9ppaqx2p88cxbh6801ry9ral70ylh40agn6ij7pklybs4d7s"; - includes = [ "pgo/pgo.c" ]; - }) - ]; - depsBuildBuild = [ pkg-config ]; @@ -154,7 +146,15 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Db_lto=true" - "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo" + # Prevent foot from installing its terminfo file into a custom location, + # we need to do this manually in postInstall. + # See https://codeberg.org/dnkl/foot/pulls/673, + # https://codeberg.org/dnkl/foot/src/tag/1.9.0/INSTALL.md#options + "-Dterminfo=disabled" + # Ensure TERM=foot is used + "-Ddefault-terminfo=foot" + # Tell foot what to set TERMINFO to + "-Dcustom-terminfo-install-location=${terminfoDir}" ]; # build and run binary generating PGO profiles, @@ -174,11 +174,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "terminfo" ]; - # make sure nix-env and buildEnv also include the - # terminfo output when the package is installed postInstall = '' - mkdir -p "$out/nix-support" - echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages" + # build and install foot's terminfo to the standard location + # instead of its custom location + mkdir -p "${terminfoDir}" + tic -o "${terminfoDir}" -x -e foot,foot-direct "$NIX_BUILD_TOP/$sourceRoot/foot.info" ''; passthru.tests = { @@ -189,6 +189,10 @@ stdenv.mkDerivation rec { clang-latest-compilation = foot.override { inherit (llvmPackages_latest) stdenv; }; + + noPgo = foot.override { + allowPgo = false; + }; }; meta = with lib; { @@ -198,5 +202,18 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; platforms = platforms.linux; + # From (presumably) ncurses version 6.3, it will ship a foot + # terminfo file. This however won't include some non-standard + # capabilities foot's bundled terminfo file contains. Unless we + # want to have some features in e. g. vim or tmux stop working, + # we need to make sure that the foot terminfo overwrites ncurses' + # one. Due to + # ncurses is always added to environment.systemPackages on + # NixOS with its priority increased by 3, so we need to go + # one bigger. + # This doesn't matter a lot for local use since foot sets + # TERMINFO to a store path, but allows installing foot.terminfo + # on remote systems for proper foot terminfo support. + priority = (ncurses.meta.priority or 5) + 3 + 1; }; } From 9f98d0df442edd8c34898536b57e265ea3969d04 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 31 Aug 2021 12:01:16 +0200 Subject: [PATCH 61/62] zellij: 0.15.0 -> 0.16.0 --- pkgs/tools/misc/zellij/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index c7889b158735..2d07c45e61db 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -6,20 +6,21 @@ , pkg-config , libiconv , openssl +, expect }: rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc="; + sha256 = "sha256-2DYNgPURQzHaR8wHKEzuXSzubrxsQHpl3H3ko4okY7M="; }; - cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw="; + cargoSha256 = "sha256-AxtXWBfOzdLCpRchaQJbBBs+6rIyF+2ralOflRvkY4k="; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -31,9 +32,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installShellCompletion --cmd $pname \ - --bash <($out/bin/zellij setup --generate-completion bash) \ - --fish <($out/bin/zellij setup --generate-completion fish) \ - --zsh <($out/bin/zellij setup --generate-completion zsh) + --bash <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion bash) \ + --fish <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion fish) \ + --zsh <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion zsh) ''; meta = with lib; { From 9380d8464bcb6f577709cfa6413d13c0b7a72691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 5 Sep 2021 18:49:51 +0200 Subject: [PATCH 62/62] haskellPackages.lambdabot-social-plugins,lambdabot: unbreak, add myself as maintainer --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ .../configuration-hackage2nix/transitive-broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 3 --- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 8a13571f0a17..c71b2e499b7f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2664,7 +2664,6 @@ broken-packages: - lagrangian - lambda2js - lambdaBase - - lambdabot-social-plugins - lambdabot-utils - lambda-bridge - lambda-canvas diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7637972c07fd..86e4eef99eb6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -240,6 +240,8 @@ package-maintainers: - streamly - taskwarrior - witch + ncfavier: + - lambdabot pacien: - ldgallery-compiler peti: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index d44ef0dafcc8..46e40813e89c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1865,7 +1865,6 @@ dont-distribute-packages: - lambda-options - lambdaFeed - lambdaLit - - lambdabot - lambdabot-xmpp - lambdabot-zulip - lambdacms-media diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 22c4b4143c89..1fced5514e6b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -159061,7 +159061,6 @@ self: { ]; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -159199,8 +159198,6 @@ self: { ]; description = "Social plugins for Lambdabot"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdabot-trusted" = callPackage