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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-10 18:15:36 +00:00 committed by GitHub
commit 5448578a33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 89 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -391,7 +391,9 @@ in {
$file = "${c.dbpassFile}";
if (!file_exists($file)) {
throw new \RuntimeException(sprintf(
"Cannot start Nextcloud, dbpass file %s set by NixOS doesn't exist!",
"Cannot start Nextcloud, dbpass file %s set by NixOS doesn't seem to "
. "exist! Please make sure that the file exists and has appropriate "
. "permissions for user & group 'nextcloud'!",
$file
));
}

32
pkgs/applications/misc/electrum/default.nix
View File

@ -19,15 +19,7 @@
}:
let
version = "4.0.6";
# electrum is not compatible with dnspython 2.0.0 yet
# use the latest 1.x release instead
py = python3.override {
packageOverrides = self: super: {
dnspython = super.dnspython_1;
};
};
version = "4.0.7";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@ -43,7 +35,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
sha256 = "0mdbg2sq56nv0hx0rrcbgrv1lv89nqc6cqigivgk665hhjm4v5kq";
sha256 = "06vcbj9p96d8v4xjlygzr74lqllb9adn8k0racajzq61ijb0imi2";
extraPostFetch = ''
mv $out ./all
@ -52,13 +44,13 @@ let
};
in
py.pkgs.buildPythonApplication {
python3.pkgs.buildPythonApplication {
pname = "electrum";
inherit version;
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "0sp8p720g3rqnh52ddhaw2v4hjgpxcwbackw9qc1g9xac1q0942d";
sha256 = "0k5xf97ga3ixd02g1y6v84hbxd8yhvpj5iz2rhxs8wfnkfwibzh4";
};
postUnpack = ''
@ -68,19 +60,18 @@ py.pkgs.buildPythonApplication {
nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
propagatedBuildInputs = with py.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
aiohttp
aiohttp-socks
aiorpcx
attrs
bitstring
cryptography
dnspython
ecdsa
jsonrpclib-pelix
matplotlib
pbkdf2
protobuf
pycryptodomex
pysocks
qrcode
requests
@ -121,10 +112,15 @@ py.pkgs.buildPythonApplication {
wrapQtApp $out/bin/electrum
'';
checkInputs = with py.pkgs; [ pytest ];
checkInputs = with python3.pkgs; [ pytestCheckHook pycryptodomex ];
checkPhase = ''
py.test electrum/tests
pytestFlagsArray = [ "electrum/tests" ];
disabledTests = [
"test_loop" # test tries to bind 127.0.0.1 causing permission error
];
postCheck = ''
$out/bin/electrum help >/dev/null
'';

6
pkgs/applications/misc/remarkable/rmapi/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "rmapi";
version = "0.0.12";
version = "0.0.13";
src = fetchFromGitHub {
owner = "juruen";
repo = "rmapi";
rev = "v${version}";
sha256 = "049m0p4wbsl822iym8xmc938d4k90iw7wjdzcxfyy8d27hv9mp45";
sha256 = "0qq8x37p7yxhcp5d5xss3pv5186xgg0hd6lbkqivhy5yjsd54c7b";
};
vendorSha256 = "077s13pcql5w2m6wzls1q06r7p501kazbwzxgfh6akwza15kb4is";
vendorSha256 = "1pa75rjns1kknl2gmfprdzc3f2z8dk44jkz6dmf8f3prj0z7x88c";
doCheck = false;

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "88.0.4324.27",
"sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc",
"sha256bin64": "0qf2j1j3p94s724rwh8fydpjn88cs9yxxhjf5axvqwi7q3h35cfx",
"version": "88.0.4324.41",
"sha256": "06hnawylr7fl1zav6cyg1yfw2z04qrpnj4n3v07qx7ya6p8qyp2g",
"sha256bin64": "1iq4qd5x7ivypcxh47d6av45hyqdgga2s80idyhf1f51f660h2vc",
"deps": {
"gn": {
"version": "2020-11-05",

2
pkgs/applications/video/mpv/default.nix
View File

@ -196,6 +196,8 @@ in stdenv.mkDerivation rec {
cp TOOLS/mpv_identify.sh $out/bin
cp TOOLS/umpv $out/bin
cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop
sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop
'' + optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
cp -r build/mpv.app $out/Applications

5
pkgs/development/compilers/nim/default.nix
View File

@ -254,6 +254,11 @@ let
$wrapperArgs
ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
makeWrapper \
${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
$wrapperArgs
ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
makeWrapper \
${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
--suffix PATH : $out/bin

24
pkgs/development/libraries/physics/geant4/datasets.nix
View File

@ -42,22 +42,22 @@ in
{
name = "G4EMLOW";
version = "7.9.1";
sha256 = "1jrw0izw732bywq1k1srs3x2z0m3y2h377kcvwbwcr0wa1p10342";
version = "7.13";
sha256 = "0scczd4ismvd4g3vfshbvwv92bzkdjz0ma7y21n6qxxy96v9cj1p";
envvar = "LE";
}
{
name = "G4PhotonEvaporation";
version = "5.5";
sha256 = "1mvnbs7yvkii41blks6bkqr8qhxgnj3xxvv1i3vdg2y14shxv5ar";
version = "5.7";
sha256 = "1rg7fygfxx06h98ywlci6b0b9ih74q8diygr76c3vppxdzjl47kn";
envvar = "LEVELGAMMA";
}
{
name = "G4RadioactiveDecay";
version = "5.4";
sha256 = "0qaark6mqzxr3lqawv6ai8z5211qihlp5x2hn86vzx8kgpd7j1r4";
version = "5.6";
sha256 = "1w8d9zzc4ss7sh1f8cxv5pmrx2b74p1y26377rw9hnlfkiy0g1iq";
envvar = "RADIOACTIVE";
}
@ -70,8 +70,8 @@ in
{
name = "G4PARTICLEXS";
version = "2.1";
sha256 = "0h8ba8jk197npbd9lzq2qlfiklbjgqwk45m1cc6piy5vf8ri0k89";
version = "3.1";
sha256 = "1kg9y0kqn4lma7b0yjpgj7s9n317yqi54ydvq365qphnmm7ahka0";
envvar = "PARTICLEXS";
}
@ -98,15 +98,15 @@ in
{
name = "G4ENSDFSTATE";
version = "2.2";
sha256 = "19p0sq0rmyg48j9hddqy24dn99md7ddiyq09lyj381q7cbpjfznx";
version = "2.3";
sha256 = "00wjir59rrrlk0a12vi8rsnhyya71rdi1kmark9sp487hbhcai4l";
envvar = "ENSDFSTATE";
}
{
name = "G4RealSurface";
version = "2.1.1";
sha256 = "0l3gs0nlp10cjlwiln3f72zfch0av2g1r8m2ny9afgvwgbwiyj4h";
version = "2.2";
sha256 = "08382y1258ifs7nap6zaaazvabg72blr0dkqgwk32lrg07hdwm4r";
envvar = "REALSURFACE";
}

10
pkgs/development/libraries/physics/geant4/default.nix
View File

@ -48,20 +48,20 @@ let
in
stdenv.mkDerivation rec {
version = "10.6.3";
version = "10.7.0";
pname = "geant4";
src = fetchurl{
url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p03.tar.gz";
sha256 = "1wzv5xky1pfm7wdfdkvqcaaqlcnsrz35dc7zcrxh8l3j5rki6pqb";
url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz";
sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp";
};
boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";
postPatch = ''
# Fix for boost 1.67+
substituteInPlace environments/g4py/CMakeLists.txt \
--replace "find_package(Boost REQUIRED python)" \
"find_package(Boost REQUIRED COMPONENTS $boost_python_lib)"
--replace "REQUIRED python" \
"REQUIRED COMPONENTS $boost_python_lib"
substituteInPlace environments/g4py/G4PythonHelpers.cmake \
--replace "Boost::python" "Boost::$boost_python_lib"
'';

8
pkgs/development/libraries/tracker/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
@ -43,6 +44,13 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit asciidoc;
})
# Fix consistency error with sqlite 3.34
# https://gitlab.gnome.org/GNOME/tracker/merge_requests/353
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/tracker/commit/040e22d005985a19a0dc435a7631f91700804ce4.patch";
sha256 = "5OZj17XY8ZnXfMMim25HvGfFKUlsVlVHOUjZKfBKHcs=";
})
];
nativeBuildInputs = [

4
pkgs/development/tools/misc/clojure-lsp/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "20201205T230541";
version = "20201207T142850";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
sha256 = "06sismbv7wrcwfgr0brw9gsdvl2plrryhxs1v08a2sd5rdf2qi3b";
sha256 = "0fxplldpxslm7f5xxazkl09gsj0ysppaal72hmlqbdj6rbgxlrnk";
};
dontUnpack = true;

11
pkgs/os-specific/linux/kernel/export-rt-sched-migrate.patch Normal file
View File

@ -0,0 +1,11 @@
Export linux-rt (PREEMPT_RT) specific symbols needed by ZFS.
(Regular kernel provides them static inline in linux/preempt.h.)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1812 +1812 @@ void migrate_disable(void)
-EXPORT_SYMBOL_GPL(migrate_disable);
+EXPORT_SYMBOL(migrate_disable);
@@ -1843 +1843 @@ void migrate_enable(void)
-EXPORT_SYMBOL_GPL(migrate_enable);
+EXPORT_SYMBOL(migrate_enable);

5
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -87,6 +87,11 @@
};
};
export-rt-sched-migrate = {
name = "export-rt-sched-migrate";
patch = ./export-rt-sched-migrate.patch;
};
# patches from https://lkml.org/lkml/2019/7/15/1748
mac_nvme_t2 = rec {
name = "mac_nvme_t2";

9
pkgs/os-specific/linux/zfs/default.nix
View File

@ -176,6 +176,11 @@ let
maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
};
};
linux-rt-patch = fetchpatch {
url = "https://github.com/openzfs/zfs/commit/ab4fb9b74e9d089fc9a261c4f41e19697ad6a4ca.patch";
sha256 = "1nrxmb4rhrkgncav6dzwm66l0700fi72qkkcs0w6pkm850srws36";
};
in {
# also check if kernel version constraints in
# ./nixos/modules/tasks/filesystems/zfs.nix needs
@ -188,6 +193,8 @@ in {
version = "2.0.0";
sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
extraPatches = [ linux-rt-patch ];
};
zfsUnstable = common {
@ -198,5 +205,7 @@ in {
version = "2.0.0";
sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
extraPatches = [ linux-rt-patch ];
};
}

8
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "7.3.4";
version = "7.3.5";
excludedPackages = [ "release_publisher" ];
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "0vav3zhn4yw87z8xlcljs62xx4v3mxxvy0kgjh7w4njyqq1j3ayi";
sha256 = "1gxa1j7sd4xcyb2gh2ja6mwp0j4zcqwzaz25n9f9p9azhjyd2zh5";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "1fmfscfbdg2wdzf5fbad83pln4azy2y3fcghcanafkvqr2vv4hwk";
sha256 = "0vplzj5jrx643qp68kxg1g1gazxjrnx771dmc1703zalv28z8fq3";
};
vendorSha256 = "0rn1zqczqa44k6g8rm9xdrd6hw5rbbvihcbzcdx758gv2lpbikxq";
vendorSha256 = "05brpjac54a8bxh7psy8gix9q2g36fr4z5msahp6i8wv2xfrf98b";
postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2020.12.07";
version = "2020.12.09";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0sbrwak9c0pbacg15q2wj5fcsj5k5k1sx9jm7rcjwkjdhqcjqrsi";
sha256 = "0qdris00jf6lb9q5qi3f5cyxya5a0sa8yqr6l204wns5px3n7iqa";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

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

@ -18363,6 +18363,7 @@ in
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.export_kernel_fpu_functions."5.3"
kernelPatches.export-rt-sched-migrate
];
};