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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-05-06 06:20:15 +00:00 committed by GitHub
commit 305e1c9446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/blockchains/go-ethereum.nix
View File

@ -8,17 +8,17 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.2";
version = "1.10.3";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PJaJ9fCva9UUBcQrnVa2c7dk4koi6AyX6bj3JStUMwM=";
sha256 = "sha256-85aUR7MvaPeRilC+4oj6XW2IEUvxRUsVz63tQ/Jc7xw=";
};
runVend = true;
vendorSha256 = "sha256-qLpwrV9NkmUO0yoK2/gwb5oe/lky/w/P0QVoFSTNuMU=";
vendorSha256 = "sha256-8zhVQ8FUdzog7h9RBfuq8uBp0zjulXbDOLAPljp4deA=";
doCheck = false;

16
pkgs/applications/blockchains/openethereum/default.nix
View File

@ -10,26 +10,20 @@
, darwin
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
pname = "openethereum";
version = "3.2.4";
version = "3.2.5";
src = fetchFromGitHub {
owner = "openethereum";
repo = "openethereum";
rev = "v${version}";
sha256 = "143w0b0ff1s73qzr844l25w90d2y2z0b3w2fr5kkbc1wsnpcq7jp";
sha256 = "1g48fkznvr9fs3j9zy2d9pcwnahmyghxg2b9bsn2mxpyczmfqrki";
};
cargoSha256 = "1gm02pcfll362add8a0dcb0sk0mag8z0q23b87yb6fs870bqvhib";
cargoSha256 = "02nlm5ariv4dr6b3rckzs7hw1xrl83yvhimrzb0g5l0j0sxh1nhc";
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
nativeBuildInputs = [
cmake
llvmPackages.clang
llvmPackages.libclang
pkg-config
];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isLinux [ systemd ]

4
pkgs/applications/misc/free42/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "free42";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dU8c+tpt+4nCWQj3P2rl6CJNtWFcXaYb3ZESg8hAllQ=";
sha256 = "sha256-2TOYvZBI2EW9xjbjA4Bh+TgjbyEXRzOByalLYBW8Ba8=";
};
nativeBuildInputs = [ copyDesktopItems pkg-config ];

4
pkgs/applications/networking/remote/anydesk/default.nix
View File

