From b2a91caea06ef77bc8bcfd7c77f095984edaefe6 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Tue, 2 Feb 2016 10:14:26 -0500 Subject: [PATCH 1/6] vim_configurable: add configuration option for XIM support --- pkgs/applications/editors/vim/configurable.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index e2715b1499a5..2a80f5d42ad7 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -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 From 2bd28145876f28891805000ed9efc81bbf6482fc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 7 Feb 2016 22:39:11 +0000 Subject: [PATCH 2/6] nodePackages.oauth: use fetchFromGitHub fixup to 9a5a967 --- pkgs/top-level/node-packages-generated.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 1c68d1badc84..12d0aff2616e 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1,4 +1,4 @@ -{ self, fetchurl, fetchgit ? null, lib }: +{ self, fetchurl, fetchgit ? null, fetchFromGitHub, lib }: { by-spec."Base64"."~0.2.0" = @@ -29314,10 +29314,11 @@ name = "oauth-0.9.12"; version = "0.9.12"; bin = false; - src = fetchurl { - url = "https://github.com/ciaranj/node-oauth/tarball/0.9.12"; - name = "oauth-0.9.12.tgz"; - sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7"; + src = fetchFromGitHub { + owner = "ciaranj"; + repo = "node-oauth"; + rev = "0.9.12"; + sha256 = "1c67nq1q5isfcvyp520q02w5c527s1wsfiyknzfvvp22sf2yn7k6"; }; deps = { }; From ce99feec689b5c5832db1e344246110605e0e3b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Feb 2016 00:36:38 +0100 Subject: [PATCH 3/6] zstd: 0.4.7 -> 0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit “New: dictionary builder tool Changed: advanced API for streaming and dictionary compression Improved: better compression of small data.” --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index d60b4b3614a0..e095b2d4e073 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -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"; From 65beea69d75f05aa0ac5f00baec2e2ead4345f15 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 8 Feb 2016 13:20:44 +0900 Subject: [PATCH 4/6] i3status: 2.9 -> 2.10, fixes #12872 --- pkgs/applications/window-managers/i3/status.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 97b200e340e2..1693e7ed0fd4 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -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"; From 3c168a714e4da8a498ee8a8a4c8bd03e7c70d964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 8 Feb 2016 13:09:29 +0800 Subject: [PATCH 5/6] dvtm: 0.14 -> 0.15 --- pkgs/tools/misc/dvtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 32d6b6fa6ef1..5969c9562369 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -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 ]; From 9afe794f5eac3830c7df932a739520f2d3ecc0bf Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 8 Feb 2016 10:10:38 +0000 Subject: [PATCH 6/6] coqPackages.contribs.Bertrand: fix hash --- pkgs/development/coq-modules/contribs/all.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix index d01c32bdb0af..d2ef82c55875 100644 --- a/pkgs/development/coq-modules/contribs/all.nix +++ b/pkgs/development/coq-modules/contribs/all.nix @@ -11,7 +11,7 @@ AreaMethod = "07d86p5xbnhbrily18hda0hymf3zx8yhw905plmrqyfbcc6x5531"; Automata = "0g75gjdj79ysiq1pwqk658jxs2z1l8pk702iz69008vkjzbzkhvm"; AxiomaticABP = "19x16dgsqyw2pflza8cgv29585a6yy3r8pz4z8ns3r7qhpp1449b"; BDDs = "0s5a67w9v1lklph8dm4d9bkd6f9qzfb377gvisr3hslacn9ya8zy"; -Bertrand = "1ih0zbk3phk0zwms0mwkcikmki25hgbp1l980gpydj5a0s9ildyg"; +Bertrand = "05i6xw9gi5ad78rsw5pfhiqllw9x4q4phfi4ddzlxpsgshiw7d0k"; Buchberger = "1v7zi62ar4inncbcphalsyaggx8im02j81b0fnpvx2x3kyv2pr94"; CCS = "1na7902k05z19a727wa7rz0dbf1fhcl53r4zxvcgvg5dasvwfc97"; CFGV = "13gk597r9n2wcgcbhribsqrp9wb8mmr3qd4zbv2ig8469kng0j4m";