Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-03-12 00:39:51 +00:00 committed by GitHub
commit 903fc48674
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 162 additions and 96 deletions

View file

@ -254,5 +254,21 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'",
"docker rmi ${examples.layeredStoreSymlink.imageName}",
)
with subtest("buildImage supports registry/ prefix in image name"):
docker.succeed(
"docker load --input='${examples.prefixedImage}'"
)
docker.succeed(
"docker images --format '{{.Repository}}' | grep -F '${examples.prefixedImage.imageName}'"
)
with subtest("buildLayeredImage supports registry/ prefix in image name"):
docker.succeed(
"docker load --input='${examples.prefixedLayeredImage}'"
)
docker.succeed(
"docker images --format '{{.Repository}}' | grep -F '${examples.prefixedLayeredImage.imageName}'"
)
'';
})

View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "reaper";
version = "6.23";
version = "6.25";
src = fetchurl {
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
sha256 = "1s9c8prqk38738hjaixiy8ljp94cqw7jq3160890477jyk6cvicd";
sha256 = "0i1idlr4ar28wvwcvwn9hqzb63kki1x1995cr87a9slxfa7zcshb";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

View file

@ -7,10 +7,11 @@
, wrapGAppsHook
, gtk3
, gnome3
, zbar
, tiffSupport ? true
, libraw
, jpgSupport ? true
, imagemagick
, graphicsmagick
, exiftool
}:
@ -20,24 +21,24 @@ let
inherit (lib) makeBinPath optional optionals optionalString;
runtimePath = makeBinPath (
optional tiffSupport libraw
++ optionals jpgSupport [ imagemagick exiftool ]
++ optionals jpgSupport [ graphicsmagick exiftool ]
);
in
stdenv.mkDerivation rec {
pname = "megapixels";
version = "0.14.0";
version = "0.15.0";
src = fetchgit {
url = "https://git.sr.ht/~martijnbraam/megapixels";
rev = version;
sha256 = "136rv9sx0kgfkpqn5s90j7j4qhb8h04p14g5qhqshb89kmmsmxiw";
sha256 = "1y8irwi8lbjs948j90gpic96dx5wjmwacd41hb3d9vzhkyni2dvb";
};
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]
buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ]
++ optional tiffSupport libraw
++ optional jpgSupport imagemagick;
++ optional jpgSupport graphicsmagick;
preFixup = optionalString (tiffSupport || jpgSupport) ''
gappsWrapperArgs+=(

View file

@ -18,15 +18,15 @@
}
},
"beta": {
"version": "89.0.4389.72",
"sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll",
"sha256bin64": "0w1972r71gp8jjr9370f9xb8v2f109mxjrsm8893sn4kbz8zmxby",
"version": "90.0.4430.19",
"sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa",
"sha256bin64": "0z665iykdsmjrjbijsrcq80y2anvcfykasznf8w4brg9l9k59wv8",
"deps": {
"gn": {
"version": "2021-01-07",
"version": "2021-02-09",
"url": "https://gn.googlesource.com/gn",
"rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
"sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
}
}
},

View file

