diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:27:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:29:24 +0100 |
| commit | a2c316288c8f3714e57dc1037d7a993a2088ab18 (patch) | |
| tree | ee4af0b96a5bc0e55b92c8d76465b333a698a260 /pkgs/applications/networking | |
| parent | 51713fbbfcaf819f176df8f3ce75f57880aeb690 (diff) | |
| parent | a0070a9157d7d145eed22160cec2562d24032013 (diff) | |
| download | nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.gz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.bz2 nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.lz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.xz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.zst nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.zip | |
Merge master into stdenv-updates
Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 5797354d33bd..3c7cfde231ab 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.16"; + name = "notmuch-0.17"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0i7k85lfp9l0grmq7cvai2f3pw15jcrhcp96mmamr15y2pn2syg7"; + sha256 = "15dypk2damyvxgfc8dy6iiky1ayxnj5samd4v300pi9nwpky05fj"; }; buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index a5ca5e7b488f..a57ea9389c6f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -2,14 +2,14 @@ , geoip, heimdal, lua5, gtk, makeDesktopItem }: -let version = "1.10.3"; in +let version = "1.10.5"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "1329zph63z5mcij9lp111bh6b2w88z3d40gvjld2rjmhmqv1nr61"; + sha256 = "1xa1l6z8n1gwnyv5mq4zmyr0afy6s0qpl9wqflg3ipbkjpd908d0"; }; buildInputs = |