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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-02-27 10:15:34 +01:00
parent df3849e5c7 7b716121de
commit ef156f7a8b
467 changed files with 11069 additions and 5406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/misc/act/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "act";
version = "0.1.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "1y1bvk93dzsxwjakmgpb5qyy3lqng7cdabi64b555c1z6b42mf58";
sha256 = "1sn36686nfmqvhmippdapk0pxqx3x1q4dwdyhjr8j8scyfrk68iv";
};
modSha256 = "00d0wjnr5y3bl95lma8sdwvqqs7fd0k43azawp1kb29kqnrlismg";
modSha256 = "0ghp61m8fxg1iwq2ypmp99cqv3n16c06v2xzg9v34299vmd89gi2";
meta = with lib; {
description = "Run your GitHub Actions locally";

4
pkgs/development/tools/misc/hydra/default.nix
View File

@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support
perlDeps perl nix
postgresql # for running the tests
@@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkgconfig ];

8
pkgs/development/tools/misc/sccache/default.nix
View File

@@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
rustPlatform.buildRustPackage rec {
version = "0.2.12";
version = "0.2.13";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = version;
sha256 = "1yd3rfp032crwlmfn2p3z12f67q7bxm78fhvdlc7azm2a4hkif4k";
sha256 = "19z9fdkn3bnr8q33m66h2by6bs6kmhw3a2lq2n8bywmnhrjwhxpw";
};
cargoSha256 = "17i3m7hj7kvdbicabmz2wl3g6s6c8lcyi3pririkq77jxm87shfh";
cargoSha256 = "1pm7il0x7i9mqx4vsmkcs8nq0dqr5ck3x3x7la6k39igaxn9vkwz";
cargoBuildFlags = [ "--features=all" ];
nativeBuildInputs = [
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "Ccache with Cloud Storage";
homepage = https://github.com/mozilla/sccache;
homepage = "https://github.com/mozilla/sccache";
maintainers = with maintainers; [ doronbehar ];
license = licenses.asl20;
platforms = platforms.unix;