@ -2,6 +2,7 @@
, buildGoModule
, fetchFromGitHub
, makeWrapper
, installShellFiles
, buildkit
, cni-plugins
, extraPackages ? [ ]
@ -9,23 +10,20 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "AkihiroSuda";
repo = pname;
rev = "v${version}";
sha256 = "sha256-z5Ekryaa5KMShrjdsmFk9bXahtuc+6tec7dxH5/w7+A=";
sha256 = "sha256-tMzob+ljGBKkfbxwMqy+8bqVp51Eqyx4kXhsj/LRfzQ=";
};
vendorSha256 = "sha256-ovmVNtzTQbg141IvbaF/+k5WHxX8wuK7z5gH9l2g5UE=";
vendorSha256 = "sha256-zUX/kneVz8uXmxly8yqmcttK3Wj4EmBaT8gmg3hDms4=";
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper installShellFiles ];
preBuild =
let
t = "github.com/AkihiroSuda/nerdctl/pkg/version";
in
preBuild = let t = "github.com/AkihiroSuda/nerdctl/pkg/version"; in
''
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=<unknown>")
'';
@ -37,17 +35,19 @@ buildGoModule rec {
wrapProgram $out/bin/nerdctl \
--prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \
--prefix CNI_PATH : "${cni-plugins}/bin"
# nerdctl panics without XDG_RUNTIME_DIR set
export XDG_RUNTIME_DIR=$TMPDIR
installShellCompletion --cmd nerdctl \
--bash <($out/bin/nerdctl completion bash)
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
# nerdctl expects XDG_RUNTIME_DIR to be set
export XDG_RUNTIME_DIR=$TMPDIR
$out/bin/nerdctl --help
# --version will error without containerd.sock access
$out/bin/nerdctl --help | grep "${version}"
$out/bin/nerdctl --version | grep "nerdctl version ${version}"
runHook postInstallCheck
'';

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.28.8";
version = "0.28.9";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-A/sSVStXW1b2QOb01f9sink4LMz/52W9voV4VpqQQ4E=";
sha256 = "sha256-sqwR+bXx5ab5OsmW44C5MIXjzQFM1QsBvsM0R3pL3H8=";
};
vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4=";
vendorSha256 = "sha256-9DBCP/4mp/Gr2ie0nk7WGfL+M7snMEztdHZzxdIFbzM=";
doCheck = false;

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "signal-cli";
version = "0.8.0";
version = "0.8.1";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
sha256 = "sha256-0YzeGtdsCUG8N7Av/zzHoC9KKu1rqjQDToaOEXzuoJc=";
sha256 = "sha256-Lq1RSJ1VIa6MFTiTbGqNy7IqliJwGeuegm/1+RRtu+I=";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus
{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus
, sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config libxslt ];
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ];
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ];
checkInputs = [ dbus.daemon ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }:
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }:
stdenv.mkDerivation rec {
pname = "telepathy-haze";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
};
buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ];
buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ];
nativeBuildInputs = [ pkg-config libxslt ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }:
stdenv.mkDerivation rec {
pname = "telepathy-idle";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ];
buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ];
preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
dbus-glib libxml2 sqlite telepathy-glib
dbus telepathy-glib.python
dbus python2
];
configureFlags = [ "--enable-call" ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup
{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup
, libuuid, openssl, pcre, sqlite, pkg-config }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
sqlite pcre telepathy-glib.python ];
sqlite pcre python2 ];
nativeBuildInputs = [ libxslt pkg-config ];

View file

