diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-16 03:09:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-16 03:09:33 +0300 |
| commit | 6b6a57574828b21632a7b8ff3a99e1465035b93e (patch) | |
| tree | 07fe10e97c2d0b4cbf45e90952d8c7d948e84c59 /pkgs/tools/graphics | |
| parent | ce018be2d6ce20960b52ebc4bd86e64a5a58ce29 (diff) | |
| parent | 780592ca6ef752f3f4886a66ed6181095e358db5 (diff) | |
| download | nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.gz nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.bz2 nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.lz nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.xz nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.zst nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/maim/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index cac86e29c472..cd0cff0f3899 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.5"; + version = "5.5.1"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "0dr44lwqsvhwf9pncxq6k42zj9hj07b96qsk1q8vh4l42zcpqzla"; + sha256 = "106qg85q0aiw4w08vjg9j60brrbln11b8vdycjqkv8fq00pq308i"; }; nativeBuildInputs = [ cmake pkgconfig ]; |