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-04-19 00:15:22 +00:00 committed by GitHub
commit a28d31ed86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 184 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/searx.nix
View File

@ -108,7 +108,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
"${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"
)
fancy.succeed(
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/js/bootstrap.min.js >&2"
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2"
)
'';
})

3
pkgs/applications/editors/netbeans/default.nix
View File

@ -36,7 +36,8 @@ stdenv.mkDerivation {
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
--prefix PATH : ${lib.makeBinPath [ jdk which ]} \
--prefix JAVA_HOME : ${jdk.home} \
--add-flags "--jdkhome ${jdk.home}"
--add-flags "--jdkhome ${jdk.home} \
-J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true"
# Extract pngs from the Apple icon image and create
# the missing ones from the 1024x1024 image.

18
pkgs/applications/misc/dbeaver/default.nix
View File

@ -2,6 +2,7 @@
, stdenv
, copyDesktopItems
, fetchFromGitHub
, fetchpatch
, makeDesktopItem
, makeWrapper
, fontconfig
@ -18,18 +19,18 @@
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
version = "21.0.2"; # When updating also update fetchedMavenDeps.sha256
version = "21.0.3"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-3EMSiEq1wdg4dxBU90RVVv0Hrf5dXPc1MPI0+WMk48k=";
sha256 = "sha256-ItM8t+gqE0ccuuimfEMUddykl+xt2eZIBd3MbpreRwA=";
};
fetchedMavenDeps = stdenv.mkDerivation {
name = "dbeaver-${version}-maven-deps";
inherit src;
inherit src patches;
buildInputs = [
maven
@ -50,9 +51,18 @@ stdenv.mkDerivation rec {
dontFixup = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE=";
outputHash = "sha256-rsK/B39ogNu5nC41OfyAsLiwBz4gWyH+8Fj7E6+rOng=";
};
patches = [
# Fix eclipse-color-theme URL (https://github.com/dbeaver/dbeaver/pull/12133)
# After April 15, 2021 eclipse-color-theme.github.com no longer redirects to eclipse-color-theme.github.io
(fetchpatch {
url = "https://github.com/dbeaver/dbeaver/commit/65d65e2c2c711cc87fddcec425a6915aa80f4ced.patch";
sha256 = "sha256-pxOcRYkV/5o+tHcRhHDZ1TmZSHMnKBmkNTVAlIf9nUE=";
})
];
nativeBuildInputs = [
copyDesktopItems
makeWrapper

4
pkgs/applications/office/portfolio/default.nix
View File

@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.51.2";
version = "0.52.0";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "sha256-5wBzGj4DkTOqtN7X8/EBDoiBtbYB6vGJJ5IkuME7a9A=";
sha256 = "1pvjckh7z803piqyzrvk54jd43f2vcyx20zjcgmq1va8jc3q69k1";
};
nativeBuildInputs = [

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

@ -25,7 +25,7 @@
}:
let
version = "1.7.1";
version = "1.7.2";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
sha256 = "1x6nyhlp0zynnbdjx87c4ybfx6fyr0r53vypkfima56dwbfh98ka";
sha256 = "0iabj9c0dj1r0m89i5gk2jdmwj4wfsai8na54x2w4fq406q6g9nh";
};
nativeBuildInputs = [

4
pkgs/development/compilers/sdcc/default.nix
View File

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "sdcc";
version = "4.0.0";
version = "4.1.0";
src = fetchurl {
url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
sha256 = "042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8";
sha256 = "0gskzli17ghnn5qllvn4d56qf9bvvclqjh63nnj63p52smvggvc1";
};
buildInputs = [ boost gputils texinfo zlib ];

48
pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch Normal file
View File

@ -0,0 +1,48 @@
From c0dc376be9154d143574a818417ceed23308b5f2 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Sun, 18 Apr 2021 01:45:20 +0200
Subject: [PATCH] pkgconfig darwin
---
Makefile | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Makefile b/Makefile
index 971c6d6..0f4be0c 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,6 @@ endif
# -DKISS_FFT_BUILD to TYPEFLAGS
#
-ifneq ($(shell uname -s),Darwin)
PKGCONFIG_KISSFFT_VERSION = $(KFVER_MAJOR).$(KFVER_MINOR).$(KFVER_PATCH)
PKGCONFIG_KISSFFT_OUTPUT_NAME = $(KISSFFTLIB_SHORTNAME)
PKGCONFIG_PKG_KISSFFT_DEFS = $(TYPEFLAGS)
@@ -170,7 +169,6 @@ ifneq ($(shell uname -s),Darwin)
PKGCONFIG_KISSFFT_LIBDIR = $(ABS_LIBDIR)
endif
PKGCONFIG_KISSFFT_PKGINCLUDEDIR = $${includedir}/kissfft
-endif
export TYPEFLAGS
@@ -226,7 +224,6 @@ ifneq ($(KISSFFT_STATIC), 1)
ln -sf $(KISSFFTLIB_NAME) $(KISSFFTLIB_SODEVELNAME)
endif
endif
-ifneq ($(shell uname -s),Darwin)
mkdir "$(ABS_LIBDIR)/pkgconfig"
sed \
-e 's+@PKGCONFIG_KISSFFT_VERSION@+$(PKGCONFIG_KISSFFT_VERSION)+' \
@@ -238,7 +235,6 @@ ifneq ($(shell uname -s),Darwin)
-e 's+@PKGCONFIG_KISSFFT_LIBDIR@+$(PKGCONFIG_KISSFFT_LIBDIR)+' \
-e 's+@PKGCONFIG_KISSFFT_PKGINCLUDEDIR@+$(PKGCONFIG_KISSFFT_PKGINCLUDEDIR)+' \
kissfft.pc.in 1>"$(ABS_LIBDIR)/pkgconfig/$(KISSFFT_PKGCONFIG)"
-endif
ifneq ($(KISSFFT_TOOLS), 0)
make -C tools install
endif
--
2.29.3

87
pkgs/development/libraries/kissfft/default.nix
View File

@ -1,45 +1,80 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, fftw
, fftwFloat
, python3
, datatype ? "double"
, withTools ? false
, libpng
, enableStatic ? stdenv.hostPlatform.isStatic
, enableOpenmp ? false
, llvmPackages
}:
let
py = python3.withPackages (ps: with ps; [ numpy ]);
option = cond: if cond then "1" else "0";
in
stdenv.mkDerivation rec {
pname = "kissfft";
version = "131";
pname = "kissfft-${datatype}${lib.optionalString enableOpenmp "-openmp"}";
version = "131.1.0";
src = fetchFromGitHub {
owner = "mborgerding";
repo = pname;
rev = "v${version}";
sha256 = "0axmqav2rclw02mix55cch9xl5py540ac15xbmq7xq6n3k492ng2";
repo = "kissfft";
rev = version;
sha256 = "1yfws5bn4kh62yk6hdyp9h9775l6iz7wsfisbn58jap6b56s8j5s";
};
patches = [
# Allow installation into our prefix
# Fix installation on Darwin
# Create necessary directories
# Make datatype configurable
(fetchpatch {
url = "https://github.com/mborgerding/kissfft/pull/38.patch";
sha256 = "0cp1awl7lr2vqmcwm9lfjs4b4dv9da8mg4hfd821r5ryadpyijj6";
})
# Install headers as well
(fetchpatch {
url = "https://github.com/mborgerding/kissfft/commit/71df949992d2dbbe15ce707cf56c3fa1e43b1080.patch";
sha256 = "13h4kzsj388mxxv6napp4gx2ymavz9xk646mnyp1i852dijpmapm";
})
./0001-pkgconfig-darwin.patch
];
postPatch = ''
substituteInPlace Makefile \
--replace "gcc" "${stdenv.cc.targetPrefix}cc" \
--replace "ar" "${stdenv.cc.targetPrefix}ar"
# https://bugs.llvm.org/show_bug.cgi?id=45034
postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "10") ''
substituteInPlace test/Makefile \
--replace "-ffast-math" ""
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin) ''
substituteInPlace test/Makefile \
--replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
# Don't know how to make math.h's double long constants available
substituteInPlace test/testcpp.cc \
--replace "M_PIl" "M_PI"
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
"DATATYPE=double"
"KISSFFT_DATATYPE=${datatype}"
"KISSFFT_TOOLS=${option withTools}"
"KISSFFT_STATIC=${option enableStatic}"
"KISSFFT_OPENMP=${option enableOpenmp}"
];
buildInputs = lib.optionals (withTools && datatype != "simd") [ libpng ]
# TODO: This may mismatch the LLVM version in the stdenv, see #79818.
++ lib.optional (enableOpenmp && stdenv.cc.isClang) llvmPackages.openmp;
doCheck = true;
checkInputs = [
py
(if datatype == "float" then fftwFloat else fftw)
];
checkFlags = [ "testsingle" ];
postInstall = ''
ln -s ${pname}.pc $out/lib/pkgconfig/kissfft.pc
'';
# Tools can't find kissfft libs on Darwin
postFixup = lib.optionalString (withTools && stdenv.hostPlatform.isDarwin) ''
for bin in $out/bin/*; do
install_name_tool -change lib${pname}.dylib $out/lib/lib${pname}.dylib $bin
done
'';
meta = with lib; {
description = "A mixed-radix Fast Fourier Transform based up on the KISS principle";
homepage = "https://github.com/mborgerding/kissfft";

18
pkgs/development/ocaml-modules/x509/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchurl, buildDunePackage, fetchpatch
{ lib, fetchurl, buildDunePackage
, alcotest, cstruct-unix
, asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk
, asn1-combinators, domain-name, fmt, gmap, pbkdf, rresult, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk
, logs, base64
}:
@ -8,25 +8,17 @@ buildDunePackage rec {
minimumOCamlVersion = "4.07";
pname = "x509";
version = "0.11.2";
version = "0.12.0";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz";
sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22";
sha256 = "04g59j8sn8am0z0a94h8cyvr6cqzd5gkn2lj6g51nb5dkwajj19h";
};
patches = [
# fix tests for mirage-crypto >= 0.8.9, can be removed at next release
(fetchpatch {
url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch";
sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr";
})
];
useDune2 = true;
buildInputs = [ alcotest cstruct-unix ];
propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk rresult logs base64 ];
propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf rresult logs base64 ];
doCheck = true;

4
pkgs/development/python-modules/awkward/default.nix
View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "awkward";
version = "1.1.2";
version = "1.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "4ae8371d9e6d5bd3e90f3686b433cebc0541c88072655d2c75ec58e79b5d6943";
sha256 = "89f126a072d3a6eee091e1afeed87e0b2ed3c34ed31a1814062174de3cab8d9b";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/python-modules/pytest-subprocess/default.nix
View File

@ -10,15 +10,15 @@
buildPythonPackage rec {
pname = "pytest-subprocess";
version = "1.0.1";
version = "1.1.0";
disabled = pythonOlder "3.4";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aklajnert";
repo = "pytest-subprocess";
rev = version;
sha256 = "16ghwyv1vy45dd9cysjvcvvpm45958x071id2qrvgaziy2j6yx3j";
sha256 = "sha256-r6WNDdvZAHMG1kPtLJlCwvhbVG1gC1NEvRfta+Chxnk=";
};
buildInputs = [

6
pkgs/development/tools/go-task/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-task";
version = "3.3.0";
version = "3.4.1";
src = fetchFromGitHub {
owner = pname;
repo = "task";
rev = "v${version}";
sha256 = "sha256-+JhU0DXSUbpaHWJYEgiUwsR8DucGRwkiNiKDyhJroqk=";
sha256 = "sha256-r0AHGgv2huMaZfsbK7o4KKJirNeOff1M3jgG8ZUJoiA=";
};
vendorSha256 = "sha256-pNKzqUtEIQs0TP387ACHfCv1RsMjZi7O8P1A8df+QtI=";
vendorSha256 = "sha256-qKjCGZnCts4GfBafSRXR7xTvfJdqK8zjpu01eiyITkU=";
doCheck = false;

42
pkgs/servers/web-apps/searx/default.nix
View File

@ -1,23 +1,21 @@
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }:
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub }:
with python3Packages;
toPythonModule (buildPythonApplication rec {
pname = "searx";
version = "0.18.0";
version = "1.0.0";
# Can not use PyPI because certain test files are missing.
# pypi doesn't receive updates
src = fetchFromGitHub {
owner = "searx";
repo = "searx";
rev = "v${version}";
sha256 = "0idxspvckvsd02v42h4z4wqrfkn1l8n59i91f7pc837cxya8p6hn";
sha256 = "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh";
};
postPatch = ''
sed -i 's/==.*$//' requirements.txt
# skip failing test
sed -i '/test_json_serial(/,+3d' tests/unit/test_standalone_searx.py
'';
preBuild = ''
@ -25,16 +23,32 @@ toPythonModule (buildPythonApplication rec {
'';
propagatedBuildInputs = [
pyyaml lxml grequests flaskbabel flask requests
gevent speaklater Babel pytz dateutil pygments
pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
jinja2 werkzeug
Babel
certifi
dateutil
flask
flaskbabel
gevent
grequests
jinja2
langdetect
lxml
ndg-httpsclient
pyasn1
pyasn1-modules
pygments
pysocks
pytz
pyyaml
requests
speaklater
werkzeug
];
checkInputs = [
Babel mock nose2 covCore pep8 plone-testing splinter
unittest2 zope_testrunner selenium
];
# tests try to connect to network
doCheck = false;
pythonImportsCheck = [ "searx" ];
postInstall = ''
# Create a symlink for easier access to static data

6
pkgs/servers/x11/xorg/default.nix
View File

@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
name = "xf86-input-libinput-1.0.0";
name = "xf86-input-libinput-1.0.1";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2";
sha256 = "0x4ay9y2clm2bql3myqnvhmikjbpzy95c800qiva8pg6dbvc4mgg";
url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2";
sha256 = "0nr4r9x8c7y1l0ipivjch5zps093mxmg2nqmfn2934am26fc9ppx";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];

2
pkgs/servers/x11/xorg/tarballs.list
View File

@ -81,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2

6
pkgs/tools/backup/zrepl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "zrepl";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "zrepl";
repo = "zrepl";
rev = "v${version}";
sha256 = "sha256-wtUL8GGSJxn9yEdyTWKtkHODfxxLOxojNPlPLRjI9xo=";
sha256 = "5Bp8XGCjibDJgeAjW98rcABuddI+CV4Fh3hFJaKKwbo=";
};
vendorSha256 = "sha256-4LBX0bD8qirFaFkV52QFU50lEW4eae6iObIa5fFT/wA=";
vendorSha256 = "MwmYiK2z7ZK5kKBZV7K6kCZRSd7v5Sgjoih1eeOh6go=";
subPackages = [ "." ];

4
pkgs/tools/misc/ytfzf/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "ytfzf";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ytfzf";
rev = "v${version}";
sha256 = "sha256-ST6ZSNJW4Pe8fdwRsQ0BLdCd3AE9OTG6is3J+HMdIzs=";
sha256 = "sha256-zRzd+rZxT5IJoFJl9sutTdQC4eMDUCBld5bTGfQWtco=";
};
patches = [

4
pkgs/tools/networking/dnsproxy/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.37.0";
version = "0.37.1";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3zsEEq6pVo5yHY4v5TXhZo4jo6htjCYypzxMMv8zQGE=";
sha256 = "sha256-zenVgWVzKnq9WzJFC6vpE5Gwbv3lJC7aIe3xBQGeWr8=";
};
vendorSha256 = null;