alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse source
This commit is contained in:
Robin Gloster 2016-02-08 10:11:43 +00:00
parent b457f695d9 9afe794f5e
commit 8057e7e47e
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/editors/vim/configurable.nix
View file

@ -154,6 +154,7 @@ composableDerivation {
multibyteSupport = config.vim.multibyte or false;
cscopeSupport = config.vim.cscope or true;
netbeansSupport = config.netbeans or true; # eg envim is using it
ximSupport = config.vim.xim or false;
# by default, compile with darwin support if we're compiling on darwin, but
# allow this to be disabled by setting config.vim.darwin to false

11
pkgs/applications/window-managers/i3/status.nix
View file

@ -1,18 +1,17 @@
{ fetchurl, stdenv, confuse, yajl, alsaLib, wirelesstools
{ fetchurl, stdenv, confuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig
}:
stdenv.mkDerivation rec {
name = "i3status-2.9";
name = "i3status-2.10";
src = fetchurl {
url = "http://i3wm.org/i3status/${name}.tar.bz2";
sha256 = "1qwxbrga2fi5wf742hh9ajwa8b2kpzkjjnhjlz4wlpv21i80kss2";
sha256 = "1497dsvb32z9xljmxz95dnyvsbayn188ilm3l4ys8m5h25vd1xfs";
};
buildInputs = [ confuse yajl alsaLib wirelesstools ];
buildInputs = [ confuse yajl alsaLib libpulseaudio libnl pkgconfig ];
makeFlags = "all";
installFlags = "PREFIX=\${out}";
makeFlags = [ "all" "PREFIX=$(out)" ];
meta = {
description = "A tiling window manager";

2
pkgs/development/coq-modules/contribs/all.nix
View file

@ -11,7 +11,7 @@ AreaMethod = "07d86p5xbnhbrily18hda0hymf3zx8yhw905plmrqyfbcc6x5531";
Automata = "0g75gjdj79ysiq1pwqk658jxs2z1l8pk702iz69008vkjzbzkhvm";
AxiomaticABP = "19x16dgsqyw2pflza8cgv29585a6yy3r8pz4z8ns3r7qhpp1449b";
BDDs = "0s5a67w9v1lklph8dm4d9bkd6f9qzfb377gvisr3hslacn9ya8zy";
Bertrand = "1ih0zbk3phk0zwms0mwkcikmki25hgbp1l980gpydj5a0s9ildyg";
Bertrand = "05i6xw9gi5ad78rsw5pfhiqllw9x4q4phfi4ddzlxpsgshiw7d0k";
Buchberger = "1v7zi62ar4inncbcphalsyaggx8im02j81b0fnpvx2x3kyv2pr94";
CCS = "1na7902k05z19a727wa7rz0dbf1fhcl53r4zxvcgvg5dasvwfc97";
CFGV = "13gk597r9n2wcgcbhribsqrp9wb8mmr3qd4zbv2ig8469kng0j4m";

4
pkgs/tools/compression/zstd/default.nix
View file

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "zstd-${version}";
version = "0.4.7";
version = "0.5.0";
src = fetchFromGitHub {
sha256 = "09l917979qfqk44dbgsa9vs37a2qj4ga43553zcgvnps02wlja8s";
sha256 = "18jwhvzj3kv8lpr6fgild7a574lsak93fc1z8nvhcdbc1b1n2dsj";
rev = "v${version}";
repo = "zstd";
owner = "Cyan4973";

4
pkgs/tools/misc/dvtm/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
name = "dvtm-0.14";
name = "dvtm-0.15";
meta = {
description = "Dynamic virtual terminal manager";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/${name}.tar.gz";
sha256 = "0ykl8dz7ivjgdzhmhlgidnp2ffh5gxq9lbg276w7iid4z10v76wa";
sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g";
};
buildInputs = [ ncurses ];