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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-04-12 12:10:39 +00:00 committed by GitHub
parent 19fb64ed2d c87714a040
commit d54b08fe92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 50 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/applications/networking/esniper/default.nix
View File

@ -1,31 +0,0 @@
{ lib, stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
stdenv.mkDerivation {
name = "esniper-2.35.0-21-g6379846";
src = fetchgit {
url = "https://git.code.sf.net/p/esniper/git";
rev = "637984623984ef36782d52d8968df7fae7bbb0a7";
sha256 = "1md3fzs0k88f6mgvrj1yrh96mn0qlca2p6vfqj6dnpyb8pjjwp8w";
};
buildInputs = [ openssl curl ];
# Add support for CURL_CA_BUNDLE variable.
# Fix <https://sourceforge.net/p/esniper/bugs/648/>.
patches = [ ./find-ca-bundle.patch ];
postInstall = ''
sed <"frontends/snipe" >"$out/bin/snipe" \
-e "2i export PATH=\"$out/bin:${lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\""
chmod 555 "$out/bin/snipe"
'';
meta = with lib; {
description = "Simple, lightweight tool for sniping eBay auctions";
homepage = "http://esniper.sourceforge.net";
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 peti ];
platforms = platforms.all;
};
}

26
pkgs/applications/networking/esniper/find-ca-bundle.patch
View File

@ -1,26 +0,0 @@
diff -ubr '--exclude=*.o' esniper-2-27-0-orig/http.c esniper-2-27-0-patched/http.c
--- esniper-2-27-0-orig/http.c 2012-02-06 22:04:06.000000000 +0100
+++ esniper-2-27-0-patched/http.c 2012-07-27 10:54:20.893054646 +0200
@@ -200,6 +200,9 @@
int
initCurlStuff(void)
{
+ /* Path to OpenSSL bundle file. */
+ const char *ssl_capath=NULL;
+
/* list for custom headers */
struct curl_slist *slist=NULL;
@@ -241,6 +244,12 @@
if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_COOKIEFILE, "")))
return initCurlStuffFailed();
+ /* If the environment variable CURL_CA_BUNDLE is set, pass through its
+ * contents to curl. */
+ if ((ssl_capath = getenv("CURL_CA_BUNDLE")))
+ if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_CAINFO, ssl_capath)))
+ return initCurlStuffFailed();
+
slist = curl_slist_append(slist, "Accept: text/*");
slist = curl_slist_append(slist, "Accept-Language: en");
slist = curl_slist_append(slist, "Accept-Charset: iso-8859-1,*,utf-8");

4
pkgs/applications/networking/feedreaders/rssguard/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rssguard";
version = "3.9.0";
version = "3.9.1";
src = fetchFromGitHub {
owner = "martinrotter";
repo = pname;
rev = version;
sha256 = "sha256-pprWJIYAFYSTPhWVCW4dz3GWeAS53Vo8UXiyQ56Mwjo=";
sha256 = "sha256-zSnSCbBNySc5GQSm0O8NztCKNqdNs6bGNWL/RkmGsUw=";
};
buildInputs = [ qtwebengine qttools ];

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

