diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-12-22 11:28:56 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-12-22 11:28:56 +0100 |
commit | 2e03ae274d36e695e4db63fb0a6b71346621b6af (patch) | |
tree | 84af1a7ec323e1ce2865661756da1cca2b6ef07b /pkgs/tools/misc | |
parent | 41f55691a96ca4f37a87c8659884edf19b2c8446 (diff) | |
parent | 0c1382085b2969ce38359bcb28fc5dfe67cca7eb (diff) | |
download | nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.gz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.bz2 nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.lz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.xz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.zst nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/lnav/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/parted/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/yank/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index a3b40edb46ca..23e823eb9632 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "06h0hy8k0w692df2490dshxf2x8qcnw5myyp0k5jkc63ai2ra6aq"; + sha256 = "0pag2rl7b6s2xfl80c629vhwsdvvlhcdy6732yvpgfv94w0zyjp9"; inherit name; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.0"; + version = "0.8.1"; maintainers = [ maintainers.dochang ]; }; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 58e7a17a57f3..68240210e746 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -29,10 +29,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; - # Tests are currently failing because Hydra runs builds as uid 0. - # It'd be better to try to fix these tests, but this is blocking - # all NixOS Hydra builds right now. - doCheck = false; + # Tests were previously failing due to Hydra running builds as uid 0. + # That should hopefully be fixed now. + doCheck = true; preCheck = stdenv.lib.optionalString doCheck diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 5186ec2121bf..6cae19473402 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "0iv3ilyjcq6cd429qkg8mfpwagkb30617z0kdjlhk2s74chyaghm"; + sha256 = "1m8pnarm8n5x6ylbzxv8j9amylrllw166arrj4cx9f2jp2zbzcic"; inherit name; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.7.0"; + version = "0.7.1"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 808ba21ab660..a1ed2d9657fb 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.12.15"; + version = "2016.12.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "85d937a6edb8c14f8eac1b17d2e5d45574c7ec3f2cb792781ac1d8fb6a6ca39e"; + sha256 = "f80d47d5e2a236ea6c9d8b4636199aea01a041607ce7b544babedb0fe1ce59a5"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; |