From 2c05eb96bccf6a160b9e2b5a473f161ee5a712cb Mon Sep 17 00:00:00 2001 From: vi Date: Mon, 2 Jun 2014 16:08:36 +0800 Subject: [PATCH 01/67] Supplementary derivation for s3cmd, building from git HEAD. --- pkgs/tools/networking/s3cmd/git.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/release-python.nix | 1 + 3 files changed, 22 insertions(+) create mode 100644 pkgs/tools/networking/s3cmd/git.nix diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix new file mode 100644 index 00000000000..b6019c7eda1 --- /dev/null +++ b/pkgs/tools/networking/s3cmd/git.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchgit, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "s3cmd_git"; + + src = fetchgit { + url = "https://github.com/s3tools/s3cmd.git"; + rev = "81e3842f7afbc8c629f408f4d7dc22058f7bd536"; + sha256 = "13jqw19ws5my8r856j1p7xydwpyp8agnzxkjv6pa7h72wl7rz90i"; + }; + + propagatedBuildInputs = with pythonPackages; [ dateutil ]; + + meta = with stdenv.lib; { + description = "Command line tool for managing Amazon S3 and CloudFront services"; + homepage = http://s3tools.org/s3cmd; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d25e33bd81f..fc7e4fcd67d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1962,6 +1962,8 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; + s3cmd_git = callPackage ../tools/networking/s3cmd/git.nix { }; + s3sync = callPackage ../tools/networking/s3sync { ruby = ruby18; }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 074f7ea4f7b..61d1ad7ad68 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1521,6 +1521,7 @@ let rxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rxvt_unicode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; s3cmd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + s3cmd_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; sabnzbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; sakura = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; salut_a_toi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From db7be30172bd6ec9d46fb1c7dd26310e193ba937 Mon Sep 17 00:00:00 2001 From: vi Date: Mon, 2 Jun 2014 18:02:13 +0800 Subject: [PATCH 02/67] s3cmd-1.5-pre-81e3842f7a: Use more precise naming convention. --- pkgs/tools/networking/s3cmd/git.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix index b6019c7eda1..6193137c8d4 100644 --- a/pkgs/tools/networking/s3cmd/git.nix +++ b/pkgs/tools/networking/s3cmd/git.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "s3cmd_git"; + name = "s3cmd-1.5-pre-81e3842f7a"; src = fetchgit { url = "https://github.com/s3tools/s3cmd.git"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc7e4fcd67d..13cf41ade4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1962,7 +1962,7 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; - s3cmd_git = callPackage ../tools/networking/s3cmd/git.nix { }; + s3cmd_15_pre_81e3842f7a = callPackage ../tools/networking/s3cmd/git.nix { }; s3sync = callPackage ../tools/networking/s3sync { ruby = ruby18; From 01211ff333a8554a45fbf3147a6ac4e550523a59 Mon Sep 17 00:00:00 2001 From: vi Date: Mon, 2 Jun 2014 18:02:56 +0800 Subject: [PATCH 03/67] s3cmd-1.5-pre-81e3842f7a: Use buildInputs, not propagatedBuildInputs. --- pkgs/tools/networking/s3cmd/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix index 6193137c8d4..a7d43a470f8 100644 --- a/pkgs/tools/networking/s3cmd/git.nix +++ b/pkgs/tools/networking/s3cmd/git.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "13jqw19ws5my8r856j1p7xydwpyp8agnzxkjv6pa7h72wl7rz90i"; }; - propagatedBuildInputs = with pythonPackages; [ dateutil ]; + buildInputs = with pythonPackages; [ dateutil ]; meta = with stdenv.lib; { description = "Command line tool for managing Amazon S3 and CloudFront services"; From f42961daadf64a67a91c6d2d2a3b01dc428ba66c Mon Sep 17 00:00:00 2001 From: vi Date: Mon, 2 Jun 2014 18:04:24 +0800 Subject: [PATCH 04/67] Mark s3cmd-1.5-pre-81e3842f7a as low priority. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13cf41ade4d..eeee0fcb038 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1962,7 +1962,7 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; - s3cmd_15_pre_81e3842f7a = callPackage ../tools/networking/s3cmd/git.nix { }; + s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { }); s3sync = callPackage ../tools/networking/s3sync { ruby = ruby18; From d7182bdf2bcd9d1863506d7d532dcd844764bc80 Mon Sep 17 00:00:00 2001 From: vi Date: Tue, 3 Jun 2014 11:55:10 +0800 Subject: [PATCH 05/67] Revert "s3cmd-1.5-pre-81e3842f7a: Use buildInputs, not propagatedBuildInputs." This reverts commit 01211ff333a8554a45fbf3147a6ac4e550523a59. --- pkgs/tools/networking/s3cmd/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix index a7d43a470f8..6193137c8d4 100644 --- a/pkgs/tools/networking/s3cmd/git.nix +++ b/pkgs/tools/networking/s3cmd/git.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "13jqw19ws5my8r856j1p7xydwpyp8agnzxkjv6pa7h72wl7rz90i"; }; - buildInputs = with pythonPackages; [ dateutil ]; + propagatedBuildInputs = with pythonPackages; [ dateutil ]; meta = with stdenv.lib; { description = "Command line tool for managing Amazon S3 and CloudFront services"; From 7b1b46b96bc282e96ad868de677058c3927bcd72 Mon Sep 17 00:00:00 2001 From: System administrator Date: Wed, 11 Jun 2014 12:58:40 +0200 Subject: [PATCH 06/67] mssql support for php-5.4 small changes to freetds see: http://www.php.net/manual/de/mssql.setup.php --- pkgs/development/interpreters/php/5.4.nix | 8 +++++++- pkgs/development/libraries/freetds/default.nix | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 5aabb61586e..99f18c175c3 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash }: +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds }: let libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -171,6 +171,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-fpm"]; }; + mssql = { + configureFlags = ["--with-mssql=${freetds}"]; + buildInputs = [freetds]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -213,6 +218,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) zipSupport = config.php.zip or true; ftpSupport = config.php.ftp or true; fpmSupport = config.php.fpm or true; + mssqlSupport = config.php.mssql or true; }; configurePhase = '' diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 0d8fa1bd281..547e9e813be 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation { sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; }; + doDist = true; + + distPhase = '' + touch $out/include/tds.h + touch $out/lib/libtds.a + ''; + meta = { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; From ca59c577d04df963a6e09d17e089a1d3c34da4e7 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 12 Jun 2014 18:53:21 -0400 Subject: [PATCH 07/67] libogg, libvorbis: update to 1.3.2, 1.3.4 --- pkgs/development/libraries/libogg/default.nix | 18 +++++++++++------- .../libraries/libvorbis/default.nix | 19 +++++++++++++------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index b11b1202080..492538f1802 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "libogg-1.3.1"; +let + name = "libogg-1.3.2"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "1ynwij1qdibwb2nvcl3ixri0c6pvq1higl96hf87iyqsv1wasnrs"; + sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z"; }; - nativeBuildInputs = [ xz ]; - - meta = { + meta = with stdenv.lib; { homepage = http://xiph.org/ogg/; + license = licenses.bsd3; + maintainers = [ maintainers.emery ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index b1277b87e6a..82c218d67b3 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchurl, libogg, xz }: +{ stdenv, fetchurl, libogg }: -stdenv.mkDerivation rec { - name = "libvorbis-1.3.3"; +let + name = "libvorbis-1.3.4"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43"; + sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g"; }; - nativeBuildInputs = [ xz ]; propagatedBuildInputs = [ libogg ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { homepage = http://xiph.org/vorbis/; + license = licenses.bsd3; + maintainers = [ maintainers.emery ]; + platforms = platforms.all; }; } From d9ed7c5a9cde89564d517cbc3138dd78b8a74b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sat, 14 Jun 2014 11:58:00 +0200 Subject: [PATCH 08/67] openxcom: add version 1.0.0 --- pkgs/games/openxcom/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/games/openxcom/default.nix diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix new file mode 100644 index 00000000000..657d3d9fa06 --- /dev/null +++ b/pkgs/games/openxcom/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boostHeaders +, SDL, SDL_image, SDL_mixer, SDL_gfx }: + +let version = "1.0.0"; in +stdenv.mkDerivation { + name = "openxcom-${version}"; + src = fetchurl { + url = http://openxcom.org/wp-content/plugins/download-monitor/download.php?id=31; + sha256 = "00pc6ncsjbvn6w8whpj0bk4hlh577wh40bkyv6lk0g5c901p732l"; + name = "openxcom-${version}.tar.gz"; + }; + + buildInputs = [ cmake mesa zlib openssl libyamlcpp boostHeaders + SDL SDL_image SDL_mixer SDL_gfx ]; + + meta = { + description = "Open source clone of UFO: Enemy Unknown"; + homepage = http://openxcom.org; + repositories.git = https://github.com/SupSuper/OpenXcom.git; + maintainers = [ stdenv.lib.maintainers.page ]; + platforms = stdenv.lib.platforms.linux; + license = "GPLv3"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e9a517d89b..3b92d5e4f2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10071,6 +10071,8 @@ let opentyrian = callPackage ../games/opentyrian { }; + openxcom = callPackage ../games/openxcom { }; + pingus = callPackage ../games/pingus {}; pioneers = callPackage ../games/pioneers { }; From e3f4d343a36dd6389e42f4f7d05dc0ec1ff2f303 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Mon, 16 Jun 2014 12:12:11 +1200 Subject: [PATCH 09/67] Change to xpra version 0.11.6 as 0.12.5 was not working Version 0.11.6 was the latest version that I was able to get building and running on NixOS. Unfortunately my previous commit for 0.12.5 was an error and incomplete. --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 0ceee457276..e6b2f78332d 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -4,12 +4,12 @@ , ffmpeg, x264, libvpx, pil, libwebp }: buildPythonPackage rec { - name = "xpra-0.12.5"; + name = "xpra-0.11.6"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.bz2"; - sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw"; + sha256 = "0n3lr8nrfmrll83lgi1nzalng902wv0dcmcyx4awnman848dxij0"; }; buildInputs = [ From a322687423dc1370f6d6ffb554ebe3bad07d0be5 Mon Sep 17 00:00:00 2001 From: third3ye Date: Mon, 16 Jun 2014 05:24:24 +0200 Subject: [PATCH 10/67] Application.ini does not refer correctly The "Application.ini" provided with Thunderbird does not correctly set the path to the icon location. Visa vi it refers to '$out/lib/thunderbird-17.0.11esr', which doesn't exist, but '$out/lib/thunderbird-17.0.11' does. To remedy this problem I added a new variable called 'verName" which adds 'esr' after the variable '$version'. Then change the variables necessary so that the build process sets working references. Fuuzetsu suggested putting the verName variable inside of mkDerivation. I cannot surmise. --- .../networking/mailreaders/thunderbird/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 3a8dab10ff2..85dab3777ba 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,13 +12,14 @@ enableOfficialBranding ? false }: -let version = "17.0.11esr"; in +let version = "17.0.11"; in +let verName = "${version}esr"; in stdenv.mkDerivation { - name = "thunderbird-${version}"; + name = "thunderbird-${verName}"; src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; + url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; sha256 = "1m2lph8x82kgxqzlyaxr1l1x7s4qnqfzfnqck4b777914mrv1mdp"; }; From 63ee29b808c57b5dfa6a174cf64ff5e161530018 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 14 Jun 2014 17:28:43 +0200 Subject: [PATCH 11/67] Org-mode 8.2.7 depends on texlive-cm-super. --- pkgs/applications/editors/emacs-modes/org/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 768444008ad..776a817fc49 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, emacs, texinfo, which, texLive }: +{ fetchurl, stdenv, emacs, texinfo, which, texLive, texLiveCMSuper +, texLiveAggregationFun }: stdenv.mkDerivation rec { name = "org-8.2.7"; @@ -9,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ emacs ]; - nativeBuildInputs = [ texinfo texLive ]; + nativeBuildInputs = [ (texLiveAggregationFun { paths=[ texinfo texLive texLiveCMSuper ]; }) ]; configurePhase = '' sed -i mk/default.mk \ From 69492796ef3968e9c1787a96c36707b70a3034df Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Jun 2014 16:37:37 +0200 Subject: [PATCH 12/67] conkeror: upgrade to latest snapshot --- pkgs/applications/networking/browsers/conkeror/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index cd96c0a6be8..47381f06d68 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20140509"; + name = "conkeror-1.0pre-20140616"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "eaf02dccf979d824667d177544103af000ae40bf"; - sha256 = "1896db59d260f34a459402cb0c252b636aab9bf0378ae663a6d039f15af5b350"; + rev = "8a26fff5896a3360549e2adfbf06b1d57e909266"; + sha256 = "56f1c71ca1753a63d7599d3e8bf52277711b2693e7709ed7c146f34940441cb4"; }; buildInputs = [ unzip makeWrapper ]; From ab8337e4fcd14ce70c27a0ae98e7241f41b8e71d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 5 Jun 2014 15:42:39 +0200 Subject: [PATCH 13/67] add emacs-metaweblog --- .../emacs-modes/metaweblog/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/metaweblog/default.nix diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix new file mode 100644 index 00000000000..2a35c6ef695 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, emacs, xmlRpc }: + +stdenv.mkDerivation rec { + name = "metaweblog-0.1"; + + src = fetchgit { + url = https://github.com/punchagan/metaweblog.git; + rev = "ceda65048afaa4c7596c7f50ced998c59ef41167"; + sha256 = "a4c10bb1b4be574e560f87d5f07da4e24e5fffe9ecc83e6d4f9325f3a7eb1e2f"; + }; + + buildInputs = [ emacs ]; + propagatedUserEnvPkgs = [ xmlRpc ]; + + buildPhase = '' + emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install *.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "an emacs library to access metaweblog based weblogs"; + homepage = https://github.com/punchagan/metaweblog; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3ba6a64df2..69ee88089cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8353,6 +8353,8 @@ let maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; + metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; + notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; From b193dd5d7779756d0dd083f3eb06f44cb94d4339 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 5 Jun 2014 15:42:55 +0200 Subject: [PATCH 14/67] emacs-org2blog: upgrade to 0.8.1 --- .../editors/emacs-modes/org2blog/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix index e72560be8f4..d2e9e305bff 100644 --- a/pkgs/applications/editors/emacs-modes/org2blog/default.nix +++ b/pkgs/applications/editors/emacs-modes/org2blog/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchgit, emacs, xmlRpc }: +{ stdenv, fetchgit, emacs, org, xmlRpc, metaweblog }: stdenv.mkDerivation rec { - name = "org2blog-0.5"; + name = "org2blog-0.8.1"; src = fetchgit { url = https://github.com/punchagan/org2blog.git; - rev = "338abe30e9bc89684f8384f8deaf826b63844da6"; - sha256 = "46ab31e90d0d54071c126b7d5599a3e82062baa79ddf26b988bcb88d306d6827"; + rev = "5f573ff3e4007c16517a5fe28c4f5d8dde3f8a77"; + sha256 = "e83c08ceece92bb507be70046db4a7fa87a4af34ad3f84a727e0bd6a1dd99a33"; }; buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ xmlRpc ]; + propagatedUserEnvPkgs = [ org xmlRpc metaweblog ]; buildPhase = '' - emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el + emacs -L . -L ${org}/share/emacs/site-lisp/org \ + -L ${xmlRpc}/share/emacs/site-lisp \ + -L ${metaweblog}/share/emacs/site-lisp \ + --batch -f batch-byte-compile *.el ''; installPhase = '' From 8d708ba35ab63d59e4b8b8be854968bb856e24c6 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 11 Jun 2014 10:38:01 +0200 Subject: [PATCH 15/67] idris: provide boehmgc to compile with llvm backend --- pkgs/development/compilers/idris/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/idris/wrapper.nix b/pkgs/development/compilers/idris/wrapper.nix index 427a690234c..fce5c0c89f3 100644 --- a/pkgs/development/compilers/idris/wrapper.nix +++ b/pkgs/development/compilers/idris/wrapper.nix @@ -1,10 +1,10 @@ -{ gmp, makeWrapper, gcc, runCommand, idris_plain}: +{ gmp, makeWrapper, gcc, runCommand, idris_plain, boehmgc}: runCommand "idris-wrapper" {} '' source ${makeWrapper}/nix-support/setup-hook mkdir -p $out/bin ln -s ${idris_plain}/bin/idris $out/bin wrapProgram $out/bin/idris \ - --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib"' \ + --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \ --suffix PATH : ${gcc}/bin '' From ff995adb0d9a253bdd20f04e5c7805263f2d2b4f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 12 Jun 2014 19:23:48 +0200 Subject: [PATCH 16/67] emacs-idris-mode: upgrade to 0.9.13.1 --- .../editors/emacs-modes/idris/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 8671a926f67..614a3703051 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, emacs }: +{ stdenv, fetchurl, emacs }: stdenv.mkDerivation rec { - name = "idris-mode-20140405"; + name = "${pname}-${version}"; + pname = "idris-mode"; + version = "0.9.13.1"; - src = fetchgit { - url = https://github.com/idris-hackers/idris-mode.git; - rev = "2e2d18fb757da4b42940ebe2a57d7a117175489f"; - sha256 = "d4b52c6c43c038c94a7464cd9c849cd40c01696c440da8b057c00a9be22f9ac0"; + src = fetchurl { + url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz"; + sha256 = "0ymjbkwsq7qra691wyldw91xcdgrbx3468vvrha5jj92v7nwb8wx"; }; buildInputs = [ emacs ]; From 76c2c0c499c6472cd2fbed81899dd2996bb16c07 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 3 Jun 2014 15:59:08 +0200 Subject: [PATCH 17/67] nginx: add echo module, fix aio on linux&freebsd --- pkgs/servers/http/nginx/default.nix | 32 ++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 32d4634e7fb..8f748078dcf 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -3,7 +3,10 @@ , rtmp ? false , fullWebDAV ? false , syslog ? false -, moreheaders ? false}: +, moreheaders ? false +, echo ? false }: + +with stdenv.lib; let version = "1.6.0"; @@ -35,6 +38,12 @@ let rev = "0c6e05d3125a97892a250e9ba8b7674163ba500b"; sha256 = "e121d97fd3c81c64e6cbf6902bbcbdb01be9ac985c6832d40434379d5e998eaf"; }; + + echo-ext = fetchgit { + url = https://github.com/openresty/echo-nginx-module.git; + rev = "refs/tags/v0.53"; + sha256 = "90d4e3a49c678019f4f335bc18529aa108fcc9cfe0747ea4e2f6084a70da2868"; + }; in stdenv.mkDerivation rec { @@ -43,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip - ] ++ stdenv.lib.optional fullWebDAV expat; + ] ++ optional fullWebDAV expat; patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else []; @@ -69,12 +78,15 @@ stdenv.mkDerivation rec { "--with-ipv6" # Install destination problems # "--with-http_perl_module" - ] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}" - ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" - ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}" - ++ stdenv.lib.optional moreheaders "--add-module=${moreheaders-ext}"; + ] ++ optional rtmp "--add-module=${rtmp-ext}" + ++ optional fullWebDAV "--add-module=${dav-ext}" + ++ optional syslog "--add-module=${syslog-ext}" + ++ optional moreheaders "--add-module=${moreheaders-ext}" + ++ optional echo "--add-module=${echo-ext}" + ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"; - additionalFlags = stdenv.lib.optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations"; + + additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations"; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" @@ -87,8 +99,8 @@ stdenv.mkDerivation rec { meta = { description = "A reverse proxy and lightweight webserver"; homepage = http://nginx.org; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice raskin ]; }; } From a97bef3e8c58334a859a76bdf8118cf071a894d8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 3 Jun 2014 16:00:27 +0200 Subject: [PATCH 18/67] nixos/nginx: fix group and stateDir permissions furthermore, I don't think adding nginx to systemPackages is of any use. --- nixos/modules/services/web-servers/nginx/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index ff94ee42d28..7c2d3a42973 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -84,8 +84,6 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ nginx ]; - # TODO: test user supplied config file pases syntax test systemd.services.nginx = { @@ -96,6 +94,7 @@ in preStart = '' mkdir -p ${cfg.stateDir}/logs + chmod 700 ${cfg.stateDir} chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} ''; serviceConfig = { @@ -105,7 +104,7 @@ in users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton { name = "nginx"; - group = "nginx"; + group = cfg.group; uid = config.ids.uids.nginx; }); From 35df71ac1df83f05bf58298245a014553330860e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 7 Jun 2014 17:34:27 +0200 Subject: [PATCH 19/67] phpfpm: add option for setting php.ini file --- nixos/modules/services/web-servers/phpfpm.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix index 4a14f9b41a4..8551e3ccdeb 100644 --- a/nixos/modules/services/web-servers/phpfpm.nix +++ b/nixos/modules/services/web-servers/phpfpm.nix @@ -42,6 +42,12 @@ in { ''; }; + phpIni = mkOption { + type = types.path; + default = "${cfg.phpPackage}/etc/php-recommended.ini"; + description = "php.ini file to use."; + }; + poolConfigs = mkOption { type = types.attrsOf types.lines; default = {}; @@ -75,7 +81,7 @@ in { mkdir -p "${stateDir}" ''; serviceConfig = { - ExecStart = "${cfg.phpPackage}/sbin/php-fpm -y ${cfgFile}"; + ExecStart = "${cfg.phpPackage}/sbin/php-fpm -y ${cfgFile} -c ${cfg.phpIni}"; PIDFile = pidFile; }; }; From 464739c39166b81eacac459253ebcf311cf9297e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 24 May 2014 13:58:05 +0200 Subject: [PATCH 20/67] samba really requires its daemons --- nixos/modules/services/network-filesystems/samba.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 51a4d193d50..4218b965cd9 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -59,7 +59,7 @@ let daemonService = appName: args: { description = "Samba Service Daemon ${appName}"; - wantedBy = [ "samba.target" ]; + requiredBy = [ "samba.target" ]; partOf = [ "samba.target" ]; environment = { From 88b5578a579ca7eefc8ac5507f9a5be3cc3684ca Mon Sep 17 00:00:00 2001 From: Paul Woolcock Date: Mon, 16 Jun 2014 21:53:40 -0400 Subject: [PATCH 21/67] add OPENSSL_X509_CERT_FILE to the `git` command environment --- .../version-management/git-and-tools/git/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index f95b5a493a6..ce134490620 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -82,6 +82,10 @@ stdenv.mkDerivation { # gitweb.cgi, need to patch so that it's found sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ $out/share/gitweb/gitweb.cgi + + wrapProgram $out/bin/git \ + --set GIT_SSL_CAINFO "\$OPENSSL_X509_CERT_FILE" + '' + (if svnSupport then From 9c83a6bc766013d6e9929a670d385385e878f91a Mon Sep 17 00:00:00 2001 From: third3ye Date: Tue, 17 Jun 2014 03:24:39 +0000 Subject: [PATCH 22/67] Minor logic fix music_directory "${cfg.musicDirectory}" playlist_directory "${cfg.dataDir}/playlists" db_file "${cfg.dataDir}/tag_cache" state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" all refer to ${cfg.datadir}, which by default is "/var/lib/mpd/". Parsing for instance ${cfg.datadir}/playlists results in: /var/lib/mpd//playlists - NOT FOUND. --- nixos/modules/services/audio/mpd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 1b50f06bf30..53542e34b14 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -52,7 +52,7 @@ in { }; dataDir = mkOption { - default = "/var/lib/mpd/"; + default = "/var/lib/mpd"; description = '' The directory where MPD stores its state, tag cache, playlists etc. From 5bc69209b1a0d1e2b713d80b4c1a8ccfb95ade07 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Jun 2014 08:17:16 +0200 Subject: [PATCH 23/67] linux-3.15: upgrade to 3.15.1 --- pkgs/os-specific/linux/kernel/linux-3.15.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix index 69721292b5b..531b85b789a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.15"; + version = "3.15.1"; extraMeta.branch = "3.15"; - modDirVersion = "3.15.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "153pn0zjzgi3ls4gy12n900ayskpq0yncn0vra5glh20ps3px4n3"; + sha256 = "0bmzag945bb9v20xc2f6i4syx456prai3qj5cxhm8cb76wby4s8b"; }; features.iwlwifi = true; From 3fd519822f0247b199afb1fdc850ac345e151f0a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Jun 2014 08:09:04 +0200 Subject: [PATCH 24/67] agda-stdlib: upgrade to 0.8 (they keep changing the version scheme) Conflicts: pkgs/development/compilers/agda/stdlib-0.8.nix pkgs/top-level/haskell-packages.nix --- .../agda/{stdlib-2.4.0.nix => stdlib-0.8.nix} | 12 ++++++------ pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/compilers/agda/{stdlib-2.4.0.nix => stdlib-0.8.nix} (70%) diff --git a/pkgs/development/compilers/agda/stdlib-2.4.0.nix b/pkgs/development/compilers/agda/stdlib-0.8.nix similarity index 70% rename from pkgs/development/compilers/agda/stdlib-2.4.0.nix rename to pkgs/development/compilers/agda/stdlib-0.8.nix index faa55d379b1..d3b848d73b5 100644 --- a/pkgs/development/compilers/agda/stdlib-2.4.0.nix +++ b/pkgs/development/compilers/agda/stdlib-0.8.nix @@ -1,12 +1,12 @@ { cabal, fetchurl, filemanip, Agda }: -cabal.mkDerivation (self: { - pname = "Agda-lib-ffi"; - version = "2.4.0"; +cabal.mkDerivation (self: rec { + pname = "Agda-stdlib"; + version = "0.8"; src = fetchurl { - url = "https://github.com/agda/agda-stdlib/archive/v2.4.0.tar.gz"; - sha256 = "1rz0jrkm1b8d8aj9hbj3yl2k219c57r0cizfx98qqf1b9mwixzbf"; + url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz"; + sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78"; }; buildDepends = [ filemanip Agda ]; @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { mkdir -p $out/share cd .. runhaskell GenerateEverything - ${Agda}/bin/agda -i . -i src Everything.agda + agda -i . -i src Everything.agda cp -pR src $out/share/agda ''; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f2334b9e6a8..e07d3396f82 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2607,7 +2607,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { Agda = self.Agda_2_3_2_2; }; - AgdaStdlib_2_4_0 = callPackage ../development/compilers/agda/stdlib-2.4.0.nix { + AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix { Agda = self.Agda_2_4_0_1; }; AgdaStdlib = self.AgdaStdlib_0_7; From 2d92adcc1a882fea5f92fdbdce2a25eee4c2732a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Jun 2014 08:19:46 +0200 Subject: [PATCH 25/67] agda: change defaults to latest version --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e07d3396f82..76ba858e768 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2602,7 +2602,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {}; Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix {}; - Agda = self.Agda_2_3_2_2; + Agda = self.Agda_2_4_0_1; AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { Agda = self.Agda_2_3_2_2; @@ -2610,7 +2610,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix { Agda = self.Agda_2_4_0_1; }; - AgdaStdlib = self.AgdaStdlib_0_7; + AgdaStdlib = self.AgdaStdlib_0_8; uhc = callPackage ../development/compilers/uhc {}; From 41e5fd84c3d6674b6b954bb2a25037c9bc06db3b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 17 Jun 2014 16:25:53 +0200 Subject: [PATCH 26/67] Updated dwb to latest revision. --- pkgs/applications/networking/browsers/dwb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 40b875c8c57..87a548cbb3b 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas }: stdenv.mkDerivation { - name = "dwb-2014-06-03"; + name = "dwb-2014-06-17"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "d00af56c1e60978060f1b2077f3d49995b98c54f"; - sha256 = "02bs9nbgk8ghaxywhqd8mii4lik748dssn551m00i1305p6q1cjj"; + rev = "9f4bdb9a1f8d5e45071019da4626231dfebd4d8e"; + sha256 = "1nj34w2hhw47jsmswsc1y6a09my8zdd01qxwai8dxdvisld3marm"; }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ]; From f8e108c86522cf31e06a4e31e240dc895605e4fb Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 17 Jun 2014 05:15:29 +0200 Subject: [PATCH 27/67] nixos.tests.installer: Fix test failures due to network being disabled --- nixos/modules/security/sudo.nix | 2 +- nixos/tests/installer.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index e8ed545c8cc..00b640dd281 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -83,7 +83,7 @@ in {src = pkgs.writeText "sudoers-in" cfg.configFile; } # Make sure that the sudoers file is syntactically valid. # (currently disabled - NIXOS-66) - "${pkgs.sudo.override {keepVisudo = true;}}/sbin/visudo -f $src -c && + "${pkgs.sudoWithVisudo}/sbin/visudo -f $src -c && cp $src $out"; target = "sudoers"; mode = "0440"; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 98e8142a0df..13677be86e1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -22,6 +22,7 @@ let isoImage.storeContents = [ pkgs.glibcLocales pkgs.sudo + pkgs.sudoWithVisudo pkgs.docbook5 pkgs.docbook5_xsl pkgs.grub diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 025a4b1cf37..32a7b383c9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2080,6 +2080,8 @@ let sudo = callPackage ../tools/security/sudo { }; + sudoWithVisudo = sudo.override { keepVisudo = true; }; + suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; super = callPackage ../tools/security/super { }; From d619f0ef6d8495b52472c35e571f7b28ed728659 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 1 Jun 2014 17:59:00 +0200 Subject: [PATCH 28/67] sublime3: fix plugin_host (close #2804) Also move the binaries in their own package, so it doesn't pollute the profile. --- .../applications/editors/sublime3/default.nix | 83 ++++++++++++------- 1 file changed, 53 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 3d9dec0d8f8..088d76f4868 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,40 +1,63 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango}: -let - libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; -in +{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper}: + assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -stdenv.mkDerivation rec { - name = "sublimetext3-3.0.59"; - src = - if stdenv.system == "i686-linux" then - fetchurl { - name = "sublimetext-3.0.59.tar.bz2"; - url = http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_3059_x32.tar.bz2; - sha256 = "5ee7b42b5db057108e97b86fd408124fc3f7b56662b2851f59d91f8f0c288088"; - } - else - fetchurl { - name = "sublimetext-3.0.59.tar.bz2"; - url = http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_3059_x64.tar.bz2; - sha256 = "da3039687664d33a734cea0151b2291ece9c7f35e5b73df5b2b5eac28a20b972"; - }; - buildCommand = '' - tar xvf ${src} - mkdir -p $out/bin - mv sublime_text_3 $out/sublime - ln -s $out/sublime/sublime_text $out/bin/sublime - ln -s $out/sublime/sublime_text $out/bin/sublime3 +let + build = "3059"; + libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; +in let + # package with just the binaries + sublime = stdenv.mkDerivation { + name = "sublimetext3-${build}-bin"; - echo ${libPath} - patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ - $out/sublime/sublime_text + src = + if stdenv.system == "i686-linux" then + fetchurl { + name = "sublimetext-3.0.59.tar.bz2"; + url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2"; + sha256 = "5ee7b42b5db057108e97b86fd408124fc3f7b56662b2851f59d91f8f0c288088"; + } + else + fetchurl { + name = "sublimetext-3.0.59.tar.bz2"; + url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2"; + sha256 = "da3039687664d33a734cea0151b2291ece9c7f35e5b73df5b2b5eac28a20b972"; + }; + + dontStrip = true; + dontPatchELF = true; + buildInputs = [ makeWrapper ]; + + buildPhase = '' + for i in sublime_text plugin_host crash_reporter; do + patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + $i + done + ''; + + installPhase = '' + mkdir -p $out + cp -prvd * $out/ + # Without this, plugin_host crashes, even though it has the rpath + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1 + ''; + }; +in stdenv.mkDerivation { + name = "sublimetext3-${build}"; + + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/bin + ln -s ${sublime}/sublime_text $out/bin/sublime + ln -s ${sublime}/sublime_text $out/bin/sublime3 ''; meta = { description = "Sophisticated text editor for code, markup and prose"; + maintainers = stdenv.lib.maintainers.wmertens; license = "unfree"; }; } + From 86711e4120634672ae891571c7628dfecee37af7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 5 Jun 2014 16:00:25 -0500 Subject: [PATCH 29/67] nixos-iso: Re-enable new kernel iso images (close #2839) --- ... installation-cd-graphical-new-kernel.nix} | 3 +-- .../installation-cd-minimal-new-kernel.nix | 3 +-- nixos/release.nix | 22 ++++++++----------- 3 files changed, 11 insertions(+), 17 deletions(-) rename nixos/modules/installer/cd-dvd/{installation-cd-new-kernel.nix => installation-cd-graphical-new-kernel.nix} (52%) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix similarity index 52% rename from nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix rename to nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix index 93bcbf00b25..506b9292b01 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix @@ -3,6 +3,5 @@ { imports = [ ./installation-cd-graphical.nix ]; - boot.kernelPackages = pkgs.linuxPackages_3_10; - boot.vesa = false; + boot.kernelPackages = pkgs.linuxPackages_latest; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix index 38d02ffd162..4363c8e6c93 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix @@ -3,6 +3,5 @@ { imports = [ ./installation-cd-minimal.nix ]; - boot.kernelPackages = pkgs.linuxPackages_3_10; - boot.vesa = false; + boot.kernelPackages = pkgs.linuxPackages_latest; } diff --git a/nixos/release.nix b/nixos/release.nix index e5eadb57fe6..8a8b77de5a5 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -122,14 +122,6 @@ in rec { inherit system; }); - /* - iso_minimal_new_kernel = forAllSystems (system: makeIso { - module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; - type = "minimal-new-kernel"; - inherit system; - }); - */ - iso_graphical = forAllSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; type = "graphical"; @@ -138,13 +130,17 @@ in rec { # A variant with a more recent (but possibly less stable) kernel # that might support more hardware. - /* - iso_new_kernel = forAllSystems (system: makeIso { - module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix; - type = "new-kernel"; + iso_minimal_new_kernel = forAllSystems (system: makeIso { + module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; + type = "minimal-new-kernel"; + inherit system; + }); + + iso_graphical_new_kernel = forAllSystems (system: makeIso { + module = ./modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix; + type = "graphical-new-kernel"; inherit system; }); - */ # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). From 7f800e8155c0e61e07fdca69c1f9f3ba008b0f82 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Jun 2014 14:20:54 -0500 Subject: [PATCH 30/67] jd-gui: version 0.3.5 Signed-off-by: Austin Seipp --- pkgs/tools/security/jd-gui/default.nix | 33 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/security/jd-gui/default.nix diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix new file mode 100644 index 00000000000..f247f8c4e89 --- /dev/null +++ b/pkgs/tools/security/jd-gui/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, gtk, atk, gdk_pixbuf, pango, makeWrapper }: + +let + dynlibPath = stdenv.lib.makeLibraryPath + [ gtk atk gdk_pixbuf pango ]; +in +stdenv.mkDerivation rec { + name = "jd-gui-${version}"; + version = "0.3.5"; + + src = fetchurl { + url = "http://jd.benow.ca/jd-gui/downloads/${name}.linux.i686.tar.gz"; + sha256 = "0jrvzs2s836yvqi41c7fq0gfiwf187qg765b9r1il2bjc0mb3dqv"; + }; + + buildInputs = [ makeWrapper ]; + + phases = "unpackPhase installPhase"; + unpackPhase = "tar xf ${src}"; + installPhase = '' + mkdir -p $out/bin && mv jd-gui $out/bin + wrapProgram $out/bin/jd-gui \ + --prefix LD_LIBRARY_PATH ":" "${dynlibPath}" + ''; + + meta = { + description = "Fast Java Decompiler with powerful GUI"; + homepage = "http://jd.benow.ca/"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = [ "i686-linux" ]; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32a7b383c9e..4aa330a119c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1314,6 +1314,8 @@ let isync = callPackage ../tools/networking/isync { }; + jd-gui = callPackage_i686 ../tools/security/jd-gui { }; + jdiskreport = callPackage ../tools/misc/jdiskreport { }; jfsrec = callPackage ../tools/filesystems/jfsrec { From 97d65d801044e37106119bc383cdc8abe840b843 Mon Sep 17 00:00:00 2001 From: Anders Claesson Date: Tue, 17 Jun 2014 19:07:03 +0100 Subject: [PATCH 31/67] nixos manual: fix typo (close #2997) --- nixos/doc/manual/installation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml index fa4b89e6ba8..3da5e300977 100644 --- a/nixos/doc/manual/installation.xml +++ b/nixos/doc/manual/installation.xml @@ -353,7 +353,7 @@ changes: Booting from a USB stick -For systems withoua CD drive, the NixOS livecd can be booted from +For systems without CD drive, the NixOS livecd can be booted from a usb stick. For non-UEFI installations, unetbootin will work. For UEFI installations, you should mount the ISO, copy its contents From e5d63646a092a51f0ad7f38c4d99d2b5685c07ba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Jun 2014 14:59:39 -0500 Subject: [PATCH 32/67] Don't suggest using --arg config '{ allowUnfree = true; }' This doesn't work when using the Nixpkgs/NixOS channel. Issue #2998. --- pkgs/stdenv/generic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c34d30d92e0..6047ecf853c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -82,9 +82,7 @@ let { nixpkgs.config.allowUnfree = true; } in configuration.nix to override this. If you use Nix standalone, you can add { allowUnfree = true; } - to ~/.nixpkgs/config.nix or pass - --arg config '{ allowUnfree = true; }' - on the command line.'' + to ~/.nixpkgs/config.nix.'' else if !allowBroken && attrs.meta.broken or false then throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken" else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then From 5cf3fb7cb6465b9da8ca526f64ee27a0b58e0245 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Jun 2014 15:48:40 -0500 Subject: [PATCH 33/67] arcanist: 20140606 -> 20140617 Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index e55faaa1e63..7e3a3a6d15c 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/facebook/libphutil.git"; - rev = "7e75bf271c669b61eb6e6e2ea312a36e64b80a4a"; - sha256 = "ffb7ee8141b925889e9bbc945d2f38f12d1489148b9c9b7eaeadd7524d254a78"; + rev = "0027e97cd6cbafcbdc626b4ac6cf315b9508a14f"; + sha256 = "4781a4e3e1cb72da24e97f89a9b879803be8e1cf6baa2a4517801dfb893eec26"; }; arcanist = fetchgit { url = "git://github.com/facebook/arcanist.git"; - rev = "50caec620a8ed45c54323cb71fee72fd0d935115"; - sha256 = "dd18ed22375ad1ba058703952be0d339d9c93704e9d75dd7e4e6625236dfe9b0"; + rev = "680ec3670cd9d9195debf3e9b674b1b232156e61"; + sha256 = "a70cde586960676c0d69f4d98e6936633e0d79c37c6f6cc5b0213146a6b18c83"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20140606"; + version = "20140617"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; From fd4c2d893f4e2be52f809121d2e191053b801c78 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Jun 2014 17:06:31 -0500 Subject: [PATCH 34/67] duo-unix: upgrade, fix full name + version Signed-off-by: Austin Seipp --- pkgs/tools/security/duo-unix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 078e7cc06e0..a3aa417a4ea 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pam, openssl, zlib }: stdenv.mkDerivation rec { - name = "duo-unix"; - version = "1.9.7"; + name = "duo-unix-${version}"; + version = "1.9.11"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "090kx9nixlhvy5nw0ywqmi7yhd4nz7wvdv38cpkgrspkridfl07j"; + sha256 = "0747avzmzzz1gaisahgjlpxyxxbrn04w1mip90lfj9wp2x6a9jgm"; }; buildInputs = [ pam openssl zlib ]; From 8297a26746247e17a29123b826e0de1af318d6fd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 18 Jun 2014 00:23:32 +0200 Subject: [PATCH 35/67] Create an option to build 3.16-rc1 which carries a new Wireless driver; make USB_DEBUG optional as it seems to be planned to disappear in 3.16. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/kernel/linux-testing.nix | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0c498c5d828..b089e962397 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -238,7 +238,7 @@ with stdenv.lib; SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n + USB_DEBUG? n USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling X86_CHECK_BIOS_CORRUPTION y diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index d58610a38cd..541384a8c11 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.15-rc8"; - extraMeta.branch = "3.15"; + # Reason to add: RTL8192EE + version = "3.16-rc1"; + modDirVersion = "3.16.0-rc1"; + extraMeta.branch = "3.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = ""; + sha256 = "1y2ssifw6db40mr4j6k9c0kjwb4ssrrps74pc38krq4d6yzinhmq"; }; features.iwlwifi = true; @@ -14,4 +16,8 @@ import ./generic.nix (args // rec { features.needsCifsUtils = true; features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; + + # Should the testing kernels ever be built on Hydra? + extraMeta.hydraPlatforms = []; + } // (args.argsOverride or {})) From 4bbabdc8b920fb37c45af6f2db00e455ab1781bb Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Wed, 18 Jun 2014 04:12:10 +0400 Subject: [PATCH 36/67] aurulent-sans: new expression --- pkgs/data/fonts/aurulent-sans/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/data/fonts/aurulent-sans/default.nix diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix new file mode 100644 index 00000000000..a56efa35c7c --- /dev/null +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchgit}: + +stdenv.mkDerivation rec { + name = "aurulent-sans-0.1"; + src = fetchgit { + url = "https://github.com/deepfire/hartke-aurulent-sans.git"; + rev = "refs/tags/${name}"; + sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk"; + }; + buildPhase = "true"; + installPhase = " + fontDir=$out/share/fonts/opentype + mkdir -p $fontDir + cp *.otf $fontDir + "; + meta = { + description = "Aurulent Sans"; + longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; + homepage = http://delubrum.org/; + license = "SIL"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aa330a119c..51eda102b10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7782,6 +7782,8 @@ let arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { }; + aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; + bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; cacert = callPackage ../data/misc/cacert { }; From ef4ea24420bfd3afbd10f28a0e0f288484dc46ae Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 16 Jun 2014 05:08:57 -0500 Subject: [PATCH 37/67] sudo: Always keepVisudo in order to simplify sudo build --- nixos/modules/security/sudo.nix | 2 +- nixos/tests/installer.nix | 1 - pkgs/tools/security/sudo/default.nix | 7 +------ pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 00b640dd281..cbd1628caae 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -83,7 +83,7 @@ in {src = pkgs.writeText "sudoers-in" cfg.configFile; } # Make sure that the sudoers file is syntactically valid. # (currently disabled - NIXOS-66) - "${pkgs.sudoWithVisudo}/sbin/visudo -f $src -c && + "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out"; target = "sudoers"; mode = "0440"; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 13677be86e1..98e8142a0df 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -22,7 +22,6 @@ let isoImage.storeContents = [ pkgs.glibcLocales pkgs.sudo - pkgs.sudoWithVisudo pkgs.docbook5 pkgs.docbook5_xsl pkgs.grub diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 6ed94da10ba..d4c97253d99 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, pam, groff, keepVisudo ? false }: +{ stdenv, fetchurl, coreutils, pam, groff }: stdenv.mkDerivation rec { name = "sudo-1.8.9p4"; @@ -32,11 +32,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - # ‘visudo’ does not make sense on NixOS - except for checking sudoers - # file syntax - rm ${if keepVisudo then "" else "$out/sbin/visudo"} \ - $out/share/man/man8/visudo.8 - rm $out/share/doc/sudo/ChangeLog ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aa330a119c..99874a72f91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2082,8 +2082,6 @@ let sudo = callPackage ../tools/security/sudo { }; - sudoWithVisudo = sudo.override { keepVisudo = true; }; - suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; super = callPackage ../tools/security/super { }; From 1bb2a094fdeeb49a9caf69a3a2bb839ee65e8e32 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 16 Jun 2014 05:09:21 -0500 Subject: [PATCH 38/67] sudo: Update 1.8.9p4 -> 1.8.10p3 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index d4c97253d99..b4c2d7f1c1f 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, coreutils, pam, groff }: stdenv.mkDerivation rec { - name = "sudo-1.8.9p4"; + name = "sudo-1.8.10p3"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "19y75bsh4z2kid5jk2r84z7rvmnh90n8cb9fbn9l4rcw83lzjhqr"; + sha256 = "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"; }; postConfigure = '' From 8a16a950ba066ce017349e139817dfb4ecc03efe Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Wed, 18 Jun 2014 01:01:45 -0400 Subject: [PATCH 39/67] Adds tcache-AWS --- .../libraries/haskell/tcache-AWS/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tcache-AWS/default.nix diff --git a/pkgs/development/libraries/haskell/tcache-AWS/default.nix b/pkgs/development/libraries/haskell/tcache-AWS/default.nix new file mode 100644 index 00000000000..0bccb38d381 --- /dev/null +++ b/pkgs/development/libraries/haskell/tcache-AWS/default.nix @@ -0,0 +1,14 @@ +{ cabal, aws, conduit, httpConduit, network, TCache, text }: + +cabal.mkDerivation (self: { + pname = "tcache-AWS"; + version = "0.0.1"; + sha256 = "18hi8jvc117pxjhpb891hqlsbi4wvmd6nr3vwnqqr7rcw2dsmnwv"; + buildDepends = [ aws conduit httpConduit network TCache text ]; + meta = { + description = "tcache using Amazon Web Services as default persistence mechanism"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b1ea4059da5..9166e1a6673 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2166,6 +2166,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in TCache = callPackage ../development/libraries/haskell/TCache {}; + tcacheAWS = callPackage ../development/libraries/haskell/tcache-AWS {}; + templateDefault = callPackage ../development/libraries/haskell/template-default {}; temporary = callPackage ../development/libraries/haskell/temporary {}; From d4506fd7eb4e80b90523c384857e08f2e95264f2 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 18 Jun 2014 13:28:16 +0200 Subject: [PATCH 40/67] logstash: update to 1.3.3 --- pkgs/tools/misc/logstash/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 6ee427bc506..a613dad3ec9 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,11 +1,11 @@ { fetchurl }: -let version = "1.2.1"; in +let version = "1.3.3"; in fetchurl { - url = "https://logstash.objects.dreamhost.com/release/logstash-${version}-flatjar.jar"; + url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}-flatjar.jar"; - name = "logstash-${version}.jar"; + name = "logstash-${version}-flatjar.jar"; - sha256 = "08zfhq6klhkqapqnyzbdikgryd8bj2fp0wdb5d6dawdan5psbf6h"; + sha256 = "a83503bd2aa32e1554b98f812d0b411fbc5f7b6b21cebb48b7d344474f2dfc6d"; } From 3e64126344980c520ab8c99b967d74ed8fed27cf Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Jun 2014 22:40:37 +0200 Subject: [PATCH 41/67] nixos/shadow: Add an example for defaultUserShell. Thanks to @devhell for the suggestion. Signed-off-by: aszlig --- nixos/modules/programs/shadow.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 27a18c726a3..5fcd2133a7e 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -48,6 +48,7 @@ in Rather, it should be the path of a symlink that points to the actual shell in the Nix store. ''; + example = "/run/current-system/sw/bin/zsh"; type = types.path; }; From 158068849001b961cb8dc6a9e7ca20e9fad67549 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Jun 2014 04:14:16 +0200 Subject: [PATCH 42/67] gyp: Update to new upstream revision 1944. This is mainly needed in order to build the new Chromium version 37. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb7fabe7daa..3e7267166b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3385,13 +3385,13 @@ rec { gyp = buildPythonPackage rec { - rev = "1738"; + rev = "1944"; name = "gyp-r${rev}"; src = fetchsvn { url = "http://gyp.googlecode.com/svn/trunk"; inherit rev; - sha256 = "155k7v6453j2kg02xqfqbkzkbaqc8aynxs2k462jmrp638vxia9s"; + sha256 = "15k3ivk3jyhx4rwdf1mn6qpyrwixvy01jpkir8d14c4g9hax1dx1"; }; patches = optionals pkgs.stdenv.isDarwin [ From 3d665679c138874ed666c240e4b84435bbd7fe4d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 16 Jun 2014 21:35:05 +0200 Subject: [PATCH 43/67] chromium: Properly implement mksnapshot target. Let's ensure we do all architecture-dependant stuff inside mkChromiumDerivation and not pass archInfo around, so we can properly decouple it from the main function. This partially reverts 8d54dc6d13ac3b42e45d95a2cfb971e7c01ad39c. The main reason for doing this is because the architecture information is no longer required in Chromium 37, so let's uglify and XXX it in common.nix and remove it once version 37 hits the stable channel. Signed-off-by: aszlig --- .../networking/browsers/chromium/browser.nix | 4 ++-- .../networking/browsers/chromium/common.nix | 24 ++++++++++++------- .../networking/browsers/chromium/default.nix | 15 ++---------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 2a88ed8db65..146daa26e35 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,11 +1,11 @@ -{ stdenv, mkChromiumDerivation, arch }: +{ stdenv, mkChromiumDerivation }: with stdenv.lib; mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; - buildTargets = [ "mksnapshot.${arch}" "chrome" ]; + buildTargets = [ "mksnapshot" "chrome" ]; installPhase = '' ensureDir "$libExecPath" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 301950e3f44..631f12143d8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -30,7 +30,6 @@ , source , plugins -, archInfo }: buildFun: @@ -173,7 +172,13 @@ let # enable support for the H.264 codec proprietary_codecs = true; ffmpeg_branding = "Chrome"; - } // archInfo // (extraAttrs.gypFlags or {})); + } // optionalAttrs (stdenv.system == "x86_64-linux") { + target_arch = "x64"; + python_arch = "x86-64"; + } // optionalAttrs (stdenv.system == "i686-linux") { + target_arch = "ia32"; + python_arch = "ia32"; + } // (extraAttrs.gypFlags or {})); configurePhase = '' # This is to ensure expansion of $out. @@ -185,17 +190,20 @@ let buildPhase = let CC = "${gcc}/bin/gcc"; CXX = "${gcc}/bin/g++"; - buildCommand = target: '' + buildCommand = target: let + # XXX: Only needed for version 36 and older! + targetSuffix = optionalString + (versionOlder source.version "37.0.0.0" && target == "mksnapshot") + (if stdenv.is64bit then ".x64" else ".ia32"); + in '' CC="${CC}" CC_host="${CC}" \ CXX="${CXX}" CXX_host="${CXX}" \ LINK_host="${CXX}" \ "${ninja}/bin/ninja" -C "${buildPath}" \ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - ${target} - - if [[ "${target}" == mksnapshot.* || "${target}" == "chrome" ]]; then - paxmark m "${buildPath}/${target}" - fi + "${target}${targetSuffix}" + '' + optionalString (target == "mksnapshot" || target == "chrome") '' + paxmark m "${buildPath}/${target}${targetSuffix}" ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index efb0a95e9db..44fd3c69e53 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -15,14 +15,6 @@ }: let - archInfo = with stdenv.lib; optionalAttrs (stdenv.system == "i686-linux") { - target_arch = "ia32"; - python_arch = "ia32"; - } // optionalAttrs (stdenv.system == "x86_64-linux") { - target_arch = "x64"; - python_arch = "x86-64"; - }; - callPackage = newScope chromium; chromium = { @@ -35,13 +27,10 @@ let mkChromiumDerivation = callPackage ./common.nix { inherit enableSELinux enableNaCl useOpenSSL gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport - pulseSupport archInfo; - }; - - browser = callPackage ./browser.nix { - arch = archInfo.target_arch; + pulseSupport; }; + browser = callPackage ./browser.nix { }; sandbox = callPackage ./sandbox.nix { }; plugins = callPackage ./plugins.nix { From 4cbedd7322d986d29805a8d9e643b8e76d5d6f6d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 16 Jun 2014 20:24:56 +0200 Subject: [PATCH 44/67] chromium: Update all channels to latest versions. With this commit, the following new upstream versions are introduced: stable: 35.0.1916.114 -> 35.0.1916.153 beta: 35.0.1916.86 -> 36.0.1985.67 dev: 36.0.1964.2 -> 37.0.2054.3 All builds successfully tested on my machine, however in order to update the beta and dev channels, a few additional modifications were necessary: * Update/rebase USER_NS sandbox patch for version 36 and higher. * Create address_input_strings.grdp before running gyp in version 37. * Remove an empty string leftover from 0517041. * Add patch for building bundled Angle for version 37. The patch for Angle is to remove reliance on git being present during build and is from https://chromium-review.googlesource.com/202048 but with own modifications to remove/fix Windows-specific parts within the patch file. Signed-off-by: aszlig --- .../networking/browsers/chromium/common.nix | 5 + .../chromium/source/angle_build_37.patch | 347 ++++++++++++++++++ .../browsers/chromium/source/default.nix | 3 +- .../chromium/source/sandbox_userns_36.patch | 38 +- .../browsers/chromium/source/sources.nix | 24 +- 5 files changed, 385 insertions(+), 32 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 631f12143d8..d38bd442184 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -132,6 +132,8 @@ let find -iname '*.gyp*' \( -type f -o -type l \) \ -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \ -exec chmod u+w {} + + '' + optionalString (!versionOlder source.version "37.0.0.0") '' + python third_party/libaddressinput/chromium/tools/update-strings.py ''; postPatch = let @@ -160,6 +162,9 @@ let linux_sandbox_chrome_path="${libExecPath}/${packageName}"; werror = ""; + # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated. + use_mojo = versionOlder source.version "37.0.0.0"; + # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, diff --git a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch b/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch new file mode 100644 index 00000000000..a3e8c91174a --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch @@ -0,0 +1,347 @@ +commit 9c4b24a52e0ff478aa170d33e26c44acd8c68be3 +Author: Jamie Madill +Date: Thu Jun 12 13:41:17 2014 -0400 + + Use commit_id.py on Windows, and handle missing git. + + This allows us to delete the Windows batch file. + + Changes the commit_id script to take the working directory so that it + can be called from a different working directory than the angle + repository is in. + + Renames the generated commit header to angle_commit.h. This is being + written to the shared generated code directory for the entire build, + and "commit.h" is insufficiently unique. + + BUG=angle:669 + + Change-Id: I35e80411a7e8ba1e02ce3f6a4fc54ed4dbc918f3 + Reviewed-on: https://chromium-review.googlesource.com/202048 + Reviewed-by: Geoff Lang + Tested-by: Jamie Madill + [Removed and/or fixed up Windows specific hunks] + Signed-off-by: aszlig + +diff --git a/generate_projects b/generate_projects +index 6743254..8175277 100644 +--- a/generate_projects ++++ b/generate_projects +@@ -34,6 +34,7 @@ if __name__ == '__main__': + gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0') + gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0') + gyp_cmd += ' -D release_symbols=' + ('true' if release_symbols else 'false') ++ gyp_cmd += ' -D angle_use_commit_id=0' + gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp') + + print 'Generating projects to ' + generation_dir + ' from gyp files...' +diff --git a/projects/build/all.sln b/projects/build/all.sln +index 1aa0796..5862edd 100644 +--- a/projects/build/all.sln ++++ b/projects/build/all.sln +@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}" + ProjectSection(ProjectDependencies) = postProject + {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} +- {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} + {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} + {276D20F5-2943-414C-0FF6-21F4723A5CF6} = {276D20F5-2943-414C-0FF6-21F4723A5CF6} + {C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679} + {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} ++ {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} + {22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81} + {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} + {FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061} +@@ -30,9 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048 + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" +- ProjectSection(ProjectDependencies) = postProject +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} +- EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" + ProjectSection(ProjectDependencies) = postProject +@@ -68,7 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx + ProjectSection(ProjectDependencies) = postProject + {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} + {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" +diff --git a/projects/samples/samples.sln b/projects/samples/samples.sln +index 53cec34..b927860 100644 +--- a/projects/samples/samples.sln ++++ b/projects/samples/samples.sln +@@ -1,9 +1,6 @@ + Microsoft Visual Studio Solution File, Format Version 11.00 + # Visual C++ Express 2010 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" +- ProjectSection(ProjectDependencies) = postProject +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} +- EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" + ProjectSection(ProjectDependencies) = postProject +@@ -39,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx + ProjectSection(ProjectDependencies) = postProject + {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} + {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" +diff --git a/projects/src/angle.sln b/projects/src/angle.sln +index 0d6ec65..cdf9f53 100644 +--- a/projects/src/angle.sln ++++ b/projects/src/angle.sln +@@ -1,9 +1,6 @@ + Microsoft Visual Studio Solution File, Format Version 11.00 + # Visual C++ Express 2010 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" +- ProjectSection(ProjectDependencies) = postProject +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} +- EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" + ProjectSection(ProjectDependencies) = postProject +@@ -16,7 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", + ProjectSection(ProjectDependencies) = postProject + {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} + {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} +- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" +diff --git a/src/angle.gypi b/src/angle.gypi +index 5339369..ef16749 100644 +--- a/src/angle.gypi ++++ b/src/angle.gypi +@@ -7,6 +7,12 @@ + { + 'angle_code': 1, + 'angle_post_build_script%': 0, ++ 'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle', ++ 'angle_id_script_base': 'commit_id.py', ++ 'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)', ++ 'angle_id_header_base': 'commit.h', ++ 'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)', ++ 'angle_use_commit_id%': ' (checks if git is present) ++# Usage: commit_id.py gen (generates commit id) + ++def grab_output(command, cwd): ++ return sp.Popen(command, stdout=sp.PIPE, shell=True, cwd=cwd).communicate()[0].strip() ++ ++operation = sys.argv[1] ++cwd = sys.argv[2] ++ ++if operation == 'check': ++ index_path = os.path.join(cwd, '.git', 'index') ++ if os.path.exists(index_path): ++ print("1") ++ else: ++ print("0") ++ sys.exit(0) ++ ++output_file = sys.argv[3] + commit_id_size = 12 + + try: +- commit_id = grab_output('git', 'rev-parse', '--short=%d' % commit_id_size, 'HEAD') +- commit_date = grab_output('git', 'show', '-s', '--format=%ci', 'HEAD') ++ commit_id = grab_output('git rev-parse --short=%d HEAD' % commit_id_size, cwd) ++ commit_date = grab_output('git show -s --format=%ci HEAD', cwd) + except: + commit_id = 'invalid-hash' + commit_date = 'invalid-date' + +-hfile = open(sys.argv[1], 'w') ++hfile = open(output_file, 'w') + + hfile.write('#define ANGLE_COMMIT_HASH "%s"\n' % commit_id) + hfile.write('#define ANGLE_COMMIT_HASH_SIZE %d\n' % commit_id_size) +diff --git a/src/common/version.h b/src/common/version.h +index b9781d7..d9148d1 100644 +--- a/src/common/version.h ++++ b/src/common/version.h +@@ -1,4 +1,4 @@ +-#include "commit.h" ++#include "id/commit.h" + + #define ANGLE_MAJOR_VERSION 2 + #define ANGLE_MINOR_VERSION 1 +diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp +index 8525ffb..e3ffa47 100644 +--- a/src/libGLESv2/ProgramBinary.cpp ++++ b/src/libGLESv2/ProgramBinary.cpp +@@ -1018,6 +1018,9 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, FragmentShader *fragmentShade + + bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) + { ++#ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD ++ return false; ++#else + BinaryInputStream stream(binary, length); + + int format = stream.readInt(); +@@ -1260,6 +1263,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) + initializeUniformStorage(); + + return true; ++#endif // #ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD + } + + bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 2c7e7277b81..6a6b299ee51 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation { third_party/WebKit/Source/build/scripts/preprocessor.pm '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl - '' + optionalString (!versionOlder version "34.0.0.0") '' + '' + optionalString (!versionOlder version "37.0.0.0") '' + patch -p1 -d third_party/angle < "${./angle_build_37.patch}" ''; outputs = [ "out" "sandbox" "bundled" "main" ]; diff --git a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch index 8338aa65482..57f5992a3fa 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch +++ b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch @@ -1,4 +1,4 @@ -commit c66c07a2ebcd1b68f412a5a2945fef15b3ba567c +commit 0fec7e4a742f001c9816a8b58a1120fb44230867 Author: aszlig Date: Thu May 16 14:17:56 2013 +0200 @@ -47,7 +47,7 @@ index 9e39fba..00e4c79 100644 #if defined(OS_CHROMEOS) diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc -index fe4da1a..7f118b8 100644 +index 457234f..a99ce9b 100644 --- a/base/process/launch_posix.cc +++ b/base/process/launch_posix.cc @@ -40,6 +40,10 @@ @@ -111,7 +111,7 @@ index fe4da1a..7f118b8 100644 // DANGER: fork() rule: in the child, if you don't end up doing exec*(), // you call _exit() instead of exit(). This is because _exit() does not // call any previously-registered (in the parent) exit handlers, which -@@ -451,6 +480,40 @@ bool LaunchProcess(const std::vector& argv, +@@ -452,6 +481,40 @@ bool LaunchProcess(const std::vector& argv, _exit(127); } else { // Parent process @@ -153,10 +153,10 @@ index fe4da1a..7f118b8 100644 // While this isn't strictly disk IO, waiting for another process to // finish is the sort of thing ThreadRestrictions is trying to prevent. diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index 94bdc16..3398615 100644 +index 9d63ad9..0885705 100644 --- a/content/browser/zygote_host/zygote_host_impl_linux.cc +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -143,6 +143,9 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { +@@ -144,6 +144,9 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { // A non empty sandbox_cmd means we want a SUID sandbox. using_suid_sandbox_ = !sandbox_cmd.empty(); @@ -166,10 +166,10 @@ index 94bdc16..3398615 100644 // Start up the sandbox host process and get the file descriptor for the // renderers to talk to it. const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -162,11 +165,24 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - dummy_fd.reset(socket(AF_UNIX, SOCK_DGRAM, 0)); - CHECK_GE(dummy_fd.get(), 0); - fds_to_map.push_back(std::make_pair(dummy_fd.get(), kZygoteIdFd)); +@@ -156,11 +159,24 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + sandbox_client->PrependWrapper(&cmd_line); + sandbox_client->SetupLaunchOptions(&options, &fds_to_map, &dummy_fd); + sandbox_client->SetupLaunchEnvironment(); + userns_sandbox = sandbox_client->IsNoSuid(); } @@ -192,7 +192,7 @@ index 94bdc16..3398615 100644 dummy_fd.reset(); diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc -index cc28a6f..e8f665a 100644 +index 11f0602..b7b8214 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -389,6 +389,13 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox) { @@ -210,10 +210,10 @@ index cc28a6f..e8f665a 100644 // Previously, we required that the binary be non-readable. This causes the // kernel to mark the process as non-dumpable at startup. The thinking was diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc -index 3300cb4..4bfa516 100644 +index fc03cdd..a972faa 100644 --- a/sandbox/linux/suid/client/setuid_sandbox_client.cc +++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc -@@ -212,6 +212,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { +@@ -229,6 +229,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { return env_->HasVar(kSandboxNETNSEnvironmentVarName); } @@ -224,7 +224,7 @@ index 3300cb4..4bfa516 100644 bool SetuidSandboxClient::IsSandboxed() const { return sandboxed_; } -@@ -267,8 +271,7 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line, +@@ -277,8 +281,7 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line) { "LinuxSUIDSandboxDevelopment."; } @@ -234,10 +234,10 @@ index 3300cb4..4bfa516 100644 LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " "configured correctly. Rather than run without sandboxing " "I'm aborting now. You need to make sure that " -@@ -284,6 +287,12 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line, - options->allow_new_privs = true; - UnsetExpectedEnvironmentVariables(&options->environ); +@@ -286,6 +289,12 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line) { } + + cmd_line->PrependWrapper(sandbox_binary); + + if (!((st.st_uid == 0) && + (st.st_mode & S_ISUID) && @@ -246,12 +246,12 @@ index 3300cb4..4bfa516 100644 + } } - void SetuidSandboxClient::SetupLaunchEnvironment() { + void SetuidSandboxClient::SetupLaunchOptions( diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h -index 332c63b..4f603f8 100644 +index 2bbad7a..8605475 100644 --- a/sandbox/linux/suid/client/setuid_sandbox_client.h +++ b/sandbox/linux/suid/client/setuid_sandbox_client.h -@@ -70,6 +70,8 @@ class SANDBOX_EXPORT SetuidSandboxClient { +@@ -66,6 +66,8 @@ class SANDBOX_EXPORT SetuidSandboxClient { bool IsInNewPIDNamespace() const; // Did the setuid helper create a new network namespace ? bool IsInNewNETNamespace() const; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index bd5ded3f4c6..1905311c824 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "36.0.1964.2"; - sha256 = "0yrp1553pl0310h5pkfh2x27xhfrrxrpc25zad36f3k73iwmbg4c"; - sha256bin32 = "02brz6lj7vfyyapc942dhdw7z26ksvnm7xqryfxn49y1rkd26xrf"; - sha256bin64 = "0ibry2bfjcqnihwb8ykyl48qk25bzfxmw948sm70xnrmwbkv42ny"; + version = "37.0.2054.3"; + sha256 = "1sly1fb9wh10m36crikahn7wgsq7j090jaga4l8zk4kihzprcnj2"; + sha256bin32 = "0242ypzgzskkmsw3iyirxzlm1gbng94lv723ffcr018grq9yg4gs"; + sha256bin64 = "17kzb7k0vn96wa6a4xfx05885li1qjg8bp6y3ngs2i0wws9ypfd9"; }; beta = { - version = "35.0.1916.86"; - sha256 = "0pjgpif8fiq14fk05pxs3js0pcg2jwmw0fklcci11rzq6rcm7r2g"; - sha256bin32 = "1js71l88hqfli6c342iigwddxrqrzlx5fcazfxwlps4bdwgig6f8"; - sha256bin64 = "1sqavz6lh0ryf8jlw8jcfwk265spxs70bhigcgcqsd6647fbdqsr"; + version = "36.0.1985.67"; + sha256 = "11gp21j96zr93g2bicwsq335zj83rx6jz44439cn3msgfqdfm3hp"; + sha256bin32 = "1ndllz5y4d37xjc004rdby8viif300qskpxfz4bb26z681frh6d1"; + sha256bin64 = "0yy6qr9ykd52qxxbx4kv1cmqmlw4hppah8s4lnw4lnd55xj9xb8q"; }; stable = { - version = "35.0.1916.114"; - sha256 = "1bvpkwjchkzx1qfc93hd8md6sz5sd7pl55xc8b8m3iakbp0csvsn"; - sha256bin32 = "0zm5770cv9dld37xall9lpl9faa0bgjcp8hjx6l1ivfhs6lxbxxa"; - sha256bin64 = "18p302aj2d7xdza9kf438vbz3wqh8db7v2dq5d9b4b3ak6w9ld03"; + version = "35.0.1916.153"; + sha256 = "03p7wmlvbrgd8m94344z4azkhrffwrr5c76dm8c4jcxs0x1yn318"; + sha256bin32 = "0xm34xwdai8ns6bkq5dshh4izls70rwgvya23md4vxq6iv78sykn"; + sha256bin64 = "1x2cm1i8v8d69856b42anms33clv63adzpqy58in6i9vba13swif"; }; } From 47214207b92fa5e5592e33c4d2f0326e91c08587 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Jun 2014 04:42:29 +0200 Subject: [PATCH 45/67] chromium/update: Fix fetching previous version. After refactoring the updater we no longer did properly propagate the exit code from the nix-prefetch-url call to the main script. So if the newest version could not be fetched it didn't even bother to try the previous release and we would end up with an empty hash. Signed-off-by: aszlig --- .../networking/browsers/chromium/source/update.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix index de45d409937..cfa5f1e009b 100644 --- a/pkgs/applications/networking/browsers/chromium/source/update.nix +++ b/pkgs/applications/networking/browsers/chromium/source/update.nix @@ -99,7 +99,9 @@ in rec { prefetch_sha() { - echo "$(prefetch_main_sha "$@").$(prefetch_deb_sha "$@")"; + main_sha="$(prefetch_main_sha "$@")" || return 1; + deb_sha="$(prefetch_deb_sha "$@")" || return 1; + echo "$main_sha.$deb_sha"; return 0; } From 0c50978cb806c7aba6809c9cc14715efd628bac8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Jun 2014 11:59:56 +0200 Subject: [PATCH 46/67] chromium: Hardcode dlopen() path for libexif. This is needed for Chromium version 36 and higher. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d38bd442184..3aac5f9b17a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -144,6 +144,10 @@ let sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \ sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH")); ' ${toPatch} + '' + optionalString (!versionOlder source.version "36.0.0.0") '' + sed -i -e '/module_path *=.*libexif.so/ { + s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| + }' chrome/utility/media_galleries/image_metadata_extractor.cc ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { From 3ae3f3272fa2565aeb661631aa36507093c6c9ed Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Jun 2014 12:11:36 +0200 Subject: [PATCH 47/67] chromium: Don't add sources as runtime dependency. This is because of a single file that symlinks to the source output path: libexec/chromium/resources/extension/demo/library.js Target within source output path: chrome/browser/resources/extension_resource/demo/library.js So we just need to ensure that the cp command follows symlinks during installPhase and we should no longer have this unnecessary dependency. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 146daa26e35..d425c3f0738 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -11,7 +11,7 @@ mkChromiumDerivation (base: rec { ensureDir "$libExecPath" cp -v "$buildPath/"*.pak "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" - cp -vR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" + cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v $buildPath/libffmpegsumo.so "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" From b39ade4ba5c883009fe8544385bfcd374594a58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Thu, 19 Jun 2014 15:35:30 +0800 Subject: [PATCH 48/67] haskell-wai: update to 3.0.0.2 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 50ded58f44d..887b004b93a 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "3.0.0.1"; - sha256 = "1f8alq4lygjdb4pzb7xm6jml3dviygk18siwfwb751va3j2fmi0v"; + version = "3.0.0.2"; + sha256 = "1zmpalgck8jns45wnlarw26kfw45ml0cp82kdqqpbckscxnr04r1"; buildDepends = [ blazeBuilder httpTypes network text vault ]; testDepends = [ blazeBuilder hspec ]; meta = { From 540ce7e1082677d5f91a09f5db80c959054d175e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Thu, 19 Jun 2014 15:35:48 +0800 Subject: [PATCH 49/67] haskell-warp: update to 3.0.0.3 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index d0940345a57..0ccbcfceb39 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.0.1"; - sha256 = "05x216fj7s1i963xipi0p7vmkz5l0nma1fjqiq040fg3rngw4yqb"; + version = "3.0.0.3"; + sha256 = "0lhmhgbza49lkbay6ydj5h1g04qzs4jx2wyq4bhddjrpmxsdsy2y"; buildDepends = [ blazeBuilder caseInsensitive hashable httpDate httpTypes network simpleSendfile streamingCommons text unixCompat void wai From 950444bf77f68b1d9da1c63d7861d85d94addb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 19 Jun 2014 10:12:40 +0200 Subject: [PATCH 50/67] openxcom: update download link --- pkgs/games/openxcom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 657d3d9fa06..04d2f2ecb8b 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -5,8 +5,8 @@ let version = "1.0.0"; in stdenv.mkDerivation { name = "openxcom-${version}"; src = fetchurl { - url = http://openxcom.org/wp-content/plugins/download-monitor/download.php?id=31; - sha256 = "00pc6ncsjbvn6w8whpj0bk4hlh577wh40bkyv6lk0g5c901p732l"; + url = http://openxcom.org/file/1726/; + sha256 = "1rmg10nklvf86ckbbssyvbg5cd4p7in5zq3mas2yyffdjk9i40v6"; name = "openxcom-${version}.tar.gz"; }; From fe3a63b7d03d7a85e4e1b17243a37691c4e7bc28 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 19 Jun 2014 10:56:52 +0200 Subject: [PATCH 51/67] EC2: allow building S3-backed HVM ami's (cherry picked from commit e007559e9580c134f43ea9dc2279ff41cb3bd015) --- nixos/modules/virtualisation/amazon-image.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 9e64327c3ab..d0d47511af9 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -34,16 +34,32 @@ in [ "closure" config.system.build.toplevel ]; } '' - # Create an empty filesystem and mount it. - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda - ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda - mkdir /mnt - mount /dev/vda /mnt + ${if cfg.hvm then '' + # Create a single / partition. + ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s + . /sys/class/block/vda1/uevent + mknod /dev/vda1 b $MAJOR $MINOR + + # Create an empty filesystem and mount it. + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 + mkdir /mnt + mount /dev/vda1 /mnt + '' else '' + # Create an empty filesystem and mount it. + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda + mkdir /mnt + mount /dev/vda /mnt + ''} # The initrd expects these directories to exist. mkdir /mnt/dev /mnt/proc /mnt/sys mount -o bind /proc /mnt/proc + mount -o bind /dev /mnt/dev + mount -o bind /sys /mnt/sys # Copy all paths in the closure to the filesystem. storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) @@ -73,9 +89,10 @@ in cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix # Generate the GRUB menu. + ln -s vda /dev/xvda chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot - umount /mnt/proc + umount /mnt/proc /mnt/dev /mnt/sys umount /mnt '' ); @@ -86,7 +103,7 @@ in boot.kernelModules = [ "xen-netfront" ]; # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. - boot.loader.grub.version = 1; + boot.loader.grub.version = if cfg.hvm then 2 else 1; boot.loader.grub.device = if cfg.hvm then "/dev/xvda" else "nodev"; boot.loader.grub.timeout = 0; boot.loader.grub.extraPerEntryConfig = "root (hd0${lib.optionalString cfg.hvm ",0"})"; From 04e648f789b846d6850411daaeb4091c4f2180da Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 19 Jun 2014 11:27:49 +0200 Subject: [PATCH 52/67] Change size of Amazon EC2 S3-backed images to 8GB (was 4GB). (cherry picked from commit 05543ef6e038a834aa323d467c9ef02ad99c5adb) --- nixos/modules/virtualisation/amazon-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index d0d47511af9..7d6109f212a 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -26,7 +26,7 @@ in '' mkdir $out diskImage=$out/nixos.img - ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G" + ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "8G" mv closure xchg/ ''; buildInputs = [ pkgs.utillinux pkgs.perl ]; From bc41714d02f70c56693f20947e576d40c2a0ed2d Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 19 Jun 2014 12:04:20 +0200 Subject: [PATCH 53/67] chicken: Update to 4.9.0.1. --- pkgs/development/compilers/chicken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 1a4e3377501..ff9f5d3f7c2 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "4.9.0"; + version = "4.9.0.1"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz"; - sha256 = "08jaavr3lhs0z2q9k7b7w8l3fsxpms58zxg8nyk8674p54cbwaig"; + sha256 = "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4"; }; buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; From f85d3ad6d3db93b305907e0952dec1f844bcf47d Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 19 Jun 2014 12:04:33 +0200 Subject: [PATCH 54/67] leiningen: Update to 2.4.2. --- pkgs/development/tools/build-managers/leiningen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 2c4ea8183af..99353a1a192 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.4.0"; + version = "2.4.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0mdfp5r5qid42x7rq1cmyxqmvjdj2hk9rjz8pryf4zq3bk38m1cg"; + sha256 = "1qdq3v7wv9jacw4bipgx24knlipw6zdcx43yd1qyw6zwaad51ckw"; }; jarsrc = fetchurl { url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar"; - sha256 = "099r5qcldb214c3857i7dbbqn531aahzrz39qfhqxc6f476ncdh0"; + sha256 = "0n4kpmzw9nvppq758lhnrr7xps5j6gwmdm98m772cj7j4vixsrzb"; }; patches = [ ./lein-fix-jar-path.patch ]; From 8a22affa2403f57a83f6c0573ea3511c8743c94a Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 19 Jun 2014 11:06:39 +0100 Subject: [PATCH 55/67] haskellPackages.digestiveFunctorsAeson: Update to 1.1.9 --- .../libraries/haskell/digestive-functors-aeson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index b6a5ae78f82..1b29c506c14 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.8"; - sha256 = "0qvzr9s0vzgzh7mix6ncjn731krln9w47zrqb5jkj92rv7mf5sgz"; + version = "1.1.9"; + sha256 = "0lm6byv5vayzg2jp0fqkbi4wkbhvnjw5sl61qnvpa1pqk6p64mrm"; buildDepends = [ aeson digestiveFunctors lens safe text vector ]; testDepends = [ aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text From f67cf3e18d550e1a5449bd6ba2d02c10640b06a6 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 19 Jun 2014 11:16:36 +0100 Subject: [PATCH 56/67] Jailbreak haskellPackages.websockets This is needed until https://github.com/jaspervdj/websockets/issues/71 is resolved. --- pkgs/development/libraries/haskell/websockets/default.nix | 1 + pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index e712a5b2b81..683885cb712 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -24,4 +24,5 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; + jailbreak = true; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f5b2794c8d2..84139adece7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2464,6 +2464,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in websockets = callPackage ../development/libraries/haskell/websockets { testFrameworkQuickcheck2 = self.testFrameworkQuickcheck2.override { QuickCheck = self.QuickCheck_2_6; }; + QuickCheck = self.QuickCheck_2_6; }; websocketsSnap = callPackage ../development/libraries/haskell/websockets-snap {}; From 1b635150b5a6411a194460d7bb7ab4203f63c0a5 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 19 Jun 2014 11:22:18 +0100 Subject: [PATCH 57/67] Jailbreak haskellPackages.fb This is necessary until https://github.com/meteficha/fb/issues/24 is resolved. --- pkgs/development/libraries/haskell/fb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 02f9f03588a..9efbd285068 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -27,4 +27,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; + jailbreak = true; }) From e1c34ca676d56830c285ddb60aa8261cbc7884a5 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 19 Jun 2014 11:32:39 +0100 Subject: [PATCH 58/67] haskellPackages.jsonAssertions: Update to 1.0.3 --- .../development/libraries/haskell/json-assertions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index 027cf20064e..2713dc919c5 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "json-assertions"; - version = "1.0.2"; - sha256 = "0ppj1xxbi0yrmv6vkmwkz91vvwzjd0ixj60432liwmd6h13apky0"; + version = "1.0.3"; + sha256 = "1iklsgzfxgiizqn90r9wfzfaz84fj8by4arppp139w6ybzh3b0r8"; buildDepends = [ aeson indexed indexedFree lens text ]; meta = { homepage = "http://github.com/ocharles/json-assertions.git"; From ca0de0f1f7de227e44d31e34e33a5033127ffdf0 Mon Sep 17 00:00:00 2001 From: Daniel Zinn Date: Thu, 19 Jun 2014 04:24:21 -0700 Subject: [PATCH 59/67] Added cuda6 compiler as package cudatoolkit6. --- .../cudatoolkit/{default.nix => 5.5.nix} | 0 .../development/compilers/cudatoolkit/6.0.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 65 insertions(+), 1 deletion(-) rename pkgs/development/compilers/cudatoolkit/{default.nix => 5.5.nix} (100%) create mode 100644 pkgs/development/compilers/cudatoolkit/6.0.nix diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix similarity index 100% rename from pkgs/development/compilers/cudatoolkit/default.nix rename to pkgs/development/compilers/cudatoolkit/5.5.nix diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix new file mode 100644 index 00000000000..573cc826221 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib +, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib +} : + +stdenv.mkDerivation rec { + name = "cudatoolkit-6.0.37"; + + dontPatchELF = true; + dontStrip = true; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run; + sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40"; + } + else throw "cudatoolkit does not support platform ${stdenv.system}"; + + outputs = [ "out" "sdk" ]; + + buildInputs = [ perl ]; + + runtimeDependencies = [ + ncurses expat python zlib + xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext + gtk2 glib fontconfig freetype unixODBC alsaLib + ]; + + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; + + unpackPhase = '' + sh $src --keep --noexec + cd pkg/run_files + sh cuda-linux64-rel-6.0.37-18176142.run --keep --noexec + sh cuda-samples-linux-6.0.37-18176142.run --keep --noexec + cd pkg + ''; + + buildPhase = '' + find . -type f -executable -exec patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + '{}' \; || true + find . -type f -exec patchelf \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --force-rpath \ + '{}' \; || true + ''; + + installPhase = '' + mkdir $out $sdk + perl ./install-linux.pl --prefix="$out" + rm $out/tools/CUDA_Occupancy_Calculator.xls + perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + ''; + + meta = { + license = [ "nonfree" ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c292f130c2..4695ee5b738 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -821,7 +821,11 @@ let cron = callPackage ../tools/system/cron { }; - cudatoolkit = callPackage ../development/compilers/cudatoolkit { + cudatoolkit = callPackage ../development/compilers/cudatoolkit/5.5.nix { + python = python26; + }; + + cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix { python = python26; }; From 46d6fc0c326cafe6c810cc5598f7d0c8c03bf4d7 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 19 Jun 2014 12:13:04 +0200 Subject: [PATCH 60/67] agda: fix dependency on more recent 'binary' --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 84139adece7..30816764acd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2604,7 +2604,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {}; - Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix {}; + Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix { + binary = self.binary_0_7_2_1; + }; Agda = self.Agda_2_4_0_1; AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { From 0a8455800c66d78e44907907639376225f18f0f6 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 19 Jun 2014 12:13:33 +0200 Subject: [PATCH 61/67] idris: fix dependency on older 'parsers' --- pkgs/top-level/haskell-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 30816764acd..08b7c875c90 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2721,6 +2721,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in darcs = callPackage ../applications/version-management/darcs {}; idris_plain = callPackage ../development/compilers/idris { + parsers = self.parsers_0_10_3; + trifecta = self.trifecta.override { + parsers = self.parsers_0_10_3; + }; llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; From 9ceeb77bd35708e4aff0da429bc3658adec9d410 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 19 Jun 2014 13:37:31 +0200 Subject: [PATCH 62/67] agda-stdlib: no need to jailbreak anymore --- pkgs/development/compilers/agda/stdlib-0.8.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/agda/stdlib-0.8.nix b/pkgs/development/compilers/agda/stdlib-0.8.nix index d3b848d73b5..9a78744ca29 100644 --- a/pkgs/development/compilers/agda/stdlib-0.8.nix +++ b/pkgs/development/compilers/agda/stdlib-0.8.nix @@ -10,7 +10,6 @@ cabal.mkDerivation (self: rec { }; buildDepends = [ filemanip Agda ]; - jailbreak = true; # otherwise, it complains about base preConfigure = "cd ffi"; From 01bbc613648008b2b54b9405b6c159cfac42f815 Mon Sep 17 00:00:00 2001 From: Daniel Zinn Date: Thu, 19 Jun 2014 04:53:03 -0700 Subject: [PATCH 63/67] tweak --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4695ee5b738..b17a38ad1f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -821,7 +821,7 @@ let cron = callPackage ../tools/system/cron { }; - cudatoolkit = callPackage ../development/compilers/cudatoolkit/5.5.nix { + cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix { python = python26; }; @@ -829,6 +829,8 @@ let python = python26; }; + cudatoolkit = cudatoolkit5; + curl = callPackage ../tools/networking/curl rec { fetchurl = fetchurlBoot; zlibSupport = true; From 2915999069b22688fb39941905d19615f3589048 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 19 Jun 2014 18:22:55 +0400 Subject: [PATCH 64/67] Add missing dependency to gtk-vnc --- pkgs/tools/admin/gtk-vnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index c3a82b2e4a2..14822d8b6e9 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -2,7 +2,7 @@ , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala -, pygobject3, enableGTK3 ? false }: +, pygobject3, libogg, enableGTK3 ? false }: stdenv.mkDerivation rec { name = "gtk-vnc-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ python gnutls cairo libtool pkgconfig glib libffi libgcrypt intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV - gobjectIntrospection + gobjectIntrospection libogg ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]); NIX_CFLAGS_COMPILE = "-fstack-protector-all"; From 870a8a08337114bcaecc0557ec649b54ca9677eb Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 19 Jun 2014 15:59:54 +0100 Subject: [PATCH 65/67] alsa-plugins: upgrade to 1.0.28 adding libogg as dependency should fix the build --- pkgs/os-specific/linux/alsa-plugins/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 5b822969968..84d67b96d17 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }: +{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.0.27"; + name = "alsa-plugins-1.0.28"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2" "http://alsa.cybermirror.org/plugins/${name}.tar.bz2" ]; - sha256 = "0ddbycq4cn9mc8xin0vh1af0zywz2rc2xyrs6qbayyyxq8vhrg8b"; + sha256 = "081is33afhykb4ysll8s6gh0d6nm1cglslj9ck0disbyl3qqlvs2"; }; buildInputs = - [ pkgconfig alsaLib ] + [ pkgconfig alsaLib libogg ] ++ stdenv.lib.optional (pulseaudio != null) pulseaudio ++ stdenv.lib.optional (jackaudio != null) jackaudio; From ad666c56ff42bcf85baaecf6ebdcd116da27cc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Jun 2014 17:53:22 +0200 Subject: [PATCH 66/67] pypy: correctly bump the version --- pkgs/development/interpreters/pypy/{2.2 => 2.3}/default.nix | 0 pkgs/development/interpreters/pypy/{2.2 => 2.3}/setup-hook.sh | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/interpreters/pypy/{2.2 => 2.3}/default.nix (100%) rename pkgs/development/interpreters/pypy/{2.2 => 2.3}/setup-hook.sh (82%) diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix similarity index 100% rename from pkgs/development/interpreters/pypy/2.2/default.nix rename to pkgs/development/interpreters/pypy/2.3/default.nix diff --git a/pkgs/development/interpreters/pypy/2.2/setup-hook.sh b/pkgs/development/interpreters/pypy/2.3/setup-hook.sh similarity index 82% rename from pkgs/development/interpreters/pypy/2.2/setup-hook.sh rename to pkgs/development/interpreters/pypy/2.3/setup-hook.sh index 35f4915569e..67c71bf0081 100644 --- a/pkgs/development/interpreters/pypy/2.2/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.3/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.2/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.3/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.2/site-packages" + p="$i/lib/pypy2.3/site-packages" result="${result}${result:+:}$p" done echo $result diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b17a38ad1f0..8ede0521df2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3531,7 +3531,7 @@ let python = python27; python3 = python3Packages.python; - pypy = callPackage ../development/interpreters/pypy/2.2 { }; + pypy = callPackage ../development/interpreters/pypy/2.3 { }; pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { From ca545ac8ecf4f4a7b93e70244f4b01779f117598 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 19 Jun 2014 04:10:32 +0200 Subject: [PATCH 67/67] chromium: Update beta channel to v36.0.1985.84. Tested and successfully built on my machine. Signed-off-by: aszlig --- .../networking/browsers/chromium/source/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 1905311c824..965328d43a4 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -7,10 +7,10 @@ sha256bin64 = "17kzb7k0vn96wa6a4xfx05885li1qjg8bp6y3ngs2i0wws9ypfd9"; }; beta = { - version = "36.0.1985.67"; - sha256 = "11gp21j96zr93g2bicwsq335zj83rx6jz44439cn3msgfqdfm3hp"; - sha256bin32 = "1ndllz5y4d37xjc004rdby8viif300qskpxfz4bb26z681frh6d1"; - sha256bin64 = "0yy6qr9ykd52qxxbx4kv1cmqmlw4hppah8s4lnw4lnd55xj9xb8q"; + version = "36.0.1985.84"; + sha256 = "02hhqx5m4hxmnf8l3a2ah9k39bpz35sll6gv89vz27vdgb6mza0j"; + sha256bin32 = "1jjxzknyiw6d5p0bcb7c9d0siffg55wmm34lq1phz1jlqq6hz6zy"; + sha256bin64 = "1jr9a386arfmd8rskns9bmlczzr3xzcw9ykv7xf23iz86qqp723r"; }; stable = { version = "35.0.1916.153";