@ -37,13 +37,13 @@ buildType = if stdenv.isDarwin then
edk2 = buildStdenv.mkDerivation {
pname = "edk2";
version = "202011";
version = "202102";
# submodules
src = fetchgit {
url = "https://github.com/tianocore/edk2";
rev = "edk2-stable${edk2.version}";
sha256 = "1fvlz1z075jr6smq9qa0asy6fxga1gljcfd0764ypzy1mw963c9s";
sha256 = "1292hfbqz4wyikdf6glqdy80n9zpy54gnfngqnyv05908hww6h82";
};
buildInputs = [ libuuid pythonEnv ];

10
pkgs/development/compilers/go/2-dev.nix
View File

@ -39,12 +39,12 @@ in
stdenv.mkDerivation rec {
pname = "go2-unstable";
version = "2020-12-08";
version = "2021-03-22";
src = fetchgit {
url = https://go.googlesource.com/go;
rev = "abe4d3dce12252ed09216eaa67b7dab8c8922537";
sha256 = "sha256:1d46w8426148q81fvrifx9glgn402jvf29n44i8j8g1pvzkfckh6";
rev = "a4b4db4cdeefb7b4ea5adb09073dd123846b3588";
sha256 = "sha256:1wqqnywcrfazydi5wcg04s6zgsfh4m879vxfgacgrnigd23ynhvr";
};
# perl is used for testing go vet
@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
./creds-test.patch
./go-1.9-skip-flaky-19608.patch
./go-1.9-skip-flaky-20072.patch
./skip-external-network-tests-1.15.patch
./skip-external-network-tests-1.16.patch
./skip-nohup-tests.patch
./skip-cgo-tests-1.15.patch
] ++ [
@ -188,7 +188,7 @@ stdenv.mkDerivation rec {
null;
GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
GO386 = 387; # from Arch: don't assume sse2 on i686
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
# Hopefully avoids test timeouts on Hydra
GO_TEST_TIMEOUT_SCALE = 3;

35
pkgs/development/compilers/go/ssl-cert-file-2-dev.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go
index ce88de025e..258ecc45d1 100644
--- a/src/crypto/x509/root_darwin_amd64.go
+++ b/src/crypto/x509/root_darwin_amd64.go
@@ -10,6 +10,7 @@ import (
diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
index 05593bb105..a6a11eeec1 100644
--- a/src/crypto/x509/root_darwin.go
+++ b/src/crypto/x509/root_darwin.go
@@ -11,6 +11,7 @@ import (
"bytes"
macOS "crypto/x509/internal/macos"
"fmt"
@ -10,9 +10,9 @@ index ce88de025e..258ecc45d1 100644
"os"
"strings"
)
@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
var loadSystemRootsWithCgo func() (*CertPool, error)
@@ -22,6 +23,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
}
func loadSystemRoots() (*CertPool, error) {
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
@ -24,13 +24,21 @@ index ce88de025e..258ecc45d1 100644
+ }
var trustedRoots []*Certificate
untrustedRoots := make(map[string]bool)
diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
index b48e618a65..195c1ff25a 100644
index dede825edd..ffb3caf4a4 100644
--- a/src/crypto/x509/root_unix.go
+++ b/src/crypto/x509/root_unix.go
@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
@@ -9,6 +9,7 @@ package x509
import (
"io/fs"
+ "io/ioutil"
"os"
"path/filepath"
"strings"
@@ -32,6 +33,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
@ -40,6 +48,7 @@ index b48e618a65..195c1ff25a 100644
+ return roots, nil
+ }
+ }
files := certFiles
if f := os.Getenv(certFileEnv); f != "" {

6
pkgs/development/coq-modules/iris/default.nix
View File

@ -5,7 +5,11 @@ with lib; mkCoqDerivation rec {
domain = "gitlab.mpi-sws.org";
owner = "iris";
inherit version;
defaultVersion = if versions.range "8.9" "8.12" coq.coq-version then "3.3.0" else null;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "3.4.0"; }
{ case = range "8.9" "8.11"; out = "3.3.0"; }
] null;
release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb";
release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp";
releaseRev = v: "iris-${v}";

6
pkgs/development/coq-modules/stdpp/default.nix
View File

@ -5,7 +5,11 @@ with lib; mkCoqDerivation rec {
inherit version;
domain = "gitlab.mpi-sws.org";
owner = "iris";
defaultVersion = if versions.range "8.8" "8.12" coq.coq-version then "1.4.0" else null;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "1.5.0"; }
{ case = range "8.8" "8.11"; out = "1.4.0"; }
] null;
release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf";
release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r";
releaseRev = v: "coq-stdpp-${v}";

4
pkgs/development/libraries/mlt/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "mlt";
version = "6.24.0";
version = "6.26.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "1my43ica2qax2622307dv4gn3w8hkchy643i9pq8r9yh2hd4pvs9";
sha256 = "FPXROiX7A6oB1VMipw3slyhk7q4fO6m9amohnC67lnA=";
};
buildInputs = [

8
pkgs/tools/misc/lorri/default.nix
View File

@ -12,10 +12,10 @@
let
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
version = "1.3.1";
gitRev = "df83b9b175fecc8ec8b02096c5cfe2db3d00b92e";
sha256 = "1df6p0b482vhymw3z7gimc441jr7aix9lhdbcm5wjvw9f276016f";
cargoSha256 = "1f9b2h3zakw7qmlnc4rqhxnw80sl5h4mj8cghr82iacxwqz499ql";
version = "1.4.0";
gitRev = "fee4ffac9ee16fc921d413789cc059b043f2db3d";
sha256 = "sha256:0ix0k85ywlvkxsampajkq521d290gb0n60qwhnk6j0sc55yn558h";
cargoSha256 = "sha256:1ngn4wnyh6cjnyg7mb48zvng0zn5fcn8s75y88nh91xq9x1bi2d9";
in (rustPlatform.buildRustPackage rec {
pname = "lorri";

4
pkgs/tools/virtualization/cri-tools/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cri-tools";
version = "1.20.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fU3g0m2drUsa2Jyz+QYXi4xWTOLINGsDw3dKcesAkkE=";
sha256 = "sha256-chU7qNapmM4Gm8lYcdUreg1ZP93UM0LpIEk+w5cutlg=";
};
vendorSha256 = null;

1
pkgs/top-level/aliases.nix
View File

@ -179,6 +179,7 @@ mapAliases ({
emacsPackages = emacs.pkgs; # added 2020-12-18
emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01
enblendenfuse = enblend-enfuse; # 2015-09-30
esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12
evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25
exfat-utils = exfat; # 2015-09-11

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

@ -22580,8 +22580,6 @@ in
espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
esniper = callPackage ../applications/networking/esniper { };
eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { };
etebase-server = with python3Packages; toPythonApplication etebase-server;