diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
commit | e51f73652d38d5c53b331b7bcae2e2483e1b8afe (patch) | |
tree | 9126d3fd0737db3a0d57cda866d96c377fc0e452 /pkgs/applications/networking/instant-messengers/toxic/default.nix | |
parent | a283bec71cec60c2b9c84ea9af320fc8df0dfd5f (diff) | |
parent | 4e0d2706f174bb893378a8241df7bd2055901b9e (diff) | |
download | nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.gz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.bz2 nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.lz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.xz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.zst nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.zip |
Merge recent master into staging
Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/toxic/default.nix')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/toxic/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index b3e1ff74cfa5..f7d1a010ed8f 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -2,16 +2,13 @@ , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: let - version = "7566aa9d26"; - date = "20140728"; -in -stdenv.mkDerivation rec { - name = "toxic-${date}-${version}"; + version = "0.4.7"; +in stdenv.mkDerivation rec { + name = "toxic-${version}"; src = fetchurl { - url = "https://github.com/Tox/toxic/tarball/${version}"; - name = "${name}.tar.gz"; - sha256 = "13vns0qc0hxhab6rpz0irnzgv42mp3v1nrbwm90iymhf4xkc9nwa"; + url = "https://github.com/Tox/toxic/archive/v${version}.tar.gz"; + sha256 = "0rcrcqzvicz7787fa4b7f68qnwq6wqbyrm8ii850f1w7vnxq9dkq"; }; makeFlags = [ "-Cbuild" "VERSION=${version}" ]; |