@ -18,14 +18,14 @@ let
in stdenv.mkDerivation rec {
pname = "anydesk";
version = "6.1.0";
version = "6.1.1";
src = fetchurl {
urls = [
"https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz"
"https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz"
];
sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r";
sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh";
};
passthru = {

4
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lefthook";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
sha256 = "sha256-VrAkmLRsYNDX5VfAxsvjsOv1bv7Nk53OjdaJm/D2GRk=";
sha256 = "sha256-wW8Obh0YmAZHKrXLQ8364+TrAmLIYKRir2qXdWLtVkE=";
};
vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko=";

4
pkgs/data/fonts/inter/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "3.15";
version = "3.18";
in fetchzip {
name = "inter-${version}";
@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0";
sha256 = "sha256-+wbN1vSS8v1Z1VIfDNeY9DB8Kr6v7UnFg37EPPAD7wI=";
meta = with lib; {
homepage = "https://rsms.me/inter/";

10
pkgs/development/libraries/freeimage/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchsvn, darwin, libtiff
, libpng, zlib, libwebp, libraw, openexr, openjpeg
, libjpeg, jxrlib, pkg-config }:
, libjpeg, jxrlib, pkg-config
, fixDarwinDylibNames }:
stdenv.mkDerivation {
pname = "freeimage";
@ -17,7 +18,12 @@ stdenv.mkDerivation {
prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib";
patches = [ ./unbundle.diff ];
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin darwin.cctools;
nativeBuildInputs = [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
darwin.cctools
fixDarwinDylibNames
];
buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ];
postBuild = lib.optionalString (!stdenv.isDarwin) ''

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3 }:
{ lib, stdenv, fetchFromGitHub, python3, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "jxrlib";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace '.so' '.dylib'
'';
nativeBuildInputs = [ python3 ];
nativeBuildInputs = [ python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
strictDeps = true;

1
pkgs/development/libraries/openexr/default.nix
View File

@ -1,6 +1,5 @@
{ lib
, stdenv
, buildPackages
, fetchFromGitHub
, zlib
, ilmbase

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "breezy";
version = "3.1.0";
version = "3.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be";
sha256 = "sha256-lwKPk+UxKAhfIgUb1xPLJ/za53VdHenmBrr85RTpEps=";
};
propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];

10
pkgs/development/tools/rust/cargo-watch/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }:
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-watch";
version = "7.6.1";
version = "7.7.2";
src = fetchFromGitHub {
owner = "passcod";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vjX8xfwv/DOogji+OQCB9l5ebGBNoLW722TGpZ5Wg80=";
sha256 = "sha256-ocibNgH2xw0BrJRmHCAahO6hPLmlDmwjjzo7mMWp9FU=";
};
cargoSha256 = "sha256-ku+tI0DIofV0EZ413sPjbJDUSqwTxiT8NWBeURrJW1k=";
cargoSha256 = "sha256-6ztMEfVOlsyUtIeH+Qd/l7khC7XOHKc4bWsDd27RNu8=";
buildInputs = lib.optional stdenv.isDarwin CoreServices;
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
# `test with_cargo` tries to call cargo-watch as a cargo subcommand
# (calling cargo-watch with command `cargo watch`)

4
pkgs/os-specific/linux/lxc/default.nix
View File

@ -9,11 +9,11 @@
with lib;
stdenv.mkDerivation rec {
pname = "lxc";
version = "4.0.8";
version = "4.0.9";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
sha256 = "16qbmysiyrvb1inbbdr8qwqa0c6h9mwyrbx4ry18x0kvrhmqamdc";
sha256 = "0az56xpvhqiwmf9wfxzaz89s5idrgd9ynd13psscw3hlx480dkqz";
};
nativeBuildInputs = [

6
pkgs/tools/admin/eksctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.46.0";
version = "0.47.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-fPs9xB27fxUnsXndqpcifmMPGA8hEyeYC7tq+W9eBKI=";
sha256 = "sha256-fJL6Fs2rt3Q26cUww0Ca/FZnRN7/KHtp9mHUrpwTLuY=";
};
vendorSha256 = "sha256-ZC5Rk5HcnxU9X5o/t+oz8qx36WjOVYVEXxxa875UrZk=";
vendorSha256 = "sha256-SeO5RNpGrA28xOKr7EoRtMtyOlAPFYEAFtodhIbe1Zk=";
doCheck = false;

2
pkgs/tools/graphics/perceptualdiff/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A program that compares two images using a perceptually based image metric";
homepage = "https://github.com/myint/perceptualdiff";
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ uri-canva ];
platforms = platforms.x86;
};

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.37.2";
version = "0.37.3";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI=";
sha256 = "sha256-8lZDWvd5Lq8uHBt47gRhg0MLeJ5iRheMBUjkfaJueDI=";
};
vendorSha256 = null;

10
pkgs/tools/security/kbs2/default.nix
View File

@ -1,24 +1,24 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "kbs2";
version = "0.2.6";
version = "0.3.0";
src = fetchFromGitHub {
owner = "woodruffw";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PtXTC0VufUR5kle9C5KhCHHEQtQZvTTU1Q/cRMCB1g0=";
sha256 = "sha256-Mh56VjFHwjiZ0fvOF3fFw+1IU5HwkRdMlFrt3tZjcZY=";
};
cargoSha256 = "sha256-S2czYglyHRkRN3Dq5reXFOaB1i/oIHXTY8Ile+Twvzo=";
cargoSha256 = "sha256-hjUDLA5vNCCIEFQsAhv3hDur1LIGQKYO2rR6AoEb+wA=";
nativeBuildInputs = [ installShellFiles ]
++ lib.optionals stdenv.isLinux [ python3 ];
buildInputs = [ ]
++ lib.optionals stdenv.isLinux [ libxcb ]
++ lib.optionals stdenv.isDarwin [ AppKit ];
++ lib.optionals stdenv.isDarwin [ AppKit libiconv ];
preCheck = ''
export HOME=$TMPDIR

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

@ -27558,7 +27558,7 @@ in
zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
openethereum = callPackage ../applications/blockchains/openethereum { };
openethereum = callPackage ../applications/blockchains/openethereum { stdenv = llvmPackages_12.stdenv; };
parity-ui = callPackage ../applications/blockchains/parity-ui { };