diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-11-16 20:32:20 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-11-16 20:32:44 +0100 |
commit | 68430cf3d7dae00f8eda1156de6b90243424e25a (patch) | |
tree | 4b008270a344486a20c8603047821923bf71e223 /pkgs/applications/networking/instant-messengers | |
parent | 8e0d77632e02720a8adf8126f126990501299191 (diff) | |
parent | b5356f7f275e6fb15c6fda0ce65de26de98a87d0 (diff) | |
download | nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.gz nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.bz2 nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.lz nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.xz nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.zst nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.zip |
Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here): pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/toxic/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index c2af1274a24..59aef8c6c43 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -2,8 +2,8 @@ , libtoxcore, pkgconfig }: let - version = "75d356e52a"; - date = "20131011"; + version = "5570b7c98aa"; + date = "20131112"; in stdenv.mkDerivation rec { name = "toxic-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Tox/toxic/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "14wyvms8l07sl88g8y6g2jv95sq7cnhbaqf4n32xxilch8rymq47"; + sha256 = "02jfdp10qcw4w62qpra59m9yzzk7a3k2nypkbq5q7ydksbqlx8sj"; }; preConfigure = '' |