chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-13 11:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-20.03 into staging-20.03

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-02-17 15:14:17 +01:00
parent 64f497550e bee35e73e2
commit 5abddd16e4
10 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/doomseeker/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
{ stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
stdenv.mkDerivation {
mkDerivation {
pname = "doomseeker";
version = "2018-03-05";
@@ -13,13 +13,10 @@ stdenv.mkDerivation {
patches = [ ./fix_paths.patch ./qt_build_fix.patch ];
nativeBuildInputs = [ cmake qttools pkgconfig xxd ];
buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
nativeBuildInputs = [ cmake qttools pkgconfig xxd ];
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
meta = with stdenv.lib; {
homepage = http://doomseeker.drdteam.org/;

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@@ -45,11 +45,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
version = "32.0.0.314";
version = "32.0.0.330";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "05xcscpzglpfpiiqc3ngs5snxli99irjk18g5vdhw91jk9808gnl";
sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk";
stripRoot = false;
};

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
pname = "flashplayer";
version = "32.0.0.314";
version = "32.0.0.330";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"076l93wjcy15sic88cyq6msp87gdhcvbk4ym2vbvvjz2bav2z456"
"1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b"
else
"0kxr8d6fh00akqgk3lwv0z6rk7xswislicsbh9b9p33f19mj7c8a"
"0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b"
else
if arch == "x86_64" then
"0a3hvp0qmqlann8k875ajf0i70cv0an1a3mr8kbgji46dxqvwjxz"
"1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj"
else
"0jyywas2z7ssgzng82qgnp01gy6nccqavkbx9529m07xrclvqbxn";
"1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@@ -50,7 +50,7 @@
stdenv.mkDerivation {
pname = "flashplayer-standalone";
version = "32.0.0.314";
version = "32.0.0.330";
src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"0zlin94rip13rn58m7v5l6m20ylnw59l77rbg5j5qyxkr53zawdz"
"0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84"
else
"0pfrm02iwa01pqx3adqj0sw27p1ddlz9knjky6x248ak8zywsqr2";
"08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c";
};
nativeBuildInputs = [ unzip ];

4
pkgs/applications/networking/nextcloud-client/default.nix
View File

@@ -17,13 +17,13 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "2.6.2";
version = "2.6.3";
src = fetchFromGitHub {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "1adicl0msjwbvvi0nxqb1zmka51nn2b88plsynrap5fm0xp40j39";
sha256 = "17w1bx305w656jkiv55lwncxwdly8rf2dsisqw3c9bc7vz19l6p8";
};
patches = [

2
pkgs/data/soundfonts/fluid/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "Fluid-3";
src = fetchurl {
url = "http://www.musescore.org/download/fluid-soundfont.tar.gz";
url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz";
sha256 = "1f96bi0y6rms255yr8dfk436azvwk66c99j6p43iavyq8jg7c5f8";
};

1
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
View File

@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
"-Dopenssl_path=${openssl}/bin/openssl"
"-Dsshadd_path=${openssh}/bin/ssh-add"
"-Dsshkeygen_path=${openssh}/bin/ssh-keygen"
"-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services"
"-Dpost_install=true"
];

8
pkgs/servers/mautrix-whatsapp/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2020-01-12";
version = "2020-02-09";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "39e46833b471b0cf262d4ff57fcd61530b5d2b9e";
sha256 = "1r1f52advibb97vrhi2gw0d0scnsvfbmfqizsbpjmgm7ci9jjhcl";
rev = "260555b69ccd20f247405e4d8cab3d49fabda070";
sha256 = "1ykhwrp8bvhzzw4lg4m1w430ybgzd0zqgrs4jrvfd1m0als2iff7";
};
modSha256 = "18bcv7x49bqnzwhafh8fvyv9z2d4j6w0iyqql0alq57hy7h7lxik";
modSha256 = "0ypj79rjwj5bls6aq2cz0d034dnv1sddl43iz51b4fl2bfv0drm9";
meta = with stdenv.lib; {
homepage = https://github.com/tulir/mautrix-whatsapp;

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.01.24";
version = "2020.02.16";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1zrnbjnwv315f9a83lk5c0gl4ianvp6q2kinxvqlv604sabcq78b";
sha256 = "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb";
};
nativeBuildInputs = [ makeWrapper ];

39
pkgs/tools/package-management/nix/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchurl, fetchFromGitHub, callPackage
{ lib, fetchurl, callPackage
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
, confDir ? "/etc"
@@ -11,7 +11,7 @@ let
common =
{ lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns, jq
, jq, libarchive, rustc, cargo
, busybox-sandbox-shell
, storeDir
, stateDir
@@ -19,7 +19,7 @@ common =
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
, withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp
, name, suffix ? "", src, includesPerl ? false, fromGit ? false
, name, suffix ? "", src, includesPerl ? false
}:
let
@@ -29,19 +29,21 @@ common =
version = lib.getVersion name;
is20 = lib.versionAtLeast version "2.0pre";
is24 = lib.versionAtLeast version "2.4pre";
VERSION_SUFFIX = lib.optionalString fromGit suffix;
VERSION_SUFFIX = suffix;
outputs = [ "out" "dev" "man" "doc" ];
nativeBuildInputs =
[ pkgconfig ]
++ lib.optionals (!is20) [ curl perl ]
++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ];
++ lib.optionals is24 [ jq ];
buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is20 [ brotli boost editline ]
++ lib.optionals is24 [ libarchive rustc cargo ]
++ lib.optional withLibseccomp libseccomp
++ lib.optional (withAWS && is20)
((aws-sdk-cpp.override {
@@ -126,8 +128,6 @@ common =
};
passthru = {
inherit fromGit;
perl-bindings = if includesPerl then nix else stdenv.mkDerivation {
pname = "nix-perl";
inherit version;
@@ -140,7 +140,6 @@ common =
# but noting for future travellers.
nativeBuildInputs =
[ perl pkgconfig curl nix libsodium ]
++ lib.optionals fromGit [ autoreconfHook autoconf-archive ]
++ lib.optional is20 boost;
configureFlags =
@@ -186,29 +185,23 @@ in rec {
});
nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.3${suffix}";
suffix = "pre6895_84de821";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "84de8210040580ce7189332b43038d52c56a9689";
sha256 = "062pdly0m2hk8ly8li5psvpbj1mi7m1a15k8wyzf79q7294l5li3";
name = "nix-2.4${suffix}";
suffix = "pre7250_94c93437";
src = fetchurl {
url = "https://hydra.nixos.org/build/112193977/download/3/nix-2.4${suffix}.tar.xz";
sha256 = "f9baf241c9449c1e3e5c9610adbcd2ce9e5fbcab16aff3ba3030d2fad7b34d7b";
};
fromGit = true;
inherit storeDir stateDir confDir boehmgc;
});
nixFlakes = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre20191022_9cac895";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "9cac895406724e0304dff140379783c4d786e855";
hash = "sha256-Y1cdnCNoJmjqyC/a+Nt2N+5L3Ttg7K7zOD7gmtg1QzA=";
suffix = "pre20200207_d2032ed";
src = fetchurl {
url = "https://hydra.nixos.org/build/111815420/download/3/nix-2.4${suffix}.tar.xz";
sha256 = "e72a20efeee4ccc704cca3a06de9185fb8742bc7ef1a62af5896ec0f379b9ceb";
};
fromGit = true;
inherit storeDir stateDir confDir boehmgc;
});