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

Merge remote-tracking branch 'upstream/staging-next' into staging

Browse Source
This commit is contained in:
John Ericson
2021-05-06 15:48:25 -04:00
parent c63e69cd89 5f7ad00ae9
commit a3e54cb582
34 changed files with 616 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/clementine/default.nix
+2 -1
View File
@@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
, qtbase, qtx11extras
, qtbase, qtx11extras, qttools
, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
, qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }:
@@ -45,6 +45,7 @@ let
qjson
qtbase
qtx11extras
qttools
sqlite
taglib
]
pkgs/applications/blockchains/polkadot/default.nix
+4 -4
View File
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.8.30";
version = "0.9.0";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
sha256 = "sha256-9GCk1gqlQJhuoiKRi7J1qcJlZjlq2ObGicp5tGGDhrY=";
sha256 = "sha256-Y52VFTjRFyC38ZNt6NMtVRA2pn6Y4B/NC4EEuDvIFQQ=";
};
cargoSha256 = "sha256-pWqbcargCEkisdGnj08VQdRqjocR7zZhWukhYjfZDqI=";
cargoSha256 = "sha256-0GrExza6uPF/eFWrXlM4MpCD7TMk2y+uEc5SDj/UQkg=";
nativeBuildInputs = [ clang ];
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
description = "Polkadot Node Implementation";
homepage = "https://polkadot.network";
license = licenses.gpl3Only;
maintainers = with maintainers; [ akru andresilva asymmetric RaghavSood ];
maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ];
platforms = platforms.linux;
};
}
pkgs/applications/blockchains/turbo-geth.nix
+6 -5
View File
@@ -2,28 +2,29 @@
buildGoModule rec {
pname = "turbo-geth";
version = "2021.02.01";
version = "2021.04.05";
src = fetchFromGitHub {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9z0Hogu/VgGxvgQMKIImv+qyTqTmR40JS4NNIOk5EZI=";
sha256 = "sha256-RTPNJASNFyZ6tDJj0WOqALyxRsOLJzPy0qA1c2sSxys=";
};
vendorSha256 = "sha256-Ho68+SzYELQN4DE57LNSXeHIu43zAOb7HK/jx7PFdXk=";
vendorSha256 = "01c7lb6n00ws60dfybir0z5dbn6h68p5s4hbq0ga2g7drf3l3y0p";
runVend = true;
subPackages = [
"cmd/tg"
"cmd/restapi"
"cmd/evm"
"cmd/rpcdaemon"
"cmd/rlpdump"
];
meta = with lib; {
homepage = "https://github.com/ledgerwatch/turbo-geth/";
description = "Ethereum node and geth fork focused on scalability and modularity";
license = with licenses; [ lgpl3 gpl3 ];
license = with licenses; [ lgpl3Plus gpl3Plus ];
maintainers = with maintainers; [ xwvvvvwx ];
};
}
pkgs/applications/kde/k3b.nix
+2 -2
View File
@@ -4,7 +4,7 @@
, flac, lame, libmad, libmpcdec, libvorbis
, libsamplerate, libsndfile, taglib
, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
, ffmpeg_3, libmusicbrainz3, normalize, sox, transcode, kinit
, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit
}:
mkDerivation {
@@ -25,7 +25,7 @@ mkDerivation {
# cd/dvd
cdparanoia libdvdcss libdvdread
# others
ffmpeg_3 libmusicbrainz3 shared-mime-info
ffmpeg libmusicbrainz3 shared-mime-info
];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup =
pkgs/applications/networking/browsers/chromium/upstream-info.json
+3 -3
View File
@@ -18,9 +18,9 @@
}
},
"beta": {
"version": "91.0.4472.27",
"sha256": "09mhrzfza9a2zfsnxskbdbk9cwxnswgprhnyv3pj0f215cva20sq",
"sha256bin64": "1iwjf993pmhm9r92h4hskfxqc9fhky3aabvmdsqys44251j3hvwg",
"version": "91.0.4472.38",
"sha256": "13kikqyxs7p25j7mxnr42614y92vmwsjqfd51dwdjh7wc2hb644a",
"sha256bin64": "1kjawp7q6r1r50h69jwrw84gqrya1jc8bq6x7bdplxlzgvy9qs3z",
"deps": {
"gn": {
"version": "2021-04-06",
pkgs/applications/networking/cluster/kubecfg/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
let version = "0.18.0"; in
let version = "0.19.0"; in
buildGoPackage {
pname = "kubecfg";
@@ -10,7 +10,7 @@ buildGoPackage {
owner = "bitnami";
repo = "kubecfg";
rev = "v${version}";
sha256 = "sha256-TJbuJZDj9ZwEaN8LV/M30+5+IgN8EZCTTBBDB0OgdEE=";
sha256 = "sha256-G3yLpo/6hv6t3i6b/KMgoZqltyGDddg/SsNPF8hNeUg=";
};
goPackagePath = "github.com/bitnami/kubecfg";
pkgs/applications/networking/nym/default.nix
+4 -14
View File
@@ -3,36 +3,26 @@
, fetchFromGitHub
, pkg-config
, openssl
, libredirect
, writeText
}:
rustPlatform.buildRustPackage rec {
pname = "nym";
version = "0.8.1";
version = "0.10.0";
src = fetchFromGitHub {
owner = "nymtech";
repo = "nym";
rev = "v${version}";
sha256 = "0wzk9qzjyax73lfjbbag412vw1fgk2wmhhry5hdlvdbkim42m5bn";
sha256 = "sha256-7x+B+6T0cnEOjXevA5n1k/SY1Q2tcu0bbZ9gIGoljw0=";
};
# fix outdated Cargo.lock
cargoPatches = [ (writeText "fix-nym-cargo-lock.patch" ''
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1826 +1826 @@
-version = "0.8.0"
+version = "0.8.1"
'') ];
cargoSha256 = "0zr5nzmglmvn6xfqgvipbzy8nw5cl3nf7zjmghkqdwi6zj9p9272";
cargoSha256 = "0a7yja0ihjc66fqlshlaxpnpcpdy7h7gbv6120w2cr605qdnqvkx";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
patches = [ ./ignore-networking-tests.patch ];
checkType = "debug";
passthru.updateScript = ./update.sh;
pkgs/applications/networking/nym/ignore-networking-tests.patch
+123
View File
@@ -0,0 +1,123 @@
diff --git a/service-providers/network-requester/src/allowed_hosts.rs b/service-providers/network-requester/src/allowed_hosts.rs
index 3026b4ee..fd156682 100644
--- a/service-providers/network-requester/src/allowed_hosts.rs
+++ b/service-providers/network-requester/src/allowed_hosts.rs
@@ -306,6 +306,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn leaves_a_com_alone() {
let filter = setup();
assert_eq!(
@@ -315,6 +316,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn trims_subdomains_from_com() {
let filter = setup();
assert_eq!(
@@ -324,6 +326,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn works_for_non_com_roots() {
let filter = setup();
assert_eq!(
@@ -333,6 +336,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn works_for_non_com_roots_with_subdomains() {
let filter = setup();
assert_eq!(
@@ -342,12 +346,14 @@ mod tests {
}
#[test]
+ #[ignore]
fn returns_none_on_garbage() {
let filter = setup();
assert_eq!(None, filter.get_domain_root("::/&&%@"));
}
#[test]
+ #[ignore]
fn returns_none_on_nonsense_domains() {
let filter = setup();
assert_eq!(None, filter.get_domain_root("flappappa"));
@@ -368,6 +374,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn are_not_allowed() {
let host = "unknown.com";
let mut filter = setup();
@@ -375,6 +382,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn get_appended_once_to_the_unknown_hosts_list() {
let host = "unknown.com";
let mut filter = setup();
@@ -405,6 +413,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn are_allowed() {
let host = "nymtech.net";
@@ -413,6 +422,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn are_allowed_for_subdomains() {
let host = "foomp.nymtech.net";
@@ -421,6 +431,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn are_not_appended_to_file() {
let mut filter = setup(&["nymtech.net"]);
@@ -436,6 +447,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn are_allowed_for_ipv4_addresses() {
let address_good = "1.1.1.1";
let address_good_port = "1.1.1.1:1234";
@@ -448,6 +460,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn are_allowed_for_ipv6_addresses() {
let ip_v6_full = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
let ip_v6_full_rendered = "2001:0db8:85a3::8a2e:0370:7334";
@@ -477,6 +490,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn are_allowed_for_ipv4_address_ranges() {
let range1 = "127.0.0.1/32";
let range2 = "1.2.3.4/24";
@@ -495,6 +509,7 @@ mod tests {
}
#[test]
+ #[ignore]
fn are_allowed_for_ipv6_address_ranges() {
let range = "2620:0:2d0:200::7/32";