JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-05 18:00:57 +00:00 committed by GitHub
commit 75dc00dbd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 160 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/android-studio/default.nix
View File

@ -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"

14
pkgs/applications/graphics/fig2dev/default.nix
View File

@ -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 ];

6
pkgs/applications/misc/xplr/default.nix
View File

@ -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";

51
pkgs/applications/terminal-emulators/foot/default.nix
View File

@ -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 <nixpkgs/nixos/modules/config/system-path.nix>
# 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;
};
}

1
pkgs/development/compilers/gcc/10/default.nix
View File

@ -147,6 +147,7 @@ stdenv.mkDerivation ({
else "")
+ lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'-s' # workaround for hitting hydra log limit
'LIMITS_H_TEST=false'
)
'';

1
pkgs/development/compilers/gcc/11/default.nix
View File

@ -152,6 +152,7 @@ stdenv.mkDerivation ({
else "")
+ lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'-s' # workaround for hitting hydra log limit
'LIMITS_H_TEST=false'
)
'';

5
pkgs/development/interpreters/lua-5/default.nix
View File

@ -54,9 +54,4 @@ rec {
inherit callPackage;
};
luajit_openresty = import ../luajit/openresty.nix {
self = luajit_openresty;
inherit callPackage;
};
}

10
pkgs/development/interpreters/luajit/2.0.nix
View File

@ -1,14 +1,12 @@
{ self, callPackage, lib }:
callPackage ./default.nix {
inherit self;
owner = "LuaJIT";
repo = "LuaJIT";
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 = with lib; filter (p: !hasPrefix "aarch64-" p)
(platforms.linux ++ platforms.darwin);
};
}

8
pkgs/development/interpreters/luajit/2.1.nix
View File

@ -1,10 +1,8 @@
{ self, callPackage }:
callPackage ./default.nix {
inherit self;
owner = "LuaJIT";
repo = "LuaJIT";
version = "2.1.0-2021-06-25";
rev = "e957737650e060d5bf1c2909b741cc3dffe073ac";
version = "2.1.0-2021-08-12";
rev = "8ff09d9f5ad5b037926be2a50dc32b681c5e7597";
isStable = false;
sha256 = "04i7n5xdd1nci4mv2p6bv71fq5b1nkswz12hcgirsxqbnkrlbbcj";
sha256 = "18wp8sgmiwlslnvgs35cy35ji2igksyfm3f8hrx07hqmsq2d77vr";
}

14
pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch Normal file
View File

@ -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)

53
pkgs/development/interpreters/luajit/default.nix
View File

@ -1,15 +1,16 @@
{ lib, stdenv, fetchFromGitHub, buildPackages
{ lib
, stdenv
, fetchFromGitHub
, buildPackages
, name ? "luajit-${version}"
, isStable
, owner
, repo
, sha256
, rev
, version
, extraMeta ? {}
, extraMeta ? { }
, callPackage
, self
, packageOverrides ? (self: super: {})
, packageOverrides ? (self: super: { })
, enableFFI ? true
, enableJIT ? true
, enableJITDebugModule ? enableJIT
@ -26,28 +27,34 @@ 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 {
inherit owner repo sha256 rev;
owner = "LuaJIT";
repo = "LuaJIT";
inherit sha256 rev;
};
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
@ -82,8 +89,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 +103,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;
}

10
pkgs/development/interpreters/luajit/openresty.nix
View File

@ -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";
}

41
pkgs/development/python-modules/hg-commitsigs/default.nix Normal file
View File

@ -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
};
}

4
pkgs/misc/emulators/wine/sources.nix
View File

@ -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;

4
pkgs/os-specific/linux/cramfsprogs/default.nix
View File

@ -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
'';

1
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@ -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";
};
}

7
pkgs/tools/filesystems/sasquatch/default.nix
View File

@ -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; {

13
pkgs/tools/misc/zellij/default.nix
View File

@ -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; {

9
pkgs/top-level/all-packages.nix
View File

@ -12726,7 +12726,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;
@ -27661,12 +27661,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 {
# See:
# - https://github.com/NixOS/nixpkgs/issues/129099
# - https://github.com/NixOS/nixpkgs/issues/128959
lua =
if (stdenv.isDarwin && stdenv.isAarch64) then luajit_openresty else
luajit;
lua = luajit;
};
neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };

2
pkgs/top-level/python-packages.nix
View File

@ -3323,6 +3323,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 { };