about summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-02-17 07:58:47 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-02-17 08:05:24 +0100
commitf7f1a2f54ef2b744a26e37418dd6354bc46aa20a (patch)
tree03b40b737111f3677fbf508dce58a29cfc81fc1b /pkgs/tools/misc
parent705167a5dceb53befd22f4e6184bbfba0813b73d (diff)
parentc904c2ec09cbee8b46bee136e062e611d249cdf2 (diff)
downloadnixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar
nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.gz
nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.bz2
nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.lz
nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.xz
nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.zst
nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.zip
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/bashplotlib/default.nix6
-rw-r--r--pkgs/tools/misc/calamares/default.nix4
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix
index c334ee77634c..79f72746f905 100644
--- a/pkgs/tools/misc/bashplotlib/default.nix
+++ b/pkgs/tools/misc/bashplotlib/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bashplotlib";
-  version = "2017-10-11";
+  version = "2019-01-02";
 
   src = fetchFromGitHub {
     owner = "glamp";
     repo = "bashplotlib";
-    rev = "fdc52be2c1fed13753692eced328143ab1db6f3d";
-    sha256 = "1ycql6j65zywyav2n3c0x1i5cm9w6glzqc3v0cgdvv1bdg4wi0gf";
+    rev = "f7533172c4dc912b5accae42edd5c0f655d7468f";
+    sha256 = "1sifqslvvz2c05spwrl81kcdg792l6jwvfd3ih9q5wjkvkm0plz8";
   };
 
   # No tests
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index edc6a2e46437..9d3c3a45004a 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "calamares";
-  version = "3.2.2";
+  version = "3.2.4";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "14hsv2m0jza33kf68l3rhqfjj7224fmvgvk1kg2qwhvplpjdn16v";
+    sha256 = "0wsr1awmk5dnx2cqpp5sb6xhsq7b1jqwbsi1n39db97iyshah6fb";
   };
 
   buildInputs = [