@ -447,7 +447,7 @@ rec {
let
stream = streamLayeredImage args;
in
runCommand "${name}.tar.gz" {
runCommand "${baseNameOf name}.tar.gz" {
inherit (stream) imageName;
passthru = { inherit (stream) imageTag; };
nativeBuildInputs = [ pigz ];
@ -746,8 +746,10 @@ rec {
(lib.assertMsg (maxLayers > 1)
"the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})");
let
baseName = baseNameOf name;
streamScript = writePython3 "stream" {} ./stream_layered_image.py;
baseJson = writeText "${name}-base.json" (builtins.toJSON {
baseJson = writeText "${baseName}-base.json" (builtins.toJSON {
inherit config;
architecture = defaultArch;
os = "linux";
@ -759,7 +761,7 @@ rec {
# things like permissions set on 'extraCommands' are not overriden
# by Nix. Then we precompute the sha256 for performance.
customisationLayer = symlinkJoin {
name = "${name}-customisation-layer";
name = "${baseName}-customisation-layer";
paths = contentsList;
inherit extraCommands;
postBuild = ''
@ -788,7 +790,7 @@ rec {
# so they'll be excluded from the created images.
unnecessaryDrvs = [ baseJson overallClosure ];
conf = runCommand "${name}-conf.json" {
conf = runCommand "${baseName}-conf.json" {
inherit maxLayers created;
imageName = lib.toLower name;
passthru.imageTag =
@ -841,18 +843,20 @@ rec {
cat ${baseJson} | jq '
. + {
"store_dir": $store_dir,
"store_layers": $store_layers,
"customisation_layer", $customisation_layer,
"repo_tag": $repo_tag,
"created": $created
}
' --argjson store_layers "$store_layers" \
' --arg store_dir "${storeDir}" \
--argjson store_layers "$store_layers" \
--arg customisation_layer ${customisationLayer} \
--arg repo_tag "$imageName:$imageTag" \
--arg created "$created" |
tee $out
'';
result = runCommand "stream-${name}" {
result = runCommand "stream-${baseName}" {
inherit (conf) imageName;
passthru = {
inherit (conf) imageTag;

View file

@ -427,4 +427,18 @@ rec {
tag = "latest";
contents = [ pkgs.bash symlink ];
} // { passthru = { inherit symlink; }; };
# image with registry/ prefix
prefixedImage = pkgs.dockerTools.buildImage {
name = "registry-1.docker.io/image";
tag = "latest";
config.Cmd = [ "${pkgs.hello}/bin/hello" ];
};
# layered image with registry/ prefix
prefixedLayeredImage = pkgs.dockerTools.buildLayeredImage {
name = "registry-1.docker.io/layered-image";
tag = "latest";
config.Cmd = [ "${pkgs.hello}/bin/hello" ];
};
}

View file

@ -130,12 +130,13 @@ class ExtractChecksum:
LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"])
def add_layer_dir(tar, paths, mtime):
def add_layer_dir(tar, paths, store_dir, mtime):
"""
Appends given store paths to a TarFile object as a new layer.
tar: 'tarfile.TarFile' object for the new layer to be added to.
paths: List of store paths.
store_dir: the root directory of the nix store
mtime: 'mtime' of the added files and the layer tarball.
Should be an integer representing a POSIX time.
@ -143,9 +144,9 @@ def add_layer_dir(tar, paths, mtime):
the layer added.
"""
invalid_paths = [i for i in paths if not i.startswith("/nix/store/")]
invalid_paths = [i for i in paths if not i.startswith(store_dir)]
assert len(invalid_paths) == 0, \
"Expecting absolute store paths, but got: {invalid_paths}"
f"Expecting absolute paths from {store_dir}, but got: {invalid_paths}"
# First, calculate the tarball checksum and the size.
extract_checksum = ExtractChecksum()
@ -245,6 +246,7 @@ def main():
else datetime.fromisoformat(conf["created"])
)
mtime = int(created.timestamp())
store_dir = conf["store_dir"]
with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar:
layers = []
@ -253,7 +255,7 @@ def main():
"Creating layer", num,
"from paths:", store_layer,
file=sys.stderr)
info = add_layer_dir(tar, store_layer, mtime=mtime)
info = add_layer_dir(tar, store_layer, store_dir, mtime=mtime)
layers.append(info)
print("Creating the customisation layer...", file=sys.stderr)

View file

@ -1,24 +1,49 @@
{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt
, gobject-introspection, vala, glibcLocales }:
{ lib
, stdenv
, fetchurl
, dbus-glib
, glib
, python3
, pkg-config
, libxslt
, gobject-introspection
, vala
, glibcLocales
}:
stdenv.mkDerivation rec {
name = "telepathy-glib-0.24.1";
pname = "telepathy-glib";
version = "0.24.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy";
url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz";
sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A=";
};
nativeBuildInputs = [
pkg-config
libxslt
gobject-introspection
vala
];
buildInputs = [
glibcLocales
python3
];
propagatedBuildInputs = [
dbus-glib
glib
];
configureFlags = [
"--enable-vala-bindings"
];
LC_ALL = "en_US.UTF-8";
propagatedBuildInputs = [ dbus-glib glib ];
nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ];
buildInputs = [ glibcLocales python2 ];
LC_ALL = "en_US.UTF-8";
enableParallelBuilding = true;
@ -26,8 +51,6 @@ stdenv.mkDerivation rec {
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
'';
passthru.python = python2;
meta = with lib; {
homepage = "https://telepathy.freedesktop.org";
platforms = platforms.unix;

View file

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.17.24"; # N.B: if you change this, change botocore and awscli to a matching version
version = "1.17.25"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-v0oyHafb4MWiA4D/n2qKTi4TXnKkA0iJASKhlzaLRCE=";
sha256 = "sha256-Jz6WriuVpgNqTDVH52onCxerdhzHYFOCPJ42HSaCE+8=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.20.24"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.25"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-k5i82UkUQqpVmnwRG5YAS7Bq9hLlO6pxZbCmRrtDU00=";
sha256 = "sha256-uAtO/l+vsp8ko2V9H3eqFwUlyHa1/ZOE1eWFnQQFIG4=";
};
propagatedBuildInputs = [

View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, cython
, pytestrunner
, pytest
, hypothesis
@ -20,7 +21,11 @@ buildPythonPackage rec {
--replace "hypothesis==" "hypothesis>="
'';
nativeBuildInputs = [ pytestrunner ];
nativeBuildInputs = [ cython pytestrunner ];
preBuild = ''
./update_cpp.sh
'';
checkInputs = [ pytest hypothesis ];

View file

@ -1,7 +1,6 @@
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, fixplate
, tasty
, tasty-hunit
@ -37,13 +36,10 @@ mkDerivation rec {
executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ];
testHaskellDepends = [ tasty tasty-hunit tasty-th ];
patches = [
# raise upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46
(fetchpatch {
url = "https://github.com/Synthetica9/nix-linter/commit/b406024e525977b3c69d78d6a94a683e2ded121f.patch";
sha256 = "0viwbprslcmy70bxy3v27did79nqhlc0jcx4kp0lycswaccvnp1j";
})
];
# Relax upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46
postPatch = ''
substituteInPlace nix-linter.cabal --replace "hnix >=0.8 && < 0.11" "hnix >=0.8"
'';
description = "Linter for Nix(pkgs), based on hnix";
homepage = "https://github.com/Synthetica9/nix-linter";

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.263.4";
version = "2.277.1";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "1disj0a0qh7gzjqm6bjb7dx0v74k74hkyvxpg12ahdj2g04p8jhx";
sha256 = "0lficvngxzl7q088n3ssnnhjicd0xxr0k3n0inz7pvjj27dl35rr";
};
buildCommand = ''

View file

@ -91,9 +91,11 @@ self: super: {
# plugin, since part of the fzf vim plugin is included in the main fzf
# program.
fzfWrapper = buildVimPluginFrom2Nix {
inherit (fzf) src version;
pname = "fzf";
version = fzf.version;
src = fzf.src;
postInstall = ''
ln -s ${fzf}/bin/fzf $target/bin/fzf
'';
};
skim = buildVimPluginFrom2Nix {

View file

@ -18,6 +18,10 @@ stdenv.mkDerivation {
rm -r "$sourceRoot/debug" "$sourceRoot/release"
'';
postPatch = ''
substituteInPlace Makefile.am --replace '-Werror' ""
'';
nativeBuildInputs = [
autoreconfHook
];

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "promscale";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
sha256 = "sha256-rXOAAd08NTWFRGnJoAY9xllw6dAA7Xu3qcImIVq9ewE=";
sha256 = "sha256-f/fpCyAw9BQ6ccEZm/xsTCjINjFtX3Q6SmPuJNVSJVI=";
};
vendorSha256 = "sha256-/woSbtrOI3BVBhh+A2kO1CB1BLzBciwOqvSbGkFeMEU=";

View file

@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.19.24"; # N.B: if you change this, change botocore and boto3 to a matching version too
version = "1.19.25"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-eB81VdFB09QuagANaZxQuOe8N0AnqgL4aIu5HDrYg2I=";
sha256 = "sha256-YL5MnlN+DODGgpi2qtpr6wwC0nuebl/VoBzXRk4l4R8=";
};
# https://github.com/aws/aws-cli/issues/4837

View file

@ -2,29 +2,28 @@
stdenv.mkDerivation rec {
pname = "mtd-utils";
version = "2.1.1";
version = "2.1.2";
src = fetchurl {
url = "ftp://ftp.infradead.org/pub/${pname}/${pname}-${version}.tar.bz2";
sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd";
sha256 = "sha256-itTF80cW1AZGqihySi9WFtMlpvEZJU+RTiaXbx926dY=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka;
buildInputs = [ acl libuuid lzo zlib zstd ];
configureFlags = [
(lib.enableFeature doCheck "unit-tests")
(lib.enableFeature doCheck "tests")
configureFlags = with lib; [
(enableFeature doCheck "unit-tests")
(enableFeature doCheck "tests")
];
enableParallelBuilding = true;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
meta = {
meta = with lib; {
description = "Tools for MTD filesystems";
license = lib.licenses.gpl2Plus;
license = licenses.gpl2Plus;
homepage = "http://www.linux-mtd.infradead.org/";
maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux;
maintainers = with maintainers; [ viric superherointj ];
platforms = with platforms; linux;
};
}

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gdu";
version = "4.7.0";
version = "4.8.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HIVLerSx0XLMvRRJUUGT1M50DbSsFNutOSM5HTTV9mc=";
sha256 = "sha256-3u3tsUwxj7lzqoydycIoYSd7ifb9pLlehDA3NwvzPOo=";
};
vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";