Merge staging-next into staging
This commit is contained in:
@@ -8,12 +8,12 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.12";
|
||||
version = "2.6.13";
|
||||
pname = "dar";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
|
||||
sha256 = "0jwgaim2p93skdpjwiz5qgibd3j9965ycqn47wrrjlcvzk93mvyk";
|
||||
sha256 = "15yhpzyzw7h7d74xxh104cnbh19639yxx0502xz85fazwpwrzsiz";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Bundle any web page into a single HTML file";
|
||||
homepage = "https://github.com/Y2Z/monolith";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ filalex77 ];
|
||||
maintainers = with maintainers; [ Br1ght0ne ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wal-g";
|
||||
version = "0.2.17";
|
||||
version = "0.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wal-g";
|
||||
repo = "wal-g";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r6vy2b3xqwa22286srwngk63sq4aza6aj7brwc130vypcps7svp";
|
||||
sha256 = "1clsh42sgfrzyg3vr215wrpi93cb8y8ky3cb1v2l6cs4psh3py1q";
|
||||
};
|
||||
|
||||
vendorSha256 = "0r73l4kxzldca1vg5mshq6iqsxcrndcbmbp3d7i9pxyb2kig8gv5";
|
||||
vendorSha256 = "1ax8niw4zfwvh5ikxnkbsjc9fdz1lziqlwig9nwrhzfp45ysbakh";
|
||||
|
||||
buildInputs = [ brotli ];
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "zfsbackup";
|
||||
version = "unstable-2019-03-05";
|
||||
rev = "78fea6e99f0a5a4c8513d3a3d1d45fb6750cfddf";
|
||||
version = "unstable-2020-09-30";
|
||||
rev = "092f80846b23e02f99d2aa72d9d889eabfdcb053";
|
||||
|
||||
goPackagePath = "github.com/someone1/zfsbackup-go";
|
||||
|
||||
@@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
owner = "someone1";
|
||||
repo = "zfsbackup-go";
|
||||
inherit rev;
|
||||
sha256 = "0yalsfvzmcnc8yfzm3r5dikqrp57spwa16l7gbzvgqqcz4vlnw3n";
|
||||
sha256 = "1xiacaf4r9jkx0m8wjfis14cq622yhljldwkflh9ni3khax7dlgi";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
Generated
+1112
-59
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user