Merge branch 'master' of git://github.com/NixOS/nixpkgs

This commit is contained in:
Eelco Dolstra 2019-01-10 16:53:34 +01:00
commit 6232df2a1e
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
3 changed files with 9 additions and 4 deletions

View File

@ -31,11 +31,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "claws-mail-${version}"; name = "claws-mail-${version}";
version = "3.17.2"; version = "3.17.3";
src = fetchurl { src = fetchurl {
url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
sha256 = "1hb17kpvfl8f1y49zan0wvf4awapxg13bqbqwrbhq2n4xp445kr5"; sha256 = "1wnj6c9cbmhphs2l6wfvndkk2g08rmxw0sl2c8k1k008dxd1ykjh";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, glibcLocales
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -12,6 +13,10 @@ buildPythonPackage rec {
sha256 = "8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2"; sha256 = "8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2";
}; };
buildInputs = [ glibcLocales ];
LANG = "en_US.UTF-8";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Pure-Python HPACK header compression"; description = "Pure-Python HPACK header compression";
homepage = "http://hyper.rtfd.org"; homepage = "http://hyper.rtfd.org";

View File

@ -6,8 +6,8 @@ let
## fetchgit info ## fetchgit info
url = git://sourceware.org/git/systemtap.git; url = git://sourceware.org/git/systemtap.git;
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0hckbmrlcz5nj438409fmdjjaaqzf68r2242v10lkssw5daia1gj"; sha256 = "075p45ndr4pzrf5679hcsw1ws4x0xqvx3m037v04545762hki6la";
version = "3.3"; version = "4.0";
inherit (kernel) stdenv; inherit (kernel) stdenv;
inherit (stdenv) lib; inherit (stdenv) lib;