diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
| commit | 985d1ac425735963d396e1c09dd49ad111813649 (patch) | |
| tree | 38a90f65d3bf5906ef020ef2c9482565325e850e /pkgs/tools/misc/calamares | |
| parent | bc238b8df55bad9d8a436e120615cc5cfbbb78dc (diff) | |
| parent | f188bad6eaf26ebee19d02df03b1c6ae56c4d7f6 (diff) | |
| download | nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.gz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.bz2 nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.lz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.xz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.zst nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.zip | |
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
Diffstat (limited to 'pkgs/tools/misc/calamares')
| -rw-r--r-- | pkgs/tools/misc/calamares/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 070b7a7699c..2c48f995ca2 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "calamares"; - version = "3.2.8"; + version = "3.2.11"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1ymyl12fzxc5jjfbw4pfmgzp036w0dai76f7anilw2bnwfzq5g62"; + sha256 = "1djrc8p6kll8szycyj86v02jphiw2xwfhn563siykphfqr0jknlw"; }; buildInputs = [ |