diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
| commit | 4aa3eec330f64afd9db78b9bb26db32bdbabe2c4 (patch) | |
| tree | 90cb19f6cfb8498dff0597a7ae2968b240b1e559 /pkgs/applications/graphics | |
| parent | 43c4d78bc6e19476c122efc82316122722e988aa (diff) | |
| parent | ad4ad11fbc8871811d65d0b2427fd4bc38e54a14 (diff) | |
| download | nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.gz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.bz2 nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.lz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.xz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.zst nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/development/libraries/fontconfig/default.nix
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/sxiv/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index c1c78f9116c9..a82dafb516e0 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/muennich/sxiv.git"; - rev = "54af451b4a81b5b1072f27de0981a2d39cabc2d6"; - sha256 = "1b0fb6bd8d36af4c7f1160fcc12b5b7382546c7da35b4924d259f7efaa4c97d0"; + rev = "6216bf6c2d42be63025d29550831d9f4447f4066"; + sha256 = "e25e19cf073cc2621656e50d2c31cc59cc0fc200716f96c765374568a26977f1"; }; postUnpack = '' |