From 6d80803e66a428011c45603d5c520e22c39b7c44 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Fri, 17 Jan 2014 20:02:13 +1100 Subject: [PATCH 001/118] Adds a service for haveged, the entropy daemon Includes configuration option for the threshold beneath which to refill the entropy pool - defaults to 1024 bits as this is the number used in other distro's existing service files I looked at. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/security/haveged.nix | 63 +++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 nixos/modules/services/security/haveged.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 86a3dca0d1e2..442edd8029de 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -201,6 +201,7 @@ ./services/scheduling/fcron.nix ./services/search/elasticsearch.nix ./services/security/clamav.nix + ./services/security/haveged.nix ./services/security/fprot.nix ./services/security/frandom.nix ./services/security/tor.nix diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix new file mode 100644 index 000000000000..c3ea3fb03ed9 --- /dev/null +++ b/nixos/modules/services/security/haveged.nix @@ -0,0 +1,63 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + + cfg = config.services.haveged; + +in + + +{ + + ###### interface + + options = { + + services.haveged = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable to haveged entropy daemon, which refills + /dev/random when low. + ''; + }; + + refill_threshold = mkOption { + type = types.int; + default = 1024; + description = '' + The number of bits of available entropy beneath which + haveged should refill the entropy pool. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.haveged = + { description = "Entropy Harvesting Daemon"; + unitConfig.documentation = "man:haveged(8)"; + wantedBy = [ "multi-user.target" ]; + + path = [ pkgs.haveged ]; + + serviceConfig = + { Type = "forking"; + ExecStart = "${pkgs.haveged}/sbin/haveged -w ${toString cfg.refill_threshold} -v 1"; + PIDFile = "/run/haveged.pid"; + }; + }; + + }; + +} \ No newline at end of file From 2581da31b0e7c8d37d9bcf78787fae355ec02b16 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 13 Jan 2014 10:40:19 +0000 Subject: [PATCH 002/118] haskellPackages.exPool: Do not fix the version of hashable The latest version of ex-pool does not have this requirement. --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c3addca97d1e..5b7feb39d4d4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1005,7 +1005,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x eventList = callPackage ../development/libraries/haskell/event-list {}; - exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; }; + exPool = callPackage ../development/libraries/haskell/ex-pool { }; exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; From 5d2a8e2d2e4ee186ed74f61a0dd10df6c185134e Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 11 Jan 2014 22:12:34 +0000 Subject: [PATCH 003/118] haskellPackages.threepennyGui: New expression --- .../haskell/threepenny-gui/default.nix | 26 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/haskell/threepenny-gui/default.nix diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix new file mode 100644 index 000000000000..11becfeacc74 --- /dev/null +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -0,0 +1,26 @@ +{ cabal, attoparsecEnumerator, dataDefault, deepseq, filepath +, hashable, json, MonadCatchIOTransformers, network, safe, snapCore +, snapServer, stm, text, time, transformers, unorderedContainers +, utf8String, vault, websockets, websocketsSnap +}: + +cabal.mkDerivation (self: { + pname = "threepenny-gui"; + version = "0.4.0.1"; + sha256 = "18ahfcbzlp0k5ry9fdzdv8jdwv10iplnbbnh2xyr3cqils2yp68m"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsecEnumerator dataDefault deepseq filepath hashable json + MonadCatchIOTransformers network safe snapCore snapServer stm text + time transformers unorderedContainers utf8String vault websockets + websocketsSnap + ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Threepenny-gui"; + description = "GUI framework that uses the web browser as a display"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c3addca97d1e..59646db8c743 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2265,6 +2265,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x thyme = callPackage ../development/libraries/haskell/thyme {}; + threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {}; + time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.nix {}; # time is in the core package set. It should only be necessary to From 4a8609811011ab3834814eb43cdc8d10456a4d5c Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 17 Jan 2014 15:07:37 +0000 Subject: [PATCH 004/118] haskellPackages.exceptions: Update to 0.3.3 and enable tests --- pkgs/development/libraries/haskell/exceptions/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix index a15c2cc1e48f..0665694212b6 100644 --- a/pkgs/development/libraries/haskell/exceptions/default.nix +++ b/pkgs/development/libraries/haskell/exceptions/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "exceptions"; - version = "0.3.2"; - sha256 = "0c1d78wm8is9kyv26drbx3f1sq2bfcq5m6wfw2qzwgalb3z2kxlw"; + version = "0.3.3"; + sha256 = "1gng8zvsljm6xrb5gy501f1dl47z171wkic8bsivhn4rgp9lby9l"; buildDepends = [ mtl transformers ]; testDepends = [ mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers ]; - doCheck = false; meta = { homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; From 1388fc4dc8867562863c5bc377e7f74576928c05 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 17 Jan 2014 15:04:14 +0000 Subject: [PATCH 005/118] haskellPackages.timezoneOlson/haskellPackages.timezoneSeries: New expressions --- .../libraries/haskell/timezone-olson/default.nix | 15 +++++++++++++++ .../libraries/haskell/timezone-series/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/haskell/timezone-olson/default.nix create mode 100644 pkgs/development/libraries/haskell/timezone-series/default.nix diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix new file mode 100644 index 000000000000..c46090cda9b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -0,0 +1,15 @@ +{ cabal, binary, extensibleExceptions, time, timezoneSeries }: + +cabal.mkDerivation (self: { + pname = "timezone-olson"; + version = "0.1.2"; + sha256 = "1dp0nppvx732c27pybbyqw6jkx4kdgfc6vnc539m0xv005afpq9y"; + buildDepends = [ binary extensibleExceptions time timezoneSeries ]; + meta = { + homepage = "http://projects.haskell.org/time-ng/"; + description = "A pure Haskell parser and renderer for binary Olson timezone files"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix new file mode 100644 index 000000000000..1ce1ca1f768c --- /dev/null +++ b/pkgs/development/libraries/haskell/timezone-series/default.nix @@ -0,0 +1,15 @@ +{ cabal, time }: + +cabal.mkDerivation (self: { + pname = "timezone-series"; + version = "0.1.2"; + sha256 = "0clvm1kwmxid5bhb74vgrpzynn4sff2k6mfzb43i7737w5fy86gp"; + buildDepends = [ time ]; + meta = { + homepage = "http://projects.haskell.org/time-ng/"; + description = "Enhanced timezone handling for Data.Time"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c3addca97d1e..b67f44daae8c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2271,6 +2271,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # pass it explicitly in rare circumstances. time = null; + timezoneOlson = callPackage ../development/libraries/haskell/timezone-olson {}; + + timezoneSeries = callPackage ../development/libraries/haskell/timezone-series {}; + timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls = callPackage ../development/libraries/haskell/tls {}; From b1a2c743942f09af75c811acbaca70206542d287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 18 Jan 2014 16:05:22 +0100 Subject: [PATCH 006/118] Filegive: update to 0.7.4. Compatibility with IE/chrome, report TLS connections, cipherings, useragents, etc. --- pkgs/tools/networking/filegive/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 443feee2ea03..a47a0397bf5a 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -11,16 +11,13 @@ let sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb"; }; - version = "0.7.1"; - in stdenv.mkDerivation rec { - name = "filegive-${version}"; + name = "filegive-0.7.4"; src = fetchurl { - url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}"; - name = "${name}.tar.gz"; - sha256 = "14yyif6q89ihn28kliszaf19vywjg9f7192q1ak8823da1svbq8a"; + url = "http://viric.name/soft/filegive/${name}.tar.gz"; + sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy"; }; buildInputs = [ go ]; From 84f35a7cc137ea816de2b0dd1b696cd8005bbb01 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 17 Jan 2014 20:50:35 +0100 Subject: [PATCH 007/118] libaio: Fix download URL --- pkgs/os-specific/linux/libaio/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 57137400b2fe..bf30530e9ad3 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { name = "libaio-0.3.109"; - src = fetchurl { - url = "mirror://kernel/linux/libs/aio/${name}.tar.bz2"; - sha256 = "15772ki2wckf2mj4gm1vhrsmpd6rq20983nhlkfghjfblghgrkmm"; + src = fetchgit { + url = https://git.fedorahosted.org/git/libaio.git; + rev = "refs/tags/${name}"; + sha256 = "1wbziq0hqvnbckpxrz1cgr8dlw3mifs4xpy3qhnagbrrsmrq2rhi"; }; makeFlags = "prefix=$(out)"; From ca7805be9470d70ef1a9b2193e5db0237893acf8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 18 Jan 2014 11:10:39 -0500 Subject: [PATCH 008/118] systemd: Enable specifying extra config files for a unit This will allow overriding package-provided units, or overriding only a specific instance of a unit template. Signed-off-by: Shea Levy --- nixos/modules/system/boot/systemd.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b12031d24adc..b575deb24b7b 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -11,16 +11,19 @@ let systemd = cfg.package; makeUnit = name: unit: - pkgs.runCommand "unit" ({ preferLocalBuild = true; } // optionalAttrs (unit.linkTarget == null) { inherit (unit) text; }) - (if !unit.enable then '' + pkgs.runCommand "unit" { preferLocalBuild = true; inherit (unit) text; } + ((if !unit.enable then '' mkdir -p $out ln -s /dev/null $out/${name} '' else if unit.linkTarget != null then '' mkdir -p $out ln -s ${unit.linkTarget} $out/${name} - '' else '' + '' else if unit.text != null then '' mkdir -p $out echo -n "$text" > $out/${name} + '' else "") + optionalString (unit.extraConfig != {}) '' + mkdir -p $out/${name}.d + ${concatStringsSep "\n" (mapAttrsToList (n: v: "echo -n \"${v}\" > $out/${name}.d/${n}") unit.extraConfig)} ''); upstreamUnits = @@ -392,7 +395,8 @@ in options = { name, config, ... }: { options = { text = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; description = "Text of this systemd unit."; }; enable = mkOption { @@ -424,6 +428,17 @@ in description = "The file to symlink this target to."; type = types.nullOr types.path; }; + extraConfig = mkOption { + default = {}; + example = { "foo@1.conf" = "X-RestartIfChanged=false"; }; + type = types.attrsOf types.lines; + description = '' + Extra files to be appended to the configuration for the unit. + This can be used to override configuration for a unit provided + by systemd or another package, or to override only a single instance + of a template unit. + ''; + }; }; config = { unit = makeUnit name config; From d454e094ef23b9f36708adfeac4109fe148df98e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 18 Jan 2014 11:17:49 -0500 Subject: [PATCH 009/118] kmscon: Don't re-run systemd-vconsole-setup after boot, and let tty1 wait for vconsole setup Signed-off-by: Shea Levy --- nixos/modules/services/ttys/kmscon.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 6cb1ec648e55..302e660a7bff 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -64,6 +64,10 @@ in { systemd.units."autovt@.service".linkTarget = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service"; + systemd.services."systemd-vconsole-setup".restartIfChanged = false; + + systemd.units."kmsconvt@tty1.service".extraConfig.wait-for-vconsole-setup = "After=systemd-vconsole-setup.service"; + services.kmscon.extraConfig = mkIf cfg.hwRender '' drm hwaccel From cd953d80e114df641be92d02ad83ad962f5389d3 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 16 Jan 2014 12:43:49 +0100 Subject: [PATCH 010/118] chromium: Update stable channel from 31.0.1650.57 -> 32.0.1700.77 --- pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 8ee5752f4aca..b7a30ef63f7d 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -11,8 +11,8 @@ sha256 = "0d0kgy160pyg472ka43gxk7n09pqhhs9nd93jyxrp9qsyllfc425"; }; stable = { - version = "31.0.1650.57"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1650.57.tar.xz"; - sha256 = "1xv7frf47hhvqm6f3n2l308yfrs4d8ri70q6pndx7hslhyiixzl9"; + version = "32.0.1700.77"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.77.tar.xz"; + sha256 = "1mwqa5k32d168swpw0bdcnhglxwcqdsx766fq0iz22h3hd4ccdwa"; }; } From 1b4d50dbac713b08e068f703e257345f108c31c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 18 Jan 2014 18:38:59 +0100 Subject: [PATCH 011/118] glm: new package OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specification and released under the MIT license. http://glm.g-truc.net/ --- pkgs/development/libraries/glm/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/glm/default.nix diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix new file mode 100644 index 000000000000..b35fe1e78559 --- /dev/null +++ b/pkgs/development/libraries/glm/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "glm-0.9.5.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; + sha256 = "1x8bpmqdszzkg21r411w7cy4mqd5dcvb9jghc8h3xrx7ldbicqjg"; + }; + + buildInputs = [ unzip ]; + + outputs = [ "out" "doc" ]; + + installPhase = '' + mkdir -p "$out/include" + cp -r glm "$out/include" + + mkdir -p "$doc/share/doc/glm" + cp -r doc/* "$doc/share/doc/glm" + ''; + + meta = with stdenv.lib; { + description = "OpenGL Mathematics library for C++"; + longDescription = '' + OpenGL Mathematics (GLM) is a header only C++ mathematics library for + graphics software based on the OpenGL Shading Language (GLSL) + specification and released under the MIT license. + ''; + homepage = http://glm.g-truc.net/; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acee935fcd45..5a1821b191ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4364,6 +4364,8 @@ let '' # */ ; + glm = callPackage ../development/libraries/glm { }; + glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { From 2b74a47006dccf5b30548b8757eb765c09afc66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 18 Jan 2014 18:46:18 +0100 Subject: [PATCH 012/118] gource: fix build gource currently fails in the configure phase: configure: error: Could not link against -lGLU ! This is a very misleading error, it seems to happen because configure doesn't find boost libraries and ends up with uninitialized variable(s). That in turn cause it to fail later with this unrelated error. Fix by using boost libraries, not only the headers. gource also grew a dependency on GLM, so add that to buildInputs. --- .../applications/version-management/gource/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index d4e9af5e12b5..3b6d19e8fcf2 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre -, SDL_image, glew, mesa, boostHeaders +, SDL_image, glew, mesa, boost, glm }: stdenv.mkDerivation rec { @@ -11,14 +11,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ - glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boostHeaders + glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm ]; + configureFlags = "--with-boost-libdir=${boost}/lib"; + meta = { homepage = "http://code.google.com/p/gource/"; description = "software version control visualization tool"; license = stdenv.lib.licenses.gpl3Plus; - longDescription = '' Software projects are displayed by Gource as an animated tree with the root directory of the project at its centre. Directories @@ -29,7 +30,6 @@ stdenv.mkDerivation rec { Mercurial and Bazaar and SVN. Gource can also parse logs produced by several third party tools for CVS repositories. ''; - - broken = true; + platforms = stdenv.lib.platforms.linux; }; } From 71dc9ad2520bb2aa1d11d38dc0a92bef52d5a8da Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 14 Jan 2014 09:46:36 +0100 Subject: [PATCH 013/118] llvm: remove deprecation warning. We prefer using the default version unless a package really needs a newer/older one --- 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 5a1821b191ca..14fccf3f3302 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2908,7 +2908,7 @@ let lessc = callPackage ../development/compilers/lessc { }; - llvm = llvm_33; # deprecated, depend on llvm_* directly + llvm = llvm_33; llvm_34 = callPackage ../development/compilers/llvm { version = "3.4"; stdenv = if stdenv.isDarwin From a4111bd67f8efbca9f1b67a015c299dc2ae4c6c4 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 18 Jan 2014 20:54:52 +0100 Subject: [PATCH 014/118] Add new package libossp-uuid-1.6.2 --- .../libraries/libossp-uuid/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/libossp-uuid/default.nix diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix new file mode 100644 index 000000000000..b1ccae4698c1 --- /dev/null +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl}: + +let version = "1.6.2"; in + +stdenv.mkDerivation { + name = "libossp-uuid-${version}"; + + src = fetchurl { + url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz"; + sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; + }; + + meta = { + homepage = http://www.ossp.org/pkg/lib/uuid/; + description = + '' + OSSP uuid is a ISO-C:1999 application programming interface + (API) and corresponding command line interface (CLI) for the + generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 + compliant Universally Unique Identifier (UUID). It supports + DCE 1.1 variant UUIDs of version 1 (time and node based), + version 3 (name based, MD5), version 4 (random number based) + and version 5 (name based, SHA-1). Additional API bindings are + provided for the languages ISO-C++:1998, Perl:5 and + PHP:4/5. Optional backward compatibility exists for the ISO-C + DCE-1.1 and Perl Data::UUID APIs. + + UUIDs are 128 bit numbers which are intended to have a high + likelihood of uniqueness over space and time and are + computationally difficult to guess. They are globally unique + identifiers which can be locally generated without contacting + a global registration authority. UUIDs are intended as unique + identifiers for both mass tagging objects with an extremely + short lifetime and to reliably identifying very persistent + objects across a network. + ''; + license = "bsd2"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acee935fcd45..748a5bc15d1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6598,6 +6598,8 @@ let python = pythonFull; }; + libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; + libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (utillinux // { From c5269290c3b46b90116e41423cb87cc572bc9e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 18 Jan 2014 21:14:32 +0100 Subject: [PATCH 015/118] qsynth: update from 0.3.6 to 0.3.8 http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fycg9bkl40sch06kcyjvmnmkxq5mas9p6-qsynth-0.3.8 --- pkgs/applications/audio/qsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 96221348f88c..3397b4de7517 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.3.6"; + version = "0.3.8"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "0g7vaffpgs7v2p71ml5p7fzxz50mhlaklgf9zk4wbfk1hslqv5mm"; + sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw"; }; buildInputs = [ alsaLib fluidsynth jackaudio qt4 ]; From 122905154cd0ab8ad113dac4997b862c4ba3b7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 18 Jan 2014 21:21:54 +0100 Subject: [PATCH 016/118] qtractor: update from 0.5.4 to 0.5.12 http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fyaq7iknwr79xwrmc4igrs3ygdy61ryjl-qtractor-0.5.12 --- pkgs/applications/audio/qtractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 3c31aff4232c..e04ad9ddd14c 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -3,12 +3,12 @@ , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.5.4"; + version = "0.5.12"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "08vnvjl4w6z49s5shnip0qlwib0gwixw9wrqbazkh62i328fa05l"; + sha256 = "0yf2p9l3hj8pd550v3rbbjqkvxnvn8p6nsnm4aj2v5q4mgg2c8cc"; }; buildInputs = From 6105b41eac84360765f4705d3119570dafb15e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 18 Jan 2014 21:23:40 +0100 Subject: [PATCH 017/118] samplv1: update from 0.3.5 to 0.3.6 http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fdgrhrqf4j0q0601fgh81bhzkcgj7h4b0-samplv1-0.3.6 --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index e2d7adc4a657..8c73928c79a4 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1q4ggcbbz9lfrjh0ybr3grgipjkq6w5fb9gz5k5cryzz92p7ihw9"; + sha256 = "1fgy9w3mp0p8i1v41a7gmpzzk268k7bp75d4sgzfprikjihc6ary"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; From 329377b6ca25c1ba3bb08d42ef4c303a74878159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 18 Jan 2014 21:24:35 +0100 Subject: [PATCH 018/118] synthv1: update from 0.3.2 to 0.3.6 http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fr5rfpb9zn3pa8yhxfz5d5ngqqj6n6mgg-synthv1-0.3.6 --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index aadce32dda41..c93c4c852256 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.3.2"; + version = "0.3.6"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1230yf49qfw540yvp5n7sh6mf3k8590pzwc5mragd3nd6k6apgw9"; + sha256 = "1xj4dk1g546f9fv2c4i7g3f1axrxfrxzk9w1nidhj3686j79nyry"; }; buildInputs = [ qt4 jackaudio lv2 ]; From 51a5f9c3646d6796f119a61251231841ade09a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 18 Jan 2014 21:26:08 +0100 Subject: [PATCH 019/118] hydrogen: update from 0.9.5 to 0.9.5.1 http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fxvg8py63xnwyyqmaws7n310l423xbp9h-hydrogen-0.9.5.1 --- pkgs/applications/audio/hydrogen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index bb10f24b90a2..74ff2a3407c4 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -2,12 +2,12 @@ , libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.5.1"; name = "hydrogen-${version}"; src = fetchurl { url = "mirror://sourceforge/hydrogen/hydrogen-${version}.tar.gz"; - sha256 = "1hyri49va2ss26skd6p9swkx0kbr7ggifbahkrcfgj8yj7pp6g4n"; + sha256 = "1fvyp6gfzcqcc90dmaqbm11p272zczz5pfz1z4lj33nfr7z0bqgb"; }; buildInputs = [ From 0cf9a083d970c8d41c6c412a82bc65a395c30c2d Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 14 Jan 2014 03:24:27 +0100 Subject: [PATCH 020/118] virt-manager: Fix running with --no-fork This removes nixpkgs' custom runners and instead copies the main python source files to the bin directory, then wraps them up as usual. Hopefully this will be more reliable than other previous wrapping methods. --- .../virt-manager/custom_runner.py | 13 ----------- .../virtualization/virt-manager/default.nix | 22 +++++-------------- 2 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/virtualization/virt-manager/custom_runner.py diff --git a/pkgs/applications/virtualization/virt-manager/custom_runner.py b/pkgs/applications/virtualization/virt-manager/custom_runner.py deleted file mode 100644 index 5322c20dd329..000000000000 --- a/pkgs/applications/virtualization/virt-manager/custom_runner.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/python -t -# this script was written to use /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh -# which already automates python executable wrapping by extending the PATH/pythonPath - -# from http://docs.python.org/library/subprocess.html -# Warning Invoking the system shell with shell=True can be a security hazard if combined with untrusted input. See the warning under Frequently Used Arguments for details. - -from subprocess import Popen, PIPE, STDOUT - -cmd = 'PYTHON_EXECUTABLE_PATH -t THE_CUSTOM_PATH/share/virt-manager/THE_CUSTOM_PROGRAM.py' -p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True) -output = p.stdout.read() -print output diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9eee8c2ca4ea..fb2dde66442f 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -41,10 +41,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pythonPackages.wrapPython ]; - # patch the runner script in order to make wrapPythonPrograms work and run the program using a syscall - # example code: /etc/nixos/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix - customRunner = ./custom_runner.py; - # TODO # virt-manager -> import gtk.glade -> No module named glade --> fixed by removing 'pygtk' and by only using pyGtkGlade # -> import gconf -> ImportError: No module named gconf @@ -62,21 +58,13 @@ stdenv.mkDerivation rec { # -> fixed by http://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications & a restart # virt-manager-tui -> ImportError: No module named newt_syrup.dialogscreen - patchPhase = '' - cat ${customRunner} > src/virt-manager.in - substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PATH" "$out" - substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager" - substituteInPlace "src/virt-manager.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python" - - cat ${customRunner} > src/virt-manager-tui.in - substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PATH" "$out" - substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager-tui" - substituteInPlace "src/virt-manager-tui.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python" - ''; - - # /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh installPhase = '' make install + + # A hack, but the most reliable method so far + echo "#!/usr/bin/env python" | cat - src/virt-manager.py > $out/bin/virt-manager + echo "#!/usr/bin/env python" | cat - src/virt-manager-tui.py > $out/bin/virt-manager-tui + wrapPythonPrograms ''; From ffd3e0f02cdb78232691c786de6ab0bb34ea56c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 18 Jan 2014 21:41:15 +0100 Subject: [PATCH 021/118] logstalgia: fix attribute and directory name typo Change "logstalgica" to "logstalgia". --- pkgs/tools/graphics/{logstalgica => logstalgia}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/tools/graphics/{logstalgica => logstalgia}/default.nix (100%) diff --git a/pkgs/tools/graphics/logstalgica/default.nix b/pkgs/tools/graphics/logstalgia/default.nix similarity index 100% rename from pkgs/tools/graphics/logstalgica/default.nix rename to pkgs/tools/graphics/logstalgia/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14fccf3f3302..07f2bde69a96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1278,7 +1278,7 @@ let logrotate = callPackage ../tools/system/logrotate { }; - logstalgica = callPackage ../tools/graphics/logstalgica {}; + logstalgia = callPackage ../tools/graphics/logstalgia {}; lout = callPackage ../tools/typesetting/lout { }; From cf6ac40585afa3500db8cc12865e1602bb6ff779 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 14 Jan 2014 15:32:54 +0100 Subject: [PATCH 022/118] Update OCaml findlib to version 1.4 --- pkgs/development/tools/ocaml/findlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index aee0040f8159..ec19d55c58ea 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocaml-findlib-1.3.3"; + name = "ocaml-findlib-1.4"; src = fetchurl { - url = http://download.camlcity.org/download/findlib-1.3.3.tar.gz; - sha256 = "981f5c67118a2be015efa79f3af3cb0063376b93123b5d695e7cb5c586b1d45c"; + url = http://download.camlcity.org/download/findlib-1.4.tar.gz; + sha256 = "1y5xy6crldyh8pl9ca2cj31igbjfkicr9zqkq9p1fccxszjnah3f"; }; buildInputs = [m4 ncurses ocaml]; From 663845fc9e05ac54afaea4f68ebf27416c2ec6b4 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 14 Jan 2014 17:24:26 +0100 Subject: [PATCH 023/118] Update OCaml OUnit to version 2.0.0 --- pkgs/development/ocaml-modules/ounit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 533f1ec8d1cd..43ec474cf5e7 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ounit-1.1.2"; + name = "ounit-2.0.0"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz; - sha256 = "e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3"; + url = http://forge.ocamlcore.org/frs/download.php/886/ounit-2.0.0.tar.gz; + sha256 = "1qw8k2czy0bxhsf25kfpgywhpqmg7bi57rmyhlnmbddmvc61pg76"; }; buildInputs = [ocaml findlib]; From 389da8b64c4fa14b1c6513737a99589589a84cb7 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 14 Jan 2014 17:30:29 +0100 Subject: [PATCH 024/118] Update camlp5 to version 6.11 --- pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 74b3368293c1..8691e1b9d111 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.06"; + name = "camlp5${if transitional then "_transitional" else ""}-6.11"; src = fetchurl { - url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.06.tgz; - sha256 = "763f89ee6cde4ca063a50708c3fe252d55ea9f8037e3ae9801690411ea6180c5"; + url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.11.tgz; + sha256 = "0dxb5id6imq502sic75l786q94dhplqx6yyhjkkw19kf64fiqlk5"; }; buildInputs = [ ocaml ]; From cd2fd2a4013ac96798df2458ba9f980fb4462b0c Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 14 Jan 2014 17:35:55 +0100 Subject: [PATCH 025/118] Update cryptokit to version 1.9 --- pkgs/development/ocaml-modules/cryptokit/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 94b36fb66513..1f9e2b44e00c 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -2,16 +2,14 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.7"; in stdenv.mkDerivation { - name = "cryptokit-${version}"; + name = "cryptokit-1.9"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1166/" + - "cryptokit-${version}.tar.gz"; - sha256 = "56a8c0339c47ca3cf43c8881d5b519d3bff68bc8a53267e9c5c9cbc9239600ca"; + url = http://forge.ocamlcore.org/frs/download.php/1166/cryptokit-1.9.tar.gz; + sha256 = "1jh0jqiwkjy9qplnfcm5r25zdgyk36sxb0c87ks3rjj7khrw1a2n"; }; buildInputs = [zlib ocaml findlib ncurses]; From c54a9276ba82a8f34102679fdf1869d63dede2ad Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 15 Jan 2014 16:47:34 +0100 Subject: [PATCH 026/118] Update menhir to version 20130115 --- pkgs/development/ocaml-modules/menhir/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index d02516e410a3..249ddc1cf568 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -2,14 +2,13 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "20120123"; in stdenv.mkDerivation { - name = "menhir-${version}"; + name = "menhir-20130116"; src = fetchurl { - url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz"; + url = http://pauillac.inria.fr/~fpottier/menhir/menhir-20130116.tar.gz; sha256 = "65cd9e4f813c62697c60c344963ca11bd461169f574ba3a866c2691541cb4682"; }; @@ -42,7 +41,7 @@ stdenv.mkDerivation { to OCaml code. Menhir was designed and implemented by François Pottier and Yann Régis-Gianas. ''; - license = "QPL,LGPL+linking exceptions"; + licenses = [ "QPL" /* generator */ "LGPLv2" /* library */ ]; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z From e634e4ae6b305d32d10008b5a6d33ec6e9be1a54 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 15 Jan 2014 17:11:18 +0100 Subject: [PATCH 027/118] Update OCaml library Camomile to version 0.8.5 --- pkgs/development/ocaml-modules/camomile/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 1d4b98bf0e57..332230615d15 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -2,16 +2,14 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.8.3"; in stdenv.mkDerivation { - name = "camomile-${version}"; + name = "camomile-0.8.5"; src = fetchurl { - url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2"; - #sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00"; - sha256 = "0yzj6j88aqrkbcynqh1d7r54670m1sqf889vdcgk143w85fxdj4l"; + url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; + sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; }; buildInputs = [ocaml findlib]; @@ -19,9 +17,9 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://camomile.sourceforge.net/; + homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; description = "A comprehensive Unicode library for OCaml"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z From c7e19f96790bb0db53e5bd556c39a9a4d5931685 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 18 Jan 2014 23:09:27 +0100 Subject: [PATCH 028/118] Use stdenv.lib.licenses.bsd instead of "bsd" --- pkgs/development/libraries/libossp-uuid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index b1ccae4698c1..df7fc46b1e77 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { short lifetime and to reliably identifying very persistent objects across a network. ''; - license = "bsd2"; + license = stdenv.lib.licenses.bsd2; }; } \ No newline at end of file From 242dfe152d5093743c72aade18b87092f30c4af1 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 18 Jan 2014 23:28:16 +0100 Subject: [PATCH 029/118] Use a short and long description for libossp-uuid --- pkgs/development/libraries/libossp-uuid/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index df7fc46b1e77..7f6335f64965 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { meta = { homepage = http://www.ossp.org/pkg/lib/uuid/; - description = + description = "OSSP uuid ISO-C and C++ shared library"; + longDescription = '' OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the From d37aec1ac4f855f43b9ff661a427e8555990b35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Jan 2014 10:44:41 +0100 Subject: [PATCH 030/118] poppler: bugfix update 0.24.4 -> .5 Also Qt4 binding bugfix. --- pkgs/development/libraries/poppler/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 1f1ab5d72823..1e1452f4578b 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,14 +4,14 @@ }: let - version = "0.24.4"; # even major numbers are stable - sha256 = "1qh1gk6hq5cfpkqyxxgkpyl78na8dckmh6zbgsqbpw762yd518y8"; + version = "0.24.5"; # even major numbers are stable + sha256 = "114zfm4771iq25wa4bsg4nc2gnr6waaj8936wd23r4hc2084jrd2"; qtcairo_patches = - let qtcairo = fetchgit { # the version for poppler-0.22 + let qtcairo = fetchgit { # the version for poppler-0.24 url = "git://github.com/giddie/poppler-qt4-cairo-backend.git"; - rev = "ad9a9ba0628df33522f4b7722cb0cd027269babe"; - sha256 = "072p7x9902avg2r1ma5br97q8nm8sbk19y0qi4b4g9x2xj2fpajq"; + rev = "c4578cde09834e0d70873f63b1c2a410f66bb4f9"; + sha256 = "07bs2phmp7f4mqrwqz2bgyw2gw7s00mwsm548bsikyz1cbj7fl93"; }; in [ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch" "${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch" From 83a2e8554bd824663a59ca8eec277acf202ba480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Jan 2014 11:39:30 +0100 Subject: [PATCH 031/118] spacefm: fix schema-crash (in preferences), nitpicks I also did some style changes to be closer to most in nixpkgs. --- pkgs/applications/misc/spacefm/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index fa3423cd8c4c..6d52f63ff6b4 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,21 +1,27 @@ -{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info, intltool, pkgconfig }: +{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info +, intltool, pkgconfig, makeWrapper +}: let - name = "spacefm-${version}"; version = "0.9.2"; -in stdenv.mkDerivation { - inherit name; +in stdenv.mkDerivation rec { + name = "spacefm-${version}"; src = fetchurl { - url="https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true"; - sha256 ="3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c"; + url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true"; + sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c"; }; - buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig ]; + buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/spacefm" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share" + ''; meta = { - description = "SpaceFM is a multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration."; + description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration."; platforms = pkgs.lib.platforms.linux; license = pkgs.lib.licenses.gpl3; }; From 52213afd481b488636968dc373203a1f9db5b2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 12:26:35 +0100 Subject: [PATCH 032/118] qsynth: add linux as a platform --- pkgs/applications/audio/qsynth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 3397b4de7517..05e6da223dad 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { description = "Fluidsynth GUI"; homepage = http://sourceforge.net/projects/qsynth; license = licenses.gpl2Plus; + platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; } From ea72595fabeea529e126ff997cb366388eb4ded0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 12:29:28 +0100 Subject: [PATCH 033/118] yoshimi: update from 0.060.12 to 1.1.0 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index bce7e0ef5ee0..4fa07a7c6218 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -5,11 +5,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "0.060.12"; + version = "1.1.0"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "14javywkw6af9z9c7jr06rzdgzncyaz2ab6f0v0k6bgdndlcgslc"; + sha256 = "0rb0q0bqsaaj3imdjgfaigj1kbjqkx1gm91nh2mdgy9i09rygsbv"; }; buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa From e9e8cf4b9834a6356419050d8320d0515291ed7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 12:31:16 +0100 Subject: [PATCH 034/118] Tidy up --- pkgs/applications/audio/yoshimi/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 4fa07a7c6218..e004b19fbd48 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, alsaLib, boost, cmake, fftwSinglePrec, fltk -, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }: +, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib +}: assert stdenv ? glibc; @@ -12,8 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0rb0q0bqsaaj3imdjgfaigj1kbjqkx1gm91nh2mdgy9i09rygsbv"; }; - buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa - minixml zlib ]; + buildInputs = [ + alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa + minixml zlib + ]; + nativeBuildInputs = [ cmake pkgconfig ]; preConfigure = "cd src"; From cbacf96b1c5b9a7bfa05acd6adb456d81583cf11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 12:33:10 +0100 Subject: [PATCH 035/118] yoshimi: add cairo as build input --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index e004b19fbd48..698c8dc0ddad 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, boost, cmake, fftwSinglePrec, fltk +{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk , jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa + alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa minixml zlib ]; From 78c4b0868ebb5b626307ba617f77564387571f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 12:47:17 +0100 Subject: [PATCH 036/118] zynaddsubfx: update from 2.4.1 to 2.4.3 --- pkgs/applications/audio/zynaddsubfx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index fcec85b7fe57..8dfac4d78f97 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/ZynAddSubFX-${version}.tar.bz2"; - sha256 = "1zn5lgh76rrbfj8d4jys2gc1j2pqrbdd18ywfdrk0s7jq4inwyfg"; + sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq"; }; buildInputs = [ alsaLib fftw fltk13 minixml zlib ]; From b3a116c76205c9e785de0ee0cfee294c6cb916e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 13:01:49 +0100 Subject: [PATCH 037/118] zynaddsubfx: fix build, tidy up, add JACK support --- pkgs/applications/audio/zynaddsubfx/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 8dfac4d78f97..378318fbf855 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, cmake, fftw, fltk13, minixml, pkgconfig, zlib }: +{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml +, pkgconfig, zlib +}: stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; @@ -9,18 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq"; }; - buildInputs = [ alsaLib fftw fltk13 minixml zlib ]; + buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ]; nativeBuildInputs = [ cmake pkgconfig ]; - patches = [ - (fetchurl { - url = http://patch-tracker.debian.org/patch/series/dl/zynaddsubfx/2.4.0-1.2/09_fluid_1.3.patch; - sha256 = "06wl7fs44b24ls1fzh21596n6zzc3ywm2bcdfrkfiiwpzin3yjq6"; - }) - ]; - -#installPhase = "mkdir -pv $out/bin; cp -v zynaddsubfx $out/bin"; - meta = with stdenv.lib; { description = "high quality software synthesizer"; homepage = http://zynaddsubfx.sourceforge.net; From 76267063a5a1ba4ee1ae7b470844aaee352de992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 13:06:51 +0100 Subject: [PATCH 038/118] jalv: update from 1.4.2 to 1.4.4 --- pkgs/applications/audio/jalv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index fec9baa8695e..6b15052769be 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jalv-${version}"; - version = "1.4.2"; + version = "1.4.4"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "132cq347xpa91d9m7nnmpla7gz4xg0njfw7kzwnp0gz172k0klp7"; + sha256 = "1iql1r52rmf87q6jkxhcxa3lpq7idzzg55ma91wphywyvh29q7lf"; }; buildInputs = [ From f95dfe1502de88d89a458042b7698776b27813f6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 19 Jan 2014 13:13:32 +0100 Subject: [PATCH 039/118] lmms: update from 0.4.10 to 0.4.15 --- pkgs/applications/audio/lmms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 8cdb99412f44..ac6fbeb9ce78 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -3,11 +3,11 @@ libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 }: stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "0.4.10"; + version = "0.4.15"; src = fetchurl { url = "mirror://sourceforge/lmms/${name}.tar.bz2"; - sha256 = "035cqmxcbr9ipnicdv5l7h05q2hqbavxkbaxyq06ppnv2y7fxwrb"; + sha256 = "02q2gbsqwk3hf9kvzz58a5bxmlb4cfr2mzy41wdvbxxdm2pcl101"; }; buildInputs = [ SDL alsaLib cmake fftw jackaudio libogg From c9d1ed561f184163c70a922a80b9e36b52590f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 13:20:43 +0100 Subject: [PATCH 040/118] lmms: tidy up, fix build --- pkgs/applications/audio/lmms/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index ac6fbeb9ce78..5195ddd42a13 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, SDL, alsaLib, cmake, fftw, jackaudio, libogg, -libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 }: +{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg +, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 +}: stdenv.mkDerivation rec { name = "lmms-${version}"; @@ -10,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "02q2gbsqwk3hf9kvzz58a5bxmlb4cfr2mzy41wdvbxxdm2pcl101"; }; - buildInputs = [ SDL alsaLib cmake fftw jackaudio libogg - libsamplerate libsndfile pkgconfig pulseaudio qt4 ]; + buildInputs = [ + SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate + libsndfile pkgconfig pulseaudio qt4 + ]; meta = with stdenv.lib; { description = "Linux MultiMedia Studio"; From 0ec2adc69d63380567b0b6b629b543764b97eaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 14:59:48 +0100 Subject: [PATCH 041/118] mda_lv2: update from 1.0.0 to 1.2.2 --- pkgs/applications/audio/mda-lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 8b7d5527372b..9d3cdc2eea38 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mda-lv2-${version}"; - version = "1.0.0"; + version = "1.2.2"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1dbgvpz9qvlwsfkq9c0dx45bm223wwrzgiddlyln1agpns3qbf0f"; + sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4"; }; buildInputs = [ fftwSinglePrec lv2 pkgconfig python ]; From 987803760352a3035238defe9d8a31f7b112fcec Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 19 Jan 2014 15:36:33 +0100 Subject: [PATCH 042/118] haskell-hasktags: upgrade to 0.68.6 --- pkgs/development/tools/haskell/hasktags/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix index 8f72edb1f80e..cd27fb5fbc4d 100644 --- a/pkgs/development/tools/haskell/hasktags/default.nix +++ b/pkgs/development/tools/haskell/hasktags/default.nix @@ -1,17 +1,17 @@ -{ cabal, filepath, HUnit, interlude, json }: +{ cabal, filepath, HUnit, json }: cabal.mkDerivation (self: { pname = "hasktags"; - version = "0.68.5"; - sha256 = "0yr7icaww5kiczmi64n2ypkwabs4yl8wl2kf67zmgclp12kqik81"; + version = "0.68.6"; + sha256 = "1r5vnn9n2jva1ccjv8vnp3j0z3bh3xsi7yjv9llnvj0jw308aq9r"; isLibrary = false; isExecutable = true; - buildDepends = [ filepath HUnit interlude json ]; + buildDepends = [ filepath json ]; + testDepends = [ filepath HUnit json ]; meta = { homepage = "http://github.com/MarcWeber/hasktags"; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From 2a0f1cd6f155a58164ac47a8a3b8270e05e62070 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Wed, 15 Jan 2014 15:25:23 +0100 Subject: [PATCH 043/118] rust: Add --- lib/maintainers.nix | 1 + pkgs/development/compilers/rust/default.nix | 51 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/rust/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index de8e617b322f..c29259c6386c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -35,6 +35,7 @@ ktosiek = "Tomasz Kontusz "; lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; + madjar = "Georges Dubus "; marcweber = "Marc Weber "; matejc = "Matej Cotman "; modulistic = "Pablo Costa "; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix new file mode 100644 index 000000000000..98573ab7dc91 --- /dev/null +++ b/pkgs/development/compilers/rust/default.nix @@ -0,0 +1,51 @@ +{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}: + +let snapshotName = "rust-stage0-2014-01-05-a6d3e57-linux-x86_64-aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090.tar.bz2"; in +stdenv.mkDerivation { + name = "rust-0.9"; + + src = fetchurl { + url = http://static.rust-lang.org/dist/rust-0.9.tar.gz; + sha256 = "1lfmgnn00wrc30nf5lgg52w58ir3xpsnpmzk2v5a35xp8lsir4f0"; + }; + + # We need rust to build rust. If we don't provide it, configure will try to download it + snapshot = fetchurl { + url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; + sha256 = "17inc23jpznqp0vnskvznm74mm24c1nffhz2bkadhvp2ww0vpjjx"; + }; + + # Put the snapshot where it is expected + postUnpack = '' + mkdir $sourceRoot/dl + ln -s $snapshot $sourceRoot/dl/${snapshotName} + ''; + + # Modify the snapshot compiler so that is can be executed + preBuild = '' + make x86_64-unknown-linux-gnu/stage0/bin/rustc + patchelf --interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ + --set-rpath ${stdenv.gcc.gcc}/lib/ \ + x86_64-unknown-linux-gnu/stage0/bin/rustc + ''; + + # rustc requires cc + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : "${stdenv.gcc}/bin" + done + ''; + + buildInputs = [ which file perl curl python27 makeWrapper]; + enableParallelBuilding = true; + + meta = { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = [ stdenv.lib.maintainers.madjar ]; + license = map (builtins.getAttr "shortName") [stdenv.lib.licenses.mit stdenv.lib.licenses.asl20 ]; + # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index deb6708decf5..5b20147f7ef5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3103,8 +3103,7 @@ let roadsend = callPackage ../development/compilers/roadsend { }; - # TODO: the corresponding nix file is missing - # rust = pkgsi686Linux.callPackage ../development/compilers/rust {}; + rust = callPackage ../development/compilers/rust {}; sbcl = builderDefsPackage (import ../development/compilers/sbcl) { inherit makeWrapper; From 9f9244f06109f1d5cc706e47334cd14f44a78ea8 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Sun, 19 Jan 2014 13:24:32 +0100 Subject: [PATCH 044/118] silver-search: Add --- pkgs/tools/text/silver-searcher/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/text/silver-searcher/default.nix diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix new file mode 100644 index 000000000000..83a89cfb6028 --- /dev/null +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}: + +let release = "0.18.1"; in +stdenv.mkDerivation { + name = "silver-searcher-${release}"; + + src = fetchgit { + url = "https://github.com/ggreer/the_silver_searcher.git"; + rev = "refs/tags/${release}"; + sha256 = "bf2c8f3c68895e0ee00d373c1d87201e806b413bb28373ee168e375f2a095ec5"; + }; + + buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ]; + + meta = { + homepage = https://github.com/ggreer/the_silver_searcher/; + description = "A code-searching tool similar to ack, but faster"; + maintainers = [ stdenv.lib.maintainers.madjar ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index deb6708decf5..6cb5fb3b1eac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1832,6 +1832,8 @@ let silc_server = callPackage ../servers/silc-server { }; + silver-searcher = callPackage ../tools/text/silver-searcher { }; + sleuthkit = callPackage ../tools/system/sleuthkit {}; slimrat = callPackage ../tools/networking/slimrat { From 03c9791e0a7b65813de51c6450f126ddd62514cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Jan 2014 17:56:46 +0100 Subject: [PATCH 045/118] phonon_backend_vlc: fix build by adding pkgconfig Commented on https://github.com/NixOS/nixpkgs/commit/86f7aec95059d8d3efba285cd51471a8aec2cb09#commitcomment-5111284 --- pkgs/development/libraries/phonon-backend-vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 39f444dd58f8..060f4c45a486 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }: +{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, pkgconfig, phonon }: let pname = "phonon-backend-vlc"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd"; }; - nativeBuildInputs = [ cmake automoc4 xz ]; + nativeBuildInputs = [ cmake pkgconfig automoc4 xz ]; buildInputs = [ qt4 vlc_ phonon ]; From cb245301350147edfec6867f0955e7e1379e3439 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 19 Jan 2014 12:40:31 -0500 Subject: [PATCH 046/118] Fix whitespace Signed-off-by: Shea Levy --- pkgs/development/compilers/rust/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 98573ab7dc91..f605f1ca40ed 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -3,7 +3,7 @@ let snapshotName = "rust-stage0-2014-01-05-a6d3e57-linux-x86_64-aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090.tar.bz2"; in stdenv.mkDerivation { name = "rust-0.9"; - + src = fetchurl { url = http://static.rust-lang.org/dist/rust-0.9.tar.gz; sha256 = "1lfmgnn00wrc30nf5lgg52w58ir3xpsnpmzk2v5a35xp8lsir4f0"; @@ -36,16 +36,16 @@ stdenv.mkDerivation { done ''; - buildInputs = [ which file perl curl python27 makeWrapper]; + buildInputs = [ which file perl curl python27 makeWrapper ]; enableParallelBuilding = true; meta = { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; maintainers = [ stdenv.lib.maintainers.madjar ]; - license = map (builtins.getAttr "shortName") [stdenv.lib.licenses.mit stdenv.lib.licenses.asl20 ]; + license = map (builtins.getAttr "shortName") [ stdenv.lib.licenses.mit stdenv.lib.licenses.asl20 ]; # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } From 0e74c9f4dcec3fe61a1e9ec9afb5a03f8b27183b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 19 Jan 2014 13:38:37 -0500 Subject: [PATCH 047/118] Fix tarball Signed-off-by: Shea Levy --- pkgs/development/compilers/rust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index f605f1ca40ed..a0c8b50ad3fa 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation { ''; # Modify the snapshot compiler so that is can be executed - preBuild = '' + preBuild = if stdenv.isLinux then '' make x86_64-unknown-linux-gnu/stage0/bin/rustc patchelf --interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ --set-rpath ${stdenv.gcc.gcc}/lib/ \ x86_64-unknown-linux-gnu/stage0/bin/rustc - ''; + '' else null; # rustc requires cc postInstall = '' From 30f79470311957cbb54b5705550509cf12e6db87 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 19 Jan 2014 15:07:35 -0500 Subject: [PATCH 048/118] Whitespace to force a build Ugh Signed-off-by: Shea Levy --- nixos/tests/installer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 865b21d2444a..7581c10a01d0 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -319,6 +319,7 @@ in { "mkfs.ext3 -L nixos /dev/sda2", "mount LABEL=nixos /mnt", ); + ''; fileSystems = rootFS; grubVersion = 1; From f5642f26ddde8e08457a98e909596666827db5b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 19:41:09 +0100 Subject: [PATCH 049/118] lilv: update from 0.16.0 to 0.18.0 --- pkgs/development/libraries/audio/lilv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 1baa96cd6da8..9150df8da7d4 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lilv-${version}"; - version = "0.16.0"; + version = "0.18.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1ddrcikypi7gfmj5cqn975axzrgv7mhzif4h0ni9w5b4v64rvcyg"; + sha256 = "1k9wfc08ylgbkwbnvh1fx1bdzl3y59xrrx8gv0vk68yzcvcmv6am"; }; buildInputs = [ lv2 pkgconfig python serd sord sratom ]; From 9f857e6e0c69f9617fdd89dc5cf9244f7fcf658a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 19:42:20 +0100 Subject: [PATCH 050/118] sratom: update from 0.4.2 to 0.4.4 --- pkgs/development/libraries/audio/sratom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index daaf780e45da..5c78296af971 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sratom-${version}"; - version = "0.4.2"; + version = "0.4.4"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "16i5snknl9frz638mgr58lp11ap1xmkbrkb3l6f0ad8ddqpcjm3i"; + sha256 = "1q4044md8nmqah8ay5mf4lgdl6x0sfa4cjqyqk9da8nqzvs2j37s"; }; buildInputs = [ lv2 pkgconfig python serd sord ]; From 000b1ad43accf62263ef519bc0b0d4056c3e80b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 19:42:48 +0100 Subject: [PATCH 051/118] suil: update from 0.6.16 to 0.8.0 --- pkgs/development/libraries/audio/suil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index f5b68b7a8431..8af725b6b80f 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "suil-${version}"; - version = "0.6.16"; + version = "0.8.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "101xq7pd8kvnqwm4viaj4ikhn65jxrlrkg79ca954yqrdb9p9w8v"; + sha256 = "0y5sbgaivb03vmr3jcpzj16wqxa5h744ml4w3ylzglbxs2bqgl7n"; }; buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ]; From 0fde2980472bda642d853145424bbe6e8b202bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 19:40:42 +0100 Subject: [PATCH 052/118] lv2: update from 1.6.0 to 1.8.0 --- pkgs/development/libraries/audio/lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index bd6c64a9ee20..f5d48df03f84 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lv2-${version}"; - version = "1.6.0"; + version = "1.8.0"; src = fetchurl { url = "http://lv2plug.in/spec/${name}.tar.bz2"; - sha256 = "0nxrkmcpsm4v25wp2l7lcw4n0823kbplilpv51fszf710qsn7k9v"; + sha256 = "1mxkp7gajh1alw6s358cqwf3qkpr1ld9wfxwswnqrxcd9a7hxjd4"; }; buildInputs = [ gtk libsndfile pkgconfig python ]; From fd99863e14ca4425a39772629b75b8ae7534f49a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 19 Jan 2014 15:12:49 -0500 Subject: [PATCH 053/118] elinks: Actually enable javascript Signed-off-by: Shea Levy --- pkgs/applications/networking/browsers/elinks/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 1618042364e8..d624e330f1a4 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { '' --enable-finger --enable-html-highlight --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent + --with-spidermonkey=${spidermonkey} --enable-nntp --with-openssl=${openssl} '' + stdenv.lib.optionalString enableGuile " --with-guile"; From da4dbbfd11bdc53482260dc7ffc70e8e263d619f Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Sun, 19 Jan 2014 22:04:41 +0100 Subject: [PATCH 054/118] calibre: upgrade from 1.17.0 to 1.20.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1e16e22c0fe6..7925e865b4a0 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.17.0"; + name = "calibre-1.20.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1g0kwfr0v4hgwik7hpajdvg1ganyi7hlq6wvq4r5218yvdq5mkzn"; + sha256 = "1i7sybl6in0js8an1zp3mzqv394xnwx79rmv1hj7g6abpsqhjpj7"; }; inherit python; From e3c80f19cf49a1d5389d75dfba78c513b504a4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 19 Jan 2014 22:08:36 +0100 Subject: [PATCH 055/118] Add gnome3.geocode_glib --- .../gnome-3/core/geocode-glib/default.nix | 20 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/geocode-glib/default.nix diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix new file mode 100644 index 000000000000..d3b21bef167a --- /dev/null +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: + + +stdenv.mkDerivation rec { + name = "geocode-glib-3.10.0"; + + + src = fetchurl { + url = "mirror://gnome/sources/geocode-glib/3.10/${name}.tar.xz"; + sha256 = "0dx6v9n4dsskcy6630s77cyb32xlykdall0d555976warycc3v8a"; + }; + + buildInputs = with gnome3; + [ intltool pkgconfig glib libsoup json_glib ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 2b3f95b20c81..913a94b85e38 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -24,6 +24,8 @@ rec { gconf = callPackage ./core/gconf { }; + geocode_glib = callPackage ./core/geocode-glib { }; + gcr = callPackage ./core/gcr { }; # ToDo: tests fail gdm = callPackage ./core/gdm { }; From 8c25a73def0ca7a9a2694f7b9e48d6482ff5c3a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 19 Jan 2014 21:42:57 +0100 Subject: [PATCH 056/118] cgit: update from 0.9.2 to 0.10 --- .../version-management/git-and-tools/cgit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 63dd56d7e33c..7169716ade61 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt, docbook_xml_xslt }: stdenv.mkDerivation rec { - name = "cgit-0.9.2"; + name = "cgit-0.10"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "0q177q1r7ssna32c760l4dx6p4aaz6kdv27zn2jb34bx98045h08"; + sha256 = "0ynywva0lrsasdm3nlk3dmd8k5bnrd9qlvmk4n42dfw9g1xj5i4h"; }; # cgit is is tightly coupled with git and needs a git source tree to build. - # The cgit-0.9.2 Makefile has GIT_VER = 1.8.3, so use that version. + # The cgit-0.10 Makefile has GIT_VER = 1.8.5, so use that version. # IMPORTANT: Remember to check which git version cgit needs on every version # bump. gitSrc = fetchurl { - url = https://git-core.googlecode.com/files/git-1.8.3.tar.gz; - sha256 = "0fn5xdx30dl8dl1cdpqif5hgc3qnxlqfpwyhm0sm1wgqhgbcdlzi"; + url = https://git-core.googlecode.com/files/git-1.8.5.tar.gz; + sha256 = "08vbq8y3jx1da417hkqmrkdkysac1sqjvrjmaj1v56dmkghm43w7"; }; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt ]; From 3a917b5c2d6e37b52ff0cce9952fd983256502cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 19 Jan 2014 22:46:53 +0100 Subject: [PATCH 057/118] cgit: enable lua support Filters can now take advantage of the built-in lua interpreter (much faster than fork and exec). --- .../version-management/git-and-tools/cgit/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 7169716ade61..60c2c43887e6 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt, docbook_xml_xslt }: +{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt +, docbook_xml_xslt, pkgconfig, luajit +}: stdenv.mkDerivation rec { name = "cgit-0.10"; @@ -17,7 +19,9 @@ stdenv.mkDerivation rec { sha256 = "08vbq8y3jx1da417hkqmrkdkysac1sqjvrjmaj1v56dmkghm43w7"; }; - buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt ]; + buildInputs = [ + openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit + ]; # Give cgit a git source tree and pass configuration parameters (as make # variables). From 1e3289efb4621c8bc68c4ed2f88405f83a9c89ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 19 Jan 2014 22:59:51 +0100 Subject: [PATCH 058/118] cgit: fix snapshot feature by using full paths to gzip/bzip2/xz --- .../version-management/git-and-tools/cgit/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 60c2c43887e6..ce4d9f98596f 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xml_xslt, pkgconfig, luajit +, gzip, bzip2, xz }: stdenv.mkDerivation rec { @@ -23,6 +24,13 @@ stdenv.mkDerivation rec { openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit ]; + postPatch = '' + sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ + -e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \ + -e 's|"xz"|"${xz}/bin/xz"|' \ + -i ui-snapshot.c + ''; + # Give cgit a git source tree and pass configuration parameters (as make # variables). preBuild = '' From 745472d66aa66cf42820e03d4d399c026508399c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 19 Jan 2014 23:14:11 +0100 Subject: [PATCH 059/118] Add gnome3.gnome_settings_daemon --- .../core/gnome-settings-daemon/default.nix | 35 ++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + .../libraries/json-glib/default.nix | 15 +++--- .../libraries/libwacom/default.nix | 19 ++++++++ pkgs/tools/misc/colord/default.nix | 48 +++++-------------- pkgs/top-level/all-packages.nix | 2 + 6 files changed, 78 insertions(+), 43 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix create mode 100644 pkgs/development/libraries/libwacom/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix new file mode 100644 index 000000000000..cce0ff46ca0b --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -0,0 +1,35 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst +, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool +, docbook_xsl, docbook_xsl_ns, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gnome-settings-daemon-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/3.10/${name}.tar.xz"; + sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240"; + }; + + configureFlags = "--disable-ibus"; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + buildInputs = with gnome3; + [ intltool pkgconfig gtk glib gsettings_desktop_schemas libnotify gnome_desktop + lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather + polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt + libtool docbook_xsl docbook_xsl_ns makeWrapper ]; + + postInstall = '' + wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 913a94b85e38..d50dcc8a6229 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -41,6 +41,8 @@ rec { gnome_session = callPackage ./core/gnome-session { }; + gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; + gnome_terminal = callPackage ./core/gnome-terminal { }; gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 005b9fac2e55..1380cec86ae5 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection }: +{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection, dbus }: stdenv.mkDerivation rec { name = src.pkgname; src = fetchurl_gnome { project = "json-glib"; - major = "0"; minor = "14"; patchlevel = "2"; extension = "xz"; - sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq"; + major = "0"; + minor = "16"; + patchlevel = "2"; + extension = "xz"; + sha256 = "0b22yw0n87mg7a5lkqw1d7xqnm8qj1bwy0wklv9b2yn29qv7am59"; }; - configureflags= " --with-introspection " ; + configureflags= "--with-introspection" ; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection]; + propagatedBuildInputs = [ glib gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://live.gnome.org/JsonGlib; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix new file mode 100644 index 000000000000..f6244cba5cb1 --- /dev/null +++ b/pkgs/development/libraries/libwacom/default.nix @@ -0,0 +1,19 @@ +{ fetchurl, stdenv, glib, pkgconfig, udev }: + +stdenv.mkDerivation rec { + name = "libwacom-0.7.1"; + + src = fetchurl { + url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; + sha256 = "1agdaa1bv5mp4l32qgsw63swnnv0p279jiy9madgw4y3d8d12dwm"; + }; + + buildInputs = [ glib pkgconfig udev ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = http://sourceforge.net/projects/linuxwacom/; + description = "libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; + }; + +} diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index e6787ec76c8a..525c3ba9f2c4 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,50 +1,24 @@ -{ stdenv, fetchurl, fetchgit +{ stdenv, fetchurl, fetchgit, bashCompletion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus +, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }: -, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection -, version ? "git" -}: +stdenv.mkDerivation rec { + name = "colord-1.1.5"; -# colord wants to write to the etc/colord.conf and var/run/colord/mapping.db -# thus they get symlinked to /etc and /var - -stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version { - "0.1.33" = { - name = "colord-0.1.33"; - src = fetchurl { - url = http://www.freedesktop.org/software/colord/releases/colord-0.1.32.tar.xz; - sha256 = "1smbkh4z1c2jjwxg626f12sslv7ff3yzak1zqrc493cl467ll0y7"; - }; + src = fetchurl { + url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + sha256 = "1638pfv16bdrdxxprk6dp8d706571a8i3nlfv3m0ldx26xpy8z5j"; }; - "git" = { - name = "colord-git-11dca"; - src = fetchgit { - url = "https://github.com/hughsie/colord.git"; - rev = "11dcaba034edff3955ceff53795df82c57c34adc"; - sha256 = "1280q7zbfm5wqql872kcxmk5rmwjs7cv7cgz8nx0i9g4ac8j2mrf"; - }; - - preConfigure = '' - ./autogen.sh - ''; - buildInputs = [ automake autoconf libtool gtk_doc which gobjectIntrospection ]; - }; -} { enableParallelBuilding = true; - preConfigure = '' - configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d" - ''; + configureFlags = "--with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d --disable-bash-completion"; - buildInputs = [glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus]; + buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + bashCompletion ]; postInstall = '' - sed -i '/usb_id\|usb-db/d' $out/lib/udev/rules.d/69-cd-sensors.rules - mv $out/etc/colord.conf{,.default} - ln -s /etc/colord.conf $out/etc/colord.conf rm -fr $out/var/lib/colord - ln -s /var/lib/colord $out/var/lib/colord ''; meta = { @@ -54,4 +28,4 @@ stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version { maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f13dde8cd86..eb1f6eadf5d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5220,6 +5220,8 @@ let ccrtp = ccrtp_1_8; }; + libwacom = callPackage ../development/libraries/libwacom { }; + lightning = callPackage ../development/libraries/lightning { }; lirc = callPackage ../development/libraries/lirc { }; From b529a34b4a743d57fbe456afc84109eab31f8c09 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 19 Jan 2014 20:50:37 -0500 Subject: [PATCH 060/118] Add Fedora 20 Signed-off-by: Shea Levy --- pkgs/build-support/vm/default.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index df5f728174cc..625f93c874f2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -976,6 +976,32 @@ rec { unifiedSystemDir = true; }; + fedora20i386 = { + name = "fedora-20-i386"; + fullName = "Fedora 20 (i386)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/20/Everything/i386/os/repodata/ae9c6ae73a12a64227e6b8e7b2d7e1c2a9515bd9c82f2af006c838e7a445dcb9-primary.xml.gz; + sha256 = "1ffw8njfff680vq2lby8v5dm3af2w7bv5rxqwqkl59hj7bknm75f"; + }; + urlPrefix = mirror://fedora/linux/releases/20/Everything/i386/os; + archs = ["noarch" "i386" "i586" "i686"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + fedora20x86_64 = { + name = "fedora-20-x86_64"; + fullName = "Fedora 20 (x86_64)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/20/Everything/x86_64/os/repodata/d7777ea6ec66e1c86c3fe1900adf5bf8d877fb77dd06e439bd76bbbec4e82094-primary.xml.gz; + sha256 = "1510x32bxfvnplwy81nxfzxpgn7qbgghm4717xnciqb6xjk7wxyp"; + }; + urlPrefix = mirror://fedora/linux/releases/20/Everything/x86_64/os; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + opensuse103i386 = { name = "opensuse-10.3-i586"; fullName = "openSUSE 10.3 (i586)"; From 3ae5e801a51c7f5a1b5370901b23d736af1d4b1c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 19 Jan 2014 22:35:24 -0500 Subject: [PATCH 061/118] Linux 3.13 Signed-off-by: Shea Levy --- .../os-specific/linux/kernel/common-config.nix | 4 +++- pkgs/os-specific/linux/kernel/linux-3.13.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 15 ++++++++++++++- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-3.13.nix diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 01a605aac309..8b96a321634d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -63,7 +63,9 @@ with stdenv.lib; # Networking options. IP_PNP n + ${optionalString (versionOlder version "3.13") '' IPV6_PRIVACY y + ''} NETFILTER_ADVANCED y IP_VS_PROTO_TCP y IP_VS_PROTO_UDP y @@ -176,7 +178,7 @@ with stdenv.lib; AIC79XX_DEBUG_ENABLE n AIC7XXX_DEBUG_ENABLE n AIC94XX_DEBUG n - ${optionalString (versionAtLeast version "3.3") '' + ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") '' AUDIT_LOGINUID_IMMUTABLE y ''} B43_PCMCIA y diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix new file mode 100644 index 000000000000..967de85b7b3f --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.13"; + + modDirVersion = "3.13.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb1f6eadf5d2..6c40c042f81b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6839,6 +6839,18 @@ let ]; }; + linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) { + inherit fetchurl stdenv perl linuxManualConfig; + kernelPatches = + [ + kernelPatches.sec_perm_2_6_24 + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -6928,8 +6940,9 @@ let linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_12_grsecurity = linuxPackagesFor pkgs.linux_3_12_grsecurity linuxPackages_3_12_grsecurity; + linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); # Update this when adding a new version! - linuxPackages_latest = pkgs.linuxPackages_3_12; + linuxPackages_latest = pkgs.linuxPackages_3_13; # The current default kernel / kernel modules. linux = linuxPackages.kernel; From 01a2986560fd6a43983d3c643a3d5bcc98a7b995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Jan 2014 09:16:19 +0100 Subject: [PATCH 062/118] Updating elinks to 0.12pre6 --- pkgs/applications/networking/browsers/elinks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index d624e330f1a4..f14a3df0b53c 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -5,11 +5,11 @@ assert enableGuile -> guile != null; stdenv.mkDerivation rec { - name = "elinks-0.12pre5"; + name = "elinks-0.12pre6"; src = fetchurl { - url = http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2; - sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d"; + url = http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2; + sha256 = "1nnakbi01g7yd3zqwprchh5yp45br8086b0kbbpmnclabcvlcdiq"; }; patches = [ ./gc-init.patch ]; From 86808f2c468703f96179ef788c8a750b47619696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Jan 2014 09:27:27 +0100 Subject: [PATCH 063/118] Making elinks not use python by default. It fails to start for me, due to a python problem, otherwise. And I don't know why I'd need python, so by now I disable it by default. --- .../networking/browsers/elinks/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index f14a3df0b53c..142e5a65df6c 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl +{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl , spidermonkey, gpm -, enableGuile ? true, guile ? null }: +, enableGuile ? true, guile ? null +, enablePython ? false, python ? null +}: assert enableGuile -> guile != null; +assert enablePython -> python != null; stdenv.mkDerivation rec { name = "elinks-0.12pre6"; @@ -14,16 +17,18 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] - ++ stdenv.lib.optional enableGuile guile; + buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] + ++ stdenv.lib.optional enableGuile guile + ++ stdenv.lib.optional enablePython python; configureFlags = '' --enable-finger --enable-html-highlight - --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent + --with-perl --enable-gopher --enable-cgi --enable-bittorrent --with-spidermonkey=${spidermonkey} --enable-nntp --with-openssl=${openssl} - '' + stdenv.lib.optionalString enableGuile " --with-guile"; + '' + stdenv.lib.optionalString enableGuile " --with-guile" + + stdenv.lib.optionalString enablePython " --with-python"; crossAttrs = { propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; From 55e6303d6a0b943e72e6348867780f0886487871 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 20 Jan 2014 05:23:17 -0500 Subject: [PATCH 064/118] Add full llvm build, update libc++ and dragonegg Some packages in the llvm suite (e.g. compiler-rt) cannot be built separate from the build of llvm, and while some others (e.g. clang) can the combined build is much better tested (we've had to work around annoying issues before). So this puts llvm, clang, clang-tools-extra, compiler-rt, lld, lldb, and polly all into one big build (llvmFull). This build includes a static llvm, as dynamic is similarly less tested and has known failures. This also updates libc++ and dragonegg. libc++ now builds against libc++abi as a separate package rather than building it during the libc++ build. The clang purity patch is gone. Instead, we simply set --sysroot to /var/empty for pure builds, as all impure paths are either looked up in the gcc prefix (which we hard-code at compile time) or in the sysroot. This also means that if NIX_ENFORCE_PURITY is 0 then clang will look in the normal Linux paths by default, which is the proper behavior IMO. polly required an updated isl. When stdenv-updates is merged, perhaps we can update the isl used by gcc and avoid having two versions. Since llvm on its own is now separate from the llvm used by clang, I've removed myself as maintainer from llvm and will leave maintenance of that to those who are interested in llvm separate from clang. Signed-off-by: Shea Levy --- .../emacs-clang-complete-async/default.nix | 4 +- pkgs/build-support/clang-wrapper/builder.sh | 3 + .../clang-wrapper/clang-wrapper.sh | 10 +- pkgs/build-support/clang-wrapper/default.nix | 3 + .../build-support/clang-wrapper/ld-wrapper.sh | 3 + .../compilers/llvm/clang-purity.patch | 162 ------------------ .../compilers/llvm/clang-tablegen-dir.patch | 9 - pkgs/development/compilers/llvm/clang.nix | 41 ----- pkgs/development/compilers/llvm/default.nix | 2 +- pkgs/development/compilers/llvm/dragonegg.nix | 8 +- pkgs/development/compilers/llvm/full.nix | 89 ++++++++++ pkgs/development/libraries/isl/0.12.2.nix | 20 +++ pkgs/development/libraries/libc++/default.nix | 45 ++--- .../libraries/libc++abi/default.nix | 39 +++++ pkgs/top-level/all-packages.nix | 28 ++- pkgs/top-level/release-python.nix | 1 - 16 files changed, 191 insertions(+), 276 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/clang-purity.patch delete mode 100644 pkgs/development/compilers/llvm/clang-tablegen-dir.patch delete mode 100644 pkgs/development/compilers/llvm/clang.nix create mode 100644 pkgs/development/compilers/llvm/full.nix create mode 100644 pkgs/development/libraries/isl/0.12.2.nix create mode 100644 pkgs/development/libraries/libc++abi/default.nix diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index 9db6e4cb7364..6d10244a8795 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchgit, llvm, clangUnwrapped }: +{ clangStdenv, fetchgit, llvmFull }: clangStdenv.mkDerivation { name = "emacs-clang-complete-async-20130218"; @@ -8,7 +8,7 @@ clangStdenv.mkDerivation { sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf"; }; - buildInputs = [ llvm clangUnwrapped ]; + buildInputs = [ llvmFull ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh index 3f90b9d32bd0..0cdb2b96135e 100644 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -59,13 +59,16 @@ doSubstitute() { local src=$1 local dst=$2 local uselibcxx= + local uselibcxxabi= if test -n "$libcxx" && echo $dst | fgrep ++; then uselibcxx=$libcxx; fi + if test -n "$libcxxabi" && echo $dst | fgrep ++; then uselibcxxabi=$libcxxabi; fi # Can't use substitute() here, because replace may not have been # built yet (in the bootstrap). sed \ -e "s^@out@^$out^g" \ -e "s^@shell@^$shell^g" \ -e "s^@libcxx@^$uselibcxx^g" \ + -e "s^@libcxxabi@^$uselibcxxabi^g" \ -e "s^@clang@^$clang^g" \ -e "s^@clangProg@^$clangProg^g" \ -e "s^@binutils@^$binutils^g" \ diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh index 84067844cad8..b39aa2d721e8 100644 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -76,11 +76,12 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then n=$((n + 1)) done params=("${rest[@]}") + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty" fi if test -n "@libcxx@"; then NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem@libcxx@/include/c++/v1 -stdlib=libc++" - NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -lc++abi" + NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -L@libcxxabi@/lib -lc++abi" fi # Add the flags for the C compiler proper. @@ -137,13 +138,6 @@ if test -n "$NIX_CLANG_WRAPPER_EXEC_HOOK"; then source "$NIX_CLANG_WRAPPER_EXEC_HOOK" fi -# We nuke LD_LIBRARY_PATH here, because clang dynamically links to LLVM. -# Unfortunately, when such clang is used to build LLVM again, it can get in -# trouble temporarily binding to the build-directory versions of the libraries -# (the buildsystem sets LD_LIBRARY_PATH). That is very undesirable and can -# cause mysterious failures. -LD_LIBRARY_PATH= - # Call the real `clang'. Filter out warnings from stderr about unused # `-B' flags, since they confuse some programs. Deep bash magic to # apply grep to stderr (by swapping stdin/stderr twice). diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix index 1b2a02fa86a4..05b8194697e1 100644 --- a/pkgs/build-support/clang-wrapper/default.nix +++ b/pkgs/build-support/clang-wrapper/default.nix @@ -34,6 +34,9 @@ stdenv.mkDerivation { addFlags = ./add-flags; inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx; + + libcxxabi = libcxx.abi or null; + gcc = clang.gcc; libc = if nativeLibc then null else libc; binutils = if nativeTools then null else binutils; diff --git a/pkgs/build-support/clang-wrapper/ld-wrapper.sh b/pkgs/build-support/clang-wrapper/ld-wrapper.sh index 48378778ba9e..ae45c62d460a 100644 --- a/pkgs/build-support/clang-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/ld-wrapper.sh @@ -32,6 +32,9 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ # We cannot skip this; barf. echo "impure path \`$p' used in link" >&2 exit 1 + elif test "${p:0:9}" = "--sysroot"; then + # Our ld is not built with sysroot support (Can we fix that?) + : else rest=("${rest[@]}" "$p") fi diff --git a/pkgs/development/compilers/llvm/clang-purity.patch b/pkgs/development/compilers/llvm/clang-purity.patch deleted file mode 100644 index e82305189e8f..000000000000 --- a/pkgs/development/compilers/llvm/clang-purity.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff -Naur cfe-3.3.src-orig/lib/Driver/ToolChains.cpp cfe-3.3.src/lib/Driver/ToolChains.cpp ---- cfe-3.3.src-orig/lib/Driver/ToolChains.cpp 2013-05-06 12:26:41.000000000 -0400 -+++ cfe-3.3.src/lib/Driver/ToolChains.cpp 2013-06-21 19:28:12.120364372 -0400 -@@ -2318,17 +2318,6 @@ - Paths); - } - } -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -- -- // Try walking via the GCC triple path in case of multiarch GCC -- // installations with strange symlinks. -- if (GCCInstallation.isValid()) -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -- "/../../" + Multilib, Paths); -- - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { - const std::string &LibPath = GCCInstallation.getParentLibPath(); -@@ -2341,8 +2330,6 @@ - addPathIfExists(LibPath, Paths); - } - } -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); - - IsPIEDefault = SanitizerArgs(*this, Args).hasZeroBaseShadow(); - } -@@ -2395,9 +2382,6 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -- addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include"); -- - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); - P.appendComponent("include"); -@@ -2479,26 +2463,6 @@ - "/usr/include/powerpc64-linux-gnu" - }; - ArrayRef MultiarchIncludeDirs; -- if (getTriple().getArch() == llvm::Triple::x86_64) { -- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::x86) { -- MultiarchIncludeDirs = X86MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::aarch64) { -- MultiarchIncludeDirs = AArch64MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::arm) { -- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs; -- else -- MultiarchIncludeDirs = ARMMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mips) { -- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mipsel) { -- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc) { -- MultiarchIncludeDirs = PPCMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc64) { -- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs; -- } - for (ArrayRef::iterator I = MultiarchIncludeDirs.begin(), - E = MultiarchIncludeDirs.end(); - I != E; ++I) { -@@ -2510,13 +2474,6 @@ - - if (getTriple().getOS() == llvm::Triple::RTEMS) - return; -- -- // Add an include of '/include' directly. This isn't provided by default by -- // system GCCs, but is often used with cross-compiling GCCs, and harmless to -- // add even when Clang is acting as-if it were a system compiler. -- addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include"); -- -- addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include"); - } - - /// \brief Helper to add the three variant paths for a libstdc++ installation. -diff -Naur cfe-3.3.src-orig/lib/Driver/Tools.cpp cfe-3.3.src/lib/Driver/Tools.cpp ---- cfe-3.3.src-orig/lib/Driver/Tools.cpp 2013-05-30 14:01:30.000000000 -0400 -+++ cfe-3.3.src/lib/Driver/Tools.cpp 2013-06-21 19:30:51.604726574 -0400 -@@ -5976,43 +5976,6 @@ - } - } - -- if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb || -- (!Args.hasArg(options::OPT_static) && -- !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- if (isAndroid) -- CmdArgs.push_back("/system/bin/linker"); -- else if (ToolChain.getArch() == llvm::Triple::x86) -- CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::aarch64) -- CmdArgs.push_back("/lib/ld-linux-aarch64.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb) { -- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- CmdArgs.push_back("/lib/ld-linux-armhf.so.3"); -- else -- CmdArgs.push_back("/lib/ld-linux.so.3"); -- } -- else if (ToolChain.getArch() == llvm::Triple::mips || -- ToolChain.getArch() == llvm::Triple::mipsel) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::mips64 || -- ToolChain.getArch() == llvm::Triple::mips64el) { -- if (hasMipsN32ABIArg(Args)) -- CmdArgs.push_back("/lib32/ld.so.1"); -- else -- CmdArgs.push_back("/lib64/ld.so.1"); -- } -- else if (ToolChain.getArch() == llvm::Triple::ppc) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc64 || -- ToolChain.getArch() == llvm::Triple::systemz) -- CmdArgs.push_back("/lib64/ld64.so.1"); -- else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -- } -- - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - -diff -Naur cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp ---- cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp 2013-04-29 21:21:43.000000000 -0400 -+++ cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp 2013-06-21 19:32:47.627016565 -0400 -@@ -225,20 +225,6 @@ - const HeaderSearchOptions &HSOpts) { - llvm::Triple::OSType os = triple.getOS(); - -- if (HSOpts.UseStandardSystemIncludes) { -- switch (os) { -- case llvm::Triple::FreeBSD: -- case llvm::Triple::NetBSD: -- case llvm::Triple::OpenBSD: -- case llvm::Triple::Bitrig: -- break; -- default: -- // FIXME: temporary hack: hard-coded paths. -- AddPath("/usr/local/include", System, false); -- break; -- } -- } -- - // Builtin includes use #include_next directives and should be positioned - // just prior C include dirs. - if (HSOpts.UseBuiltinIncludes) { -@@ -332,9 +318,6 @@ - default: - break; - } -- -- if ( os != llvm::Triple::RTEMS ) -- AddPath("/usr/include", ExternCSystem, false); - } - - void InitHeaderSearch:: diff --git a/pkgs/development/compilers/llvm/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch deleted file mode 100644 index de6a468b239f..000000000000 --- a/pkgs/development/compilers/llvm/clang-tablegen-dir.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/utils/TableGen/CMakeLists.txt (revision 190146) -+++ b/utils/TableGen/CMakeLists.txt (working copy) -@@ -1,4 +1,5 @@ - set(LLVM_LINK_COMPONENTS Support) -+set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) - - add_tablegen(clang-tblgen CLANG - ClangASTNodesEmitter.cpp - diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix deleted file mode 100644 index 8c178c9ce037..000000000000 --- a/pkgs/development/compilers/llvm/clang.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2, python }: - -let - version = "3.3"; - gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; -in - -stdenv.mkDerivation { - name = "clang-${version}"; - - buildInputs = [ perl llvm groff cmake libxml2 python ]; - - patches = [ ./clang-tablegen-dir.patch ] ++ - stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; - - cmakeFlags = [ - "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${gccReal}" - ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ - "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" - ]; - - enableParallelBuilding = true; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/cfe-${version}.src.tar.gz"; - sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; - }; - - passthru = { gcc = stdenv.gcc.gcc; }; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 7ef7adfa324e..1a8fa3097499 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = licenses.bsd3; - maintainers = with maintainers; [ lovek323 raskin shlevy viric ]; + maintainers = with maintainers; [ lovek323 raskin viric ]; platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/dragonegg.nix b/pkgs/development/compilers/llvm/dragonegg.nix index 737b9533a089..38d3546d9819 100644 --- a/pkgs/development/compilers/llvm/dragonegg.nix +++ b/pkgs/development/compilers/llvm/dragonegg.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, llvm, gmp, mpfr, mpc}: +{stdenv, fetchurl, llvm, gmp, mpfr, mpc, ncurses, zlib}: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; name = "dragonegg-${version}"; src = fetchurl { url = "http://llvm.org/releases/${version}/${name}.src.tar.gz"; - sha256 = "1kfryjaz5hxh3q6m50qjrwnyjb3smg2zyh025lhz9km3x4kshlri"; + sha256 = "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrl"; }; # The gcc the plugin will be built for (the same used building dragonegg) GCC = "gcc"; - buildInputs = [ llvm gmp mpfr mpc ]; + buildInputs = [ llvm gmp mpfr mpc ncurses zlib ]; installPhase = '' mkdir -p $out/lib $out/share/doc/${name} diff --git a/pkgs/development/compilers/llvm/full.nix b/pkgs/development/compilers/llvm/full.nix new file mode 100644 index 000000000000..c3ca879c5527 --- /dev/null +++ b/pkgs/development/compilers/llvm/full.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchurl +, perl, groff +, cmake +, libxml2 +, python +, libffi +, zlib +, ncurses +, isl +, gmp +, doxygen +, binutils_gold +, swig +, which +, libedit +, valgrind +}: + +let + version = "3.4"; + + fetch = name: sha256: fetchurl { + url = "http://llvm.org/releases/${version}/${name}-${version}.src.tar.gz"; + inherit sha256; + }; + + inherit (stdenv.lib) concatStrings mapAttrsToList; +in stdenv.mkDerivation { + name = "llvm-full-${version}"; + + unpackPhase = '' + unpackFile ${fetch "llvm" "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995"} + mv llvm-${version} llvm + sourceRoot=$PWD/llvm + ${concatStrings (mapAttrsToList (name: { location, sha256 }: '' + unpackFile ${fetch name sha256} + mv ${name}-${version} $sourceRoot/${location} + '') { + clang = { location = "tools/clang"; sha256 = "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92"; }; + clang-tools-extra = { location = "tools/clang/tools/extra"; sha256 = "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds"; }; + compiler-rt = { location = "projects/compiler-rt"; sha256 = "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k"; }; + lld = { location = "tools/lld"; sha256 = "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxz"; }; + lldb = { location = "tools/lldb"; sha256 = "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x4g"; }; + polly = { location = "tools/polly"; sha256 = "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6lz"; }; + })} + sed -i 's|/usr/bin/env||' \ + $sourceRoot/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh \ + $sourceRoot/tools/lldb/scripts/Python/build-swig-Python.sh + ''; + + buildInputs = [ perl + groff + cmake + libxml2 + python + libffi + zlib + ncurses + isl + gmp + doxygen + swig + which + libedit + valgrind + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_ENABLE_FFI=ON" + "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}" + "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" + "-DLLVM_BINUTILS_INCDIR=${binutils_gold}/include" + "-DCMAKE_CXX_FLAGS=-std=c++11" + ]; + + passthru.gcc = stdenv.gcc.gcc; + + enableParallelBuilding = true; + + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix new file mode 100644 index 000000000000..995cd0510b4c --- /dev/null +++ b/pkgs/development/libraries/isl/0.12.2.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, gmp }: + +stdenv.mkDerivation rec { + name = "isl-0.12.2"; # CLooG 0.16.3 fails to build with ISL 0.08. + + src = fetchurl { + url = "http://isl.gforge.inria.fr/${name}.tar.bz2"; + sha256 = "1d0zs64yw6fzs6b7kxq6nh9kvas16h8b43agwh30118jjzpdpczl"; + }; + + buildInputs = [ gmp ]; + + meta = { + homepage = http://www.kotnet.org/~skimo/isl/; + license = "LGPLv2.1"; + description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index 1d4ef158113a..964d3727f8f2 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -1,46 +1,26 @@ -{ stdenv, fetchsvn, cmake, libunwind }: +{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi }: -let rev = "190100"; in +let + version = "3.4"; -stdenv.mkDerivation rec { - name = "libc++-pre${rev}"; +in stdenv.mkDerivation rec { + name = "libc++-${version}"; - src = fetchsvn { - url = "http://llvm.org/svn/llvm-project/libcxx/trunk"; - inherit rev; - sha256 = "0hnfvzzrkj797kp9sk2yncvbmiyx0d72k8bys3z7l6i47d37xv03"; + src = fetchurl { + url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.gz"; + sha256 = "1sqd5qhqj7qnn9zjxx9bv7ky4f7xgmh9sbgd53y1kszhg41217xx"; }; - cxxabi = fetchsvn { - url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk"; - inherit rev; - sha256 = "1kdyvngwd229cgmcqpawaf0qizas8bqc0g8s08fmbgwsrh1qrryp"; - }; - - buildInputs = [ cmake ]; - - preConfigure = '' - sed -i 's/;cxa_demangle.h//' CMakeLists.txt - cp -R ${cxxabi} cxxabi - chmod u+w -R cxxabi # umm - (export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include"; - export NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind"; - cd cxxabi/lib - sed -e s,-lstdc++,, -i buildit # do not link to libstdc++! - ./buildit - mkdir -p $out/lib && cp libc++abi.so.1.0 $out/lib - cd $out/lib - ln -s libc++abi.so.1.0 libc++abi.so - ln -s libc++abi.so.1.0 libc++abi.so.1) - ''; + buildInputs = [ cmake libcxxabi ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${cxxabi}/include" + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" "-DLIBCXX_CXX_ABI=libcxxabi" ]; - buildPhase = ''NIX_CFLAGS_LINK="-L$out/lib -lc++abi" make''; enableParallelBuilding = true; + passthru.abi = libcxxabi; + meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; @@ -49,4 +29,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix new file mode 100644 index 000000000000..51d18a7b907f --- /dev/null +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchsvn, libcxx, libunwind }: +let + rev = "199626"; +in stdenv.mkDerivation { + name = "libcxxabi-pre-${rev}"; + + src = fetchsvn { + url = http://llvm.org/svn/llvm-project/libcxxabi/trunk; + rev = "199626"; + sha256 = "0h1x1s40x5r65ar53rv34lmgcfil3zxaknqr64dka1mz29xhhrxy"; + }; + + NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind"; + + postUnpack = '' + unpackFile ${libcxx.src} + export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include -I$(readlink -f libcxx-*)/include" + ''; + + installPhase = '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.so.1.0 $out/lib + install -m 644 include/cxxabi.h $out/include + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + patchPhase = "sed -e s,-lstdc++,, -i lib/buildit"; + + buildPhase = "(cd lib; ./buildit)"; + + meta = { + homepage = http://libcxxabi.llvm.org/; + description = "A new implementation of low level support for a standard C++ library"; + license = "BSD"; + maintainers = stdenv.lib.maintainers.shlevy; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c40c042f81b..39ce332ea879 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1193,6 +1193,7 @@ let ised = callPackage ../tools/misc/ised {}; isl = callPackage ../development/libraries/isl { }; + isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; isync = callPackage ../tools/networking/isync { }; @@ -2298,18 +2299,10 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenvAdapters.overrideGCC stdenv gcc47; - }; + clang = wrapClang llvmFull; - clang = wrapClang clangUnwrapped; - - libcxxLLVM = callPackage ../development/compilers/llvm { stdenv = libcxxStdenv; version="3.3"; }; - clangSelf = clangWrapSelf (callPackage ../development/compilers/llvm/clang.nix { + llvmFullSelf = clangWrapSelf (llvmFull.override { stdenv = libcxxStdenv; - llvm = libcxxLLVM; }); clangWrapSelf = build: (import ../build-support/clang-wrapper) { @@ -2325,7 +2318,7 @@ let #Use this instead of stdenv to build with clang clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); - libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf clangUnwrapped); + libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf llvmFull); clean = callPackage ../development/compilers/clean { }; @@ -2918,6 +2911,10 @@ let else stdenv; }; llvm_33 = llvm_34.override { version = "3.3"; }; + llvmFull = callPackage ../development/compilers/llvm/full.nix { + stdenv = stdenvAdapters.overrideGCC stdenv gcc47; + isl = isl_0_12; + }; mentorToolchains = recurseIntoAttrs ( callPackage_i686 ../development/compilers/mentor {} @@ -3170,9 +3167,9 @@ let }; wrapClangWith = clangWrapper: glibc: baseClang: clangWrapper { - nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools; - nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc; - nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else ""; + nativeTools = stdenv.gcc.nativeTools or false; + nativeLibc = stdenv.gcc.nativeLibc or false; + nativePrefix = stdenv.gcc.nativePrefix or ""; clang = baseClang; libc = glibc; shell = bash; @@ -3620,6 +3617,7 @@ let csslint = callPackage ../development/web/csslint { }; libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; }; + libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; }; dejagnu = callPackage ../development/tools/misc/dejagnu { }; @@ -4131,7 +4129,7 @@ let dssi = callPackage ../development/libraries/dssi {}; - dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix { }; + dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix { llvm = llvmFull; stdenv = overrideGCC stdenv gcc47; }; dxflib = callPackage ../development/libraries/dxflib {}; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index aecb3c85aee8..e371d894ae1c 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -153,7 +153,6 @@ let cinepaint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ciopfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clangUnwrapped = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clanlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; classpath = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clearsilver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 35e76926a5ff425ff5a30f3fe03ca68b9562b31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 20 Jan 2014 12:33:55 +0100 Subject: [PATCH 065/118] Add gnome3.caribou --- .../desktops/gnome-3/core/caribou/default.nix | 27 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/caribou/default.nix diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix new file mode 100644 index 000000000000..41a997c1f714 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 +, libxklavier, libXtst, gtk2, intltool, libxslt }: + + +stdenv.mkDerivation rec { + name = "caribou-0.4.12"; + + src = fetchurl { + url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz"; + sha256 = "0235sws58rg0kadxbp2nq5ha76zmhd4mr10n9qlbryf8p78qsvii"; + }; + + buildInputs = with gnome3; + [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3 + libxml2 libXtst gtk2 intltool libxslt ]; + + propagatedBuildInputs = [ gnome3.libgee libxklavier ]; + + preBuild = '' + patchShebangs . + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d50dcc8a6229..87047213a79f 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -18,6 +18,8 @@ rec { at_spi2_core = callPackage ./core/at-spi2-core { }; + caribou = callPackage ./core/caribou { }; + dconf = callPackage ./core/dconf { }; evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests From 914b6c249bbe6de19aea610671bc4497e5bb26ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 20 Jan 2014 12:34:21 +0100 Subject: [PATCH 066/118] Add gnome3.mutter --- pkgs/desktops/gnome-3/core/mutter/default.nix | 24 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/mutter/default.nix diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix new file mode 100644 index 000000000000..5cb865bcefdf --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -0,0 +1,24 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +, pango, cogl, clutter }: + + +stdenv.mkDerivation rec { + name = "mutter-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/3.10/${name}.tar.xz"; + sha256 = "000iclb96mgc4rp2q0cy72nfwyfzl6avijl9nmk87f5sgyy670a3"; + }; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + buildInputs = with gnome3; + [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower + gnome_desktop cairo pango cogl clutter zenity ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 87047213a79f..016a9bf49ff4 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -69,6 +69,8 @@ rec { libzapojit = callPackage ./core/libzapojit { }; + mutter = callPackage ./core/mutter { }; + nautilus = callPackage ./core/nautilus { }; rest = callPackage ./core/rest { }; From 34270e37a72274bb5d61a4e6301988e19021d8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 20 Jan 2014 12:34:44 +0100 Subject: [PATCH 067/118] Add gnome3.gjs --- pkgs/desktops/gnome-3/core/gjs/default.nix | 21 ++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + .../interpreters/spidermonkey/17.0.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 64 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/gjs/default.nix create mode 100644 pkgs/development/interpreters/spidermonkey/17.0.nix diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix new file mode 100644 index 000000000000..e4a0752eb4ae --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -0,0 +1,21 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17 }: + + +stdenv.mkDerivation rec { + name = "gjs-1.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gjs/1.38/${name}.tar.xz"; + sha256 = "0xl1zc5ncaxqs5ww5j82rzqrg429l8pdapqclxiba7dxwyh6a83b"; + }; + + buildInputs = with gnome3; + [ gobjectIntrospection pkgconfig glib ]; + + propagatedBuildInputs = [ spidermonkey_17 ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 016a9bf49ff4..47656da09925 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -32,6 +32,8 @@ rec { gdm = callPackage ./core/gdm { }; + gjs = callPackage ./core/gjs { }; + gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; gnome-menus = callPackage ./core/gnome-menus { }; diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix new file mode 100644 index 000000000000..3f484426a106 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }: + +stdenv.mkDerivation rec { + version = "17.0.0"; + name = "spidermonkey-${version}"; + + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/js/mozjs${version}.tar.gz"; + sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"; + }; + + propagatedBuildInputs = [ nspr ]; + + buildInputs = [ pkgconfig perl python zip ]; + + postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" + export LIBXUL_DIST=$out + ''; + + configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ]; + + # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 + preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; + + enableParallelBuilding = true; + + doCheck = true; + preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522 + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + maintainers = [ maintainers.goibhniu ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39ce332ea879..94e323d356ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3403,6 +3403,7 @@ let spidermonkey = callPackage ../development/interpreters/spidermonkey { }; spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; + spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { }; supercollider = callPackage ../development/interpreters/supercollider { qt = qt4; From a76e69894c9ba1ac6307b74f5167cf5761eef875 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 11 Jan 2014 22:27:49 +0000 Subject: [PATCH 068/118] Update siege --- pkgs/tools/networking/siege/default.nix | 61 +++++-------------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index ebbfcb5d3608..23aa30554362 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,51 +1,12 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="siege"; - version="2.70"; - name="${baseName}-${version}"; - url="ftp://ftp.joedog.org/pub/siege/${name}.tar.gz"; - hash="14fxfmfsqwyahc91w4vn3n8hvclf78n4k1xllqsrpvjb5asvrd1w"; +{ stdenv, fetchurl }: +let + version = "3.0.2"; + baseName = "siege"; +in stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + src = fetchurl { + url = "http://www.joedog.org/pub/siege/${name}.tar.gz"; + sha256 = "0b86rvcrjxy6h9w32bhpcm1gwmn223mf9f30dfsnaw51w90kn716"; }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "createDirs" "doMakeInstall"]; - - createDirs = a.fullDepEntry '' - mkdir -p "$out/"{bin,lib,share/man,etc} - '' ["defEnsureDir"]; - - meta = { - description = "HTTP load tester"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.joedog.org/index/siege-home"; - }; - }; -}) x - + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; +} From a2d0ec2f4b97b070fb975f35b0f4ddbde566877b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 20 Jan 2014 11:58:22 +0000 Subject: [PATCH 069/118] Update siege to 3.0.5 and add meta information --- pkgs/tools/networking/siege/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 23aa30554362..e29433adae3c 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,12 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib }: let - version = "3.0.2"; + version = "3.0.5"; baseName = "siege"; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; src = fetchurl { url = "http://www.joedog.org/pub/siege/${name}.tar.gz"; - sha256 = "0b86rvcrjxy6h9w32bhpcm1gwmn223mf9f30dfsnaw51w90kn716"; + sha256 = "16faa6kappg23bdriyiy3ym94rmddpvw8cl8xgv5nxq2v17n4gi8"; + }; + meta = { + description = "HTTP load tester"; + maintainers = with lib.maintainers; [ ocharles raskin ]; + platforms = with lib.platforms; linux; + license = with lib.licenses; gpl2Plus; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; } From c6be3dbf1d0fbe9e6a026ad05992ea46972ebf01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 13:29:28 +0100 Subject: [PATCH 070/118] scons: add pythonPath attribute to ensure that the python-wrapper recognizes this package as providing a python library --- pkgs/development/tools/build-managers/scons/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 8139d6e28c78..11d81c3beb7c 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { buildPhase = "python setup.py install --prefix=$out --install-data=$out/share --install-lib=$(toPythonPath $out) --symlink-scons -O1"; installPhase = "for n in $out/bin/*-${version}; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done"; + pythonPath = []; + meta = { homepage = "http://scons.org/"; description = "An improved, cross-platform substitute for Make"; From 4a4950f3233973bfc25c346e2356418cc9e99bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Jan 2014 09:44:59 +0100 Subject: [PATCH 071/118] Setting license to elinks. Disabling guile, due to licence incompatibility. --- pkgs/applications/networking/browsers/elinks/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 142e5a65df6c..61db2656a409 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl , spidermonkey, gpm -, enableGuile ? true, guile ? null +, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2 , enablePython ? false, python ? null }: @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { meta = { description = "Full-featured text-mode web browser"; homepage = http://elinks.or.cz; + license = "GPLv2"; }; } From 3faf620e8a6b5bce115519714168eff5afe8e332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Jan 2014 13:46:44 +0100 Subject: [PATCH 072/118] Updating libvpx to 1.3.0, and making ffmpeg include vpx I don't think there is any reason not to have vpx there. It's part of webm. --- pkgs/development/libraries/ffmpeg/2.x.nix | 2 +- pkgs/development/libraries/libvpx/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 4e975ea3d822..dd29e1e9e6bc 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { speexSupport = config.ffmpeg.speex or true; theoraSupport = config.ffmpeg.theora or true; vorbisSupport = config.ffmpeg.vorbis or true; - vpxSupport = config.ffmpeg.vpx or false; + vpxSupport = config.ffmpeg.vpx or true; x264Support = config.ffmpeg.x264 or true; xvidSupport = config.ffmpeg.xvid or true; opusSupport = config.ffmpeg.opus or true; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 46e73a121fe3..677289c5158c 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, bash, yasm, which, perl}: -let version = "1.2.0"; +let version = "1.3.0"; in stdenv.mkDerivation rec { name = "libvpx-" + version; src = fetchurl { # sadly, there's no official tarball for this release - url = "ftp://ftp.archlinux.org/other/libvpx/libvpx-${version}.tar.xz"; - sha256 = "02k9ylswgr2hvjqmg422fa9ggym0g94gzwb14nnckly698rvjc50"; + url = "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2"; + sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc"; }; patchPhase = '' From 37a44d405536c35a8df42f71d9632468f2ea3a2c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Jan 2014 14:24:05 +0100 Subject: [PATCH 073/118] libvpx: Don't install static library --- pkgs/development/libraries/libvpx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 677289c5158c..aa869b4b19d8 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples" "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ] # --enable-shared is only supported on ELF - ++ stdenv.lib.optional (!stdenv.isDarwin) "--enable-shared"; + ++ stdenv.lib.optional (!stdenv.isDarwin) "--disable-static --enable-shared"; installPhase = '' make quiet=false DIST_DIR=$out install From 9068ba2bb4183ec5fc250a88fea74f464928b276 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 18 Jan 2014 16:17:29 +0100 Subject: [PATCH 074/118] postgresql: Add version 9.3 --- pkgs/servers/sql/postgresql/9.3.x.nix | 35 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/9.3.x.nix diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix new file mode 100644 index 000000000000..cb33c6f2921c --- /dev/null +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, zlib, readline }: + +let version = "9.3.2"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; + + src = fetchurl { + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7"; + }; + + buildInputs = [ zlib readline ]; + + enableParallelBuilding = true; + + makeFlags = [ "world" ]; + + patches = [ ./disable-resolve_symlinks.patch ]; + + installTargets = [ "install-world" ]; + + LC_ALL = "C"; + + passthru = { + inherit readline; + psqlSchema = "9.3"; + }; + + meta = { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = "bsd"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94e323d356ef..72bdda00bfe8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6397,6 +6397,8 @@ let postgresql92 = callPackage ../servers/sql/postgresql/9.2.x.nix { }; + postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { }; + postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; From 88904928729ea72e879a5dddfbdddfdb0e61f729 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Jan 2014 14:54:50 +0100 Subject: [PATCH 075/118] openjdk: Ugly hack to fix nix-env installation Nix-env always wants to install all outputs of a derivation, but this failed for openjdk/openjre because openjdk has some symlinks (such as bin/java) to openjre. Also, it prevents installing the openjre without the openjdk. So as a workaround, mess with the "outputs" attribute to fool nix-env. Also, give openjre a separate name and description. Fixes #1535. --- lib/meta.nix | 6 +++--- pkgs/top-level/all-packages.nix | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/meta.nix b/lib/meta.nix index 74e9cfb411c4..1af314733486 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -14,7 +14,7 @@ rec { addMetaAttrs {description = "Bla blah";} somePkg */ addMetaAttrs = newAttrs: drv: - drv // { meta = (if drv ? meta then drv.meta else {}) // newAttrs; }; + drv // { meta = (drv.meta or {}) // newAttrs; }; /* Change the symbolic name of a package for presentation purposes @@ -51,7 +51,7 @@ rec { /* Apply lowPrio to an attrset with derivations */ - lowPrioSet = set: mapDerivationAttrset lowPrio set; + lowPrioSet = set: mapDerivationAttrset lowPrio set; /* Increase the nix-env priority of the package, i.e., this @@ -63,5 +63,5 @@ rec { /* Apply hiPrio to an attrset with derivations */ hiPrioSet = set: mapDerivationAttrset hiPrio set; - + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72bdda00bfe8..096880a63317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2851,11 +2851,14 @@ let else let openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; - in callPackage ../development/compilers/openjdk { + in (callPackage ../development/compilers/openjdk { jdk = openjdkBootstrap; - }; + }) // { outputs = [ "out" ]; }; - openjre = pkgs.openjdk.jre; + # FIXME: Need a way to set per-output meta attributes. + openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs + { description = "The open-source Java Runtime Environment"; } + pkgs.openjdk.jre)) // { outputs = [ "jre" ]; }; jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjdk From 7b51e24de99405760e64370273cc82251a7db67e Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Mon, 20 Jan 2014 15:41:17 +0100 Subject: [PATCH 076/118] add hoodle (pen notetaking program written in haskell) to nixpkgs --- pkgs/applications/graphics/hoodle/default.nix | 18 +++++++++++++++ .../libraries/haskell/TypeCompose/default.nix | 15 +++++++++++++ .../haskell/coroutine-object/default.nix | 16 ++++++++++++++ .../haskell/hoodle-builder/default.nix | 16 ++++++++++++++ .../libraries/haskell/hoodle-core/default.nix | 22 +++++++++++++++++++ .../haskell/hoodle-parser/default.nix | 16 ++++++++++++++ .../haskell/hoodle-render/default.nix | 16 ++++++++++++++ .../haskell/hoodle-types/default.nix | 17 ++++++++++++++ .../haskell/transformers-free/default.nix | 15 +++++++++++++ .../haskell/xournal-parser/default.nix | 16 ++++++++++++++ .../haskell/xournal-types/default.nix | 16 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 22 +++++++++++++++++++ 12 files changed, 205 insertions(+) create mode 100644 pkgs/applications/graphics/hoodle/default.nix create mode 100644 pkgs/development/libraries/haskell/TypeCompose/default.nix create mode 100644 pkgs/development/libraries/haskell/coroutine-object/default.nix create mode 100644 pkgs/development/libraries/haskell/hoodle-builder/default.nix create mode 100644 pkgs/development/libraries/haskell/hoodle-core/default.nix create mode 100644 pkgs/development/libraries/haskell/hoodle-parser/default.nix create mode 100644 pkgs/development/libraries/haskell/hoodle-render/default.nix create mode 100644 pkgs/development/libraries/haskell/hoodle-types/default.nix create mode 100644 pkgs/development/libraries/haskell/transformers-free/default.nix create mode 100644 pkgs/development/libraries/haskell/xournal-parser/default.nix create mode 100644 pkgs/development/libraries/haskell/xournal-types/default.nix diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix new file mode 100644 index 000000000000..8f037812eedf --- /dev/null +++ b/pkgs/applications/graphics/hoodle/default.nix @@ -0,0 +1,18 @@ +{ cabal, cmdargs, configurator, dyre, hoodleCore, mtl }: + +cabal.mkDerivation (self: { + pname = "hoodle"; + version = "0.2.2.1"; + sha256 = "1qkyyzfmprhniwarnq6cdmv1r6605b3h2lsc1rlalxhq6jh5gamd"; + isLibrary = false; + isExecutable = true; + buildDepends = [ cmdargs configurator dyre hoodleCore mtl ]; + #jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Pen notetaking program written in haskell"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim]; + }; +}) diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix new file mode 100644 index 000000000000..35fdd032458e --- /dev/null +++ b/pkgs/development/libraries/haskell/TypeCompose/default.nix @@ -0,0 +1,15 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "TypeCompose"; + version = "0.9.9"; + sha256 = "0i89r1yaglkcc1fdhn0m4hws5rqcpmkg32ddznch7a3rz1l9gqwg"; + buildDepends = [ ]; + meta = { + homepage = "https://github.com/conal/TypeCompose"; + description = "Type composition classes & instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix new file mode 100644 index 000000000000..b023843deb11 --- /dev/null +++ b/pkgs/development/libraries/haskell/coroutine-object/default.nix @@ -0,0 +1,16 @@ +{ cabal, cereal, either, lens, mtl, safecopy, transformers, transformersFree, uuid }: + +cabal.mkDerivation (self: { + pname = "coroutine-object"; + version = "0.2.0.0"; + sha256 = "1jl5glnk4ildjrxyxscxd0v7xfqbd9vpv5gaxygsfsbfr1zizp3s"; + buildDepends = [ cereal either either lens mtl safecopy transformers transformersFree uuid ]; + #jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Object-oriented programming realization using coroutine"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix new file mode 100644 index 000000000000..ecb29fda1290 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix @@ -0,0 +1,16 @@ +{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict}: + +cabal.mkDerivation (self: { + pname = "hoodle-builder"; + version = "0.2.2"; + sha256 = "0gagfpjihf6lafi90r883n9agaj1pw4gygaaxv4xxfsc270855bq"; + buildDepends = [ blazeBuilder doubleConversion hoodleTypes lens strict ]; + #jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "text builder for hoodle file format"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix new file mode 100644 index 000000000000..724941d2983c --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-core/default.nix @@ -0,0 +1,22 @@ +{ cabal, Diff, attoparsec, base64Bytestring, cairo, cereal, configurator, + coroutineObject, dbus, dyre, errors, fsnotify, gd, gtk, hoodleBuilder, + hoodleParser, hoodleRender, hoodleTypes, monadLoops, networkSimple, + pureMD5, stm, xournalParser }: + +cabal.mkDerivation (self: { + pname = "hoodle-core"; + version = "0.13.0.0"; + sha256 = "1krq7i7kvymjhj9kar2rpy4qkbak8p4n1ifswdnk9r1dw7fr8vdx"; + buildDepends = [ Diff attoparsec base64Bytestring cairo cereal configurator + coroutineObject dbus dyre errors fsnotify gd gtk hoodleBuilder + hoodleParser hoodleRender hoodleTypes monadLoops networkSimple + pureMD5 stm xournalParser ]; + #jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Core library for hoodle"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix new file mode 100644 index 000000000000..5cd91e0ca8ed --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-parser/default.nix @@ -0,0 +1,16 @@ +{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text, transformers, xournalTypes }: + +cabal.mkDerivation (self: { + pname = "hoodle-parser"; + version = "0.2.2"; + sha256 = "1m0jf7820hkdq69866hwqd1cc6rv331jrar8ayr28692h09j02rm"; + buildDepends = [ attoparsec either hoodleTypes lens mtl strict text transformers xournalTypes ]; + #jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Hoodle file parser"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix new file mode 100644 index 000000000000..e098c3aa9c0f --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-render/default.nix @@ -0,0 +1,16 @@ +{ cabal, base64Bytestring, cairo, gd, hoodleTypes, lens, monadLoops, poppler, strict, svgcairo, uuid }: + +cabal.mkDerivation (self: { + pname = "hoodle-render"; + version = "0.3.2"; + sha256 = "1mmx27g1vqpndk26nz2hy7rckcgg68clvr5x31cqz9f8sifd8rsg"; + buildDepends = [ base64Bytestring cairo gd hoodleTypes lens monadLoops poppler strict svgcairo uuid]; + #jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Hoodle file renderer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix new file mode 100644 index 000000000000..33fa98e068c7 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-types/default.nix @@ -0,0 +1,17 @@ +{ cabal, cereal, lens, mtl, strict, uuid }: + +cabal.mkDerivation (self: { + pname = "hoodle-types"; + version = "0.2.2"; + sha256 = "0dw2ji676nq3idb7izzzfnxzhyngf84wkapc0la43g4w4hzv1zxz"; + buildDepends = [ cereal lens mtl strict uuid ]; + #jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Data types for programs for hoodle file format"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix new file mode 100644 index 000000000000..bab500a7d5ee --- /dev/null +++ b/pkgs/development/libraries/haskell/transformers-free/default.nix @@ -0,0 +1,15 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "transformers-free"; + version = "1.0.1"; + sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0"; + buildDepends = [ transformers ]; + meta = { + homepage = "https://github.com/Gabriel439/Haskell-Transformers-Free-Library"; + description = "Free monad transformers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix new file mode 100644 index 000000000000..7b32b5b587f2 --- /dev/null +++ b/pkgs/development/libraries/haskell/xournal-parser/default.nix @@ -0,0 +1,16 @@ +{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict, text, transformers, xmlConduit, xmlTypes, xournalTypes, zlibConduit }: + +cabal.mkDerivation (self: { + pname = "xournal-parser"; + version = "0.5.0.2"; + sha256 = "1s9z7s6mcsn4s2krrcb1x63ca1d0rpyzdhb147w9524qw7gvbjin"; + buildDepends = [ attoparsec attoparsecConduit conduit lens mtl strict text transformers xmlConduit xmlTypes xournalTypes zlibConduit ]; + #jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Xournal file parser"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix new file mode 100644 index 000000000000..34fdb8b03496 --- /dev/null +++ b/pkgs/development/libraries/haskell/xournal-types/default.nix @@ -0,0 +1,16 @@ +{ cabal, TypeCompose, cereal, lens, strict }: + +cabal.mkDerivation (self: { + pname = "xournal-types"; + version = "0.5.0.2"; + sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm"; + buildDepends = [ TypeCompose cereal lens strict ]; + #jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Data types for programs for xournal file format"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cbeeb3b089f9..e375084427fd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -800,6 +800,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cookie = callPackage ../development/libraries/haskell/cookie {}; + coroutineObject = callPackage ../development/libraries/haskell/coroutine-object {}; + cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; criterion = callPackage ../development/libraries/haskell/criterion {}; @@ -1325,6 +1327,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hoauth = callPackage ../development/libraries/haskell/hoauth {}; + hoodle = callPackage ../applications/graphics/hoodle {}; + + hoodleBuilder = callPackage ../development/libraries/haskell/hoodle-builder {}; + + hoodleCore = callPackage ../development/libraries/haskell/hoodle-core {}; + + hoodleParser = callPackage ../development/libraries/haskell/hoodle-parser {}; + + hoodleRender = callPackage ../development/libraries/haskell/hoodle-render {}; + + hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {}; + hoogle = callPackage ../development/libraries/haskell/hoogle {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; @@ -2292,6 +2306,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; + transformersFree = callPackage ../development/libraries/haskell/transformers-free {}; + traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {}; trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix { @@ -2302,6 +2318,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tuple = callPackage ../development/libraries/haskell/tuple {}; + TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {}; + typeEq = callPackage ../development/libraries/haskell/type-eq {}; typeEquality = callPackage ../development/libraries/haskell/type-equality {}; @@ -2481,6 +2499,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; + xournalParser = callPackage ../development/libraries/haskell/xournal-parser {}; + + xournalTypes = callPackage ../development/libraries/haskell/xournal-types {}; + xtest = callPackage ../development/libraries/haskell/xtest {}; xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; From e217fd9ae8d6c89c25df805e26b6247958c627db Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 20 Jan 2014 12:41:59 +0000 Subject: [PATCH 077/118] haskellPackages.tastyRerun: New expression --- .../libraries/haskell/tasty-rerun/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tasty-rerun/default.nix diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix new file mode 100644 index 000000000000..e932a7b9307f --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix @@ -0,0 +1,20 @@ +{ cabal, mtl, optparseApplicative, reducers, split, stm, tagged +, tasty, transformers +}: + +cabal.mkDerivation (self: { + pname = "tasty-rerun"; + version = "1.0.0"; + sha256 = "0vpgsb5fgvb9mx07zq53slqxxk2vvr2c9c9p1fhrm9qadfirsqc8"; + buildDepends = [ + mtl optparseApplicative reducers split stm tagged tasty + transformers + ]; + meta = { + homepage = "http://github.com/ocharles/tasty-rerun"; + description = "Run tests by filtering the test tree depending on the result of previous test runs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e375084427fd..b7187351b3b2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2219,6 +2219,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {}; + tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {}; + tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {}; tastyTh = callPackage ../development/libraries/haskell/tasty-th {}; From b4e17742722a944d76d12e8cb203fe78a0789fde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:04:59 +0100 Subject: [PATCH 078/118] haskell-hoodle: re-generate with cabal2nix --- pkgs/applications/graphics/hoodle/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix index 8f037812eedf..e553875f756c 100644 --- a/pkgs/applications/graphics/hoodle/default.nix +++ b/pkgs/applications/graphics/hoodle/default.nix @@ -1,18 +1,20 @@ -{ cabal, cmdargs, configurator, dyre, hoodleCore, mtl }: +{ cabal, cmdargs, configurator, dyre, filepath, hoodleCore, mtl }: cabal.mkDerivation (self: { pname = "hoodle"; version = "0.2.2.1"; sha256 = "1qkyyzfmprhniwarnq6cdmv1r6605b3h2lsc1rlalxhq6jh5gamd"; - isLibrary = false; - isExecutable = true; - buildDepends = [ cmdargs configurator dyre hoodleCore mtl ]; - #jailbreak = true; + isLibrary = true; + isExecutable = true; + buildDepends = [ + cmdargs configurator dyre filepath hoodleCore mtl + ]; + jailbreak = true; meta = { homepage = "http://ianwookim.org/hoodle"; - description = "Pen notetaking program written in haskell"; + description = "Executable for hoodle"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ianwookim]; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; }; }) From ee890f01f824a5f1c8f6be19eeae9dfa99bd2e25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 079/118] haskell-TypeCompose: re-generate with cabal2nix --- pkgs/development/libraries/haskell/TypeCompose/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix index 35fdd032458e..b7c1a23d3d5e 100644 --- a/pkgs/development/libraries/haskell/TypeCompose/default.nix +++ b/pkgs/development/libraries/haskell/TypeCompose/default.nix @@ -4,7 +4,6 @@ cabal.mkDerivation (self: { pname = "TypeCompose"; version = "0.9.9"; sha256 = "0i89r1yaglkcc1fdhn0m4hws5rqcpmkg32ddznch7a3rz1l9gqwg"; - buildDepends = [ ]; meta = { homepage = "https://github.com/conal/TypeCompose"; description = "Type composition classes & instances"; From fecb119e5e8984ae5fd43797bb234916512d4960 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 080/118] haskell-coroutine-object: re-generate with cabal2nix --- .../libraries/haskell/coroutine-object/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix index b023843deb11..ea316fd29e12 100644 --- a/pkgs/development/libraries/haskell/coroutine-object/default.nix +++ b/pkgs/development/libraries/haskell/coroutine-object/default.nix @@ -1,13 +1,16 @@ -{ cabal, cereal, either, lens, mtl, safecopy, transformers, transformersFree, uuid }: +{ cabal, cereal, either, lens, mtl, safecopy, transformers +, transformersFree, uuid +}: cabal.mkDerivation (self: { pname = "coroutine-object"; version = "0.2.0.0"; sha256 = "1jl5glnk4ildjrxyxscxd0v7xfqbd9vpv5gaxygsfsbfr1zizp3s"; - buildDepends = [ cereal either either lens mtl safecopy transformers transformersFree uuid ]; - #jailbreak = true; + buildDepends = [ + cereal either lens mtl safecopy transformers transformersFree uuid + ]; + jailbreak = true; meta = { - homepage = "http://ianwookim.org/hoodle"; description = "Object-oriented programming realization using coroutine"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From a1adb429ecaf094f28c6ce00bdfe79a4660245b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 081/118] haskell-hoodle-builder: re-generate with cabal2nix --- .../libraries/haskell/hoodle-builder/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix index ecb29fda1290..d865de6ec9c1 100644 --- a/pkgs/development/libraries/haskell/hoodle-builder/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix @@ -1,13 +1,15 @@ -{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict}: +{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict +}: cabal.mkDerivation (self: { pname = "hoodle-builder"; version = "0.2.2"; sha256 = "0gagfpjihf6lafi90r883n9agaj1pw4gygaaxv4xxfsc270855bq"; - buildDepends = [ blazeBuilder doubleConversion hoodleTypes lens strict ]; - #jailbreak = true; + buildDepends = [ + blazeBuilder doubleConversion hoodleTypes lens strict + ]; + jailbreak = true; meta = { - homepage = "http://ianwookim.org/hoodle"; description = "text builder for hoodle file format"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 86e1775cf45416f1157d00c83245aa7947f8450f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 082/118] haskell-hoodle-core: re-generate with cabal2nix --- .../libraries/haskell/hoodle-core/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix index 724941d2983c..f73733321bef 100644 --- a/pkgs/development/libraries/haskell/hoodle-core/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-core/default.nix @@ -1,22 +1,31 @@ -{ cabal, Diff, attoparsec, base64Bytestring, cairo, cereal, configurator, - coroutineObject, dbus, dyre, errors, fsnotify, gd, gtk, hoodleBuilder, - hoodleParser, hoodleRender, hoodleTypes, monadLoops, networkSimple, - pureMD5, stm, xournalParser }: +{ cabal, attoparsec, base64Bytestring, binary, cairo, cereal +, configurator, coroutineObject, dbus, Diff, dyre, either, errors +, filepath, fsnotify, gd, gtk, hoodleBuilder, hoodleParser +, hoodleRender, hoodleTypes, lens, libX11, libXi, monadLoops, mtl +, network, networkInfo, networkSimple, pango, poppler, pureMD5, stm +, strict, svgcairo, systemFilepath, text, time, transformers +, transformersFree, uuid, xournalParser +}: cabal.mkDerivation (self: { pname = "hoodle-core"; version = "0.13.0.0"; sha256 = "1krq7i7kvymjhj9kar2rpy4qkbak8p4n1ifswdnk9r1dw7fr8vdx"; - buildDepends = [ Diff attoparsec base64Bytestring cairo cereal configurator - coroutineObject dbus dyre errors fsnotify gd gtk hoodleBuilder - hoodleParser hoodleRender hoodleTypes monadLoops networkSimple - pureMD5 stm xournalParser ]; - #jailbreak = true; + buildDepends = [ + attoparsec base64Bytestring binary cairo cereal configurator + coroutineObject dbus Diff dyre either errors filepath fsnotify gd + gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes lens + monadLoops mtl network networkInfo networkSimple pango poppler + pureMD5 stm strict svgcairo systemFilepath text time transformers + transformersFree uuid xournalParser + ]; + extraLibraries = [ libX11 libXi ]; + jailbreak = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Core library for hoodle"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ianwookim]; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; }; }) From bf487fed15a757a744b8d6a3cd4bd4c158b5f611 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 083/118] haskell-hoodle-parser: re-generate with cabal2nix --- .../libraries/haskell/hoodle-parser/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix index 5cd91e0ca8ed..84d9e93aaa2b 100644 --- a/pkgs/development/libraries/haskell/hoodle-parser/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-parser/default.nix @@ -1,11 +1,16 @@ -{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text, transformers, xournalTypes }: +{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text +, transformers, xournalTypes +}: cabal.mkDerivation (self: { pname = "hoodle-parser"; version = "0.2.2"; sha256 = "1m0jf7820hkdq69866hwqd1cc6rv331jrar8ayr28692h09j02rm"; - buildDepends = [ attoparsec either hoodleTypes lens mtl strict text transformers xournalTypes ]; - #jailbreak = true; + buildDepends = [ + attoparsec either hoodleTypes lens mtl strict text transformers + xournalTypes + ]; + jailbreak = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Hoodle file parser"; From b26ab6c8f0c4e3e21dc0acb1b254368ba1a68eb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 084/118] haskell-hoodle-render: re-generate with cabal2nix --- .../libraries/haskell/hoodle-render/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix index e098c3aa9c0f..3666ef913987 100644 --- a/pkgs/development/libraries/haskell/hoodle-render/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-render/default.nix @@ -1,13 +1,17 @@ -{ cabal, base64Bytestring, cairo, gd, hoodleTypes, lens, monadLoops, poppler, strict, svgcairo, uuid }: +{ cabal, base64Bytestring, cairo, filepath, gd, hoodleTypes, lens +, monadLoops, mtl, poppler, strict, svgcairo, uuid +}: cabal.mkDerivation (self: { pname = "hoodle-render"; version = "0.3.2"; sha256 = "1mmx27g1vqpndk26nz2hy7rckcgg68clvr5x31cqz9f8sifd8rsg"; - buildDepends = [ base64Bytestring cairo gd hoodleTypes lens monadLoops poppler strict svgcairo uuid]; - #jailbreak = true; + buildDepends = [ + base64Bytestring cairo filepath gd hoodleTypes lens monadLoops mtl + poppler strict svgcairo uuid + ]; + jailbreak = true; meta = { - homepage = "http://ianwookim.org/hoodle"; description = "Hoodle file renderer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 22727d9507dac459d6247cdce4ea44ad8913cc8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 085/118] haskell-hoodle-types: re-generate with cabal2nix --- pkgs/development/libraries/haskell/hoodle-types/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix index 33fa98e068c7..55d752315100 100644 --- a/pkgs/development/libraries/haskell/hoodle-types/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-types/default.nix @@ -5,13 +5,11 @@ cabal.mkDerivation (self: { version = "0.2.2"; sha256 = "0dw2ji676nq3idb7izzzfnxzhyngf84wkapc0la43g4w4hzv1zxz"; buildDepends = [ cereal lens mtl strict uuid ]; - #jailbreak = true; + jailbreak = true; meta = { - homepage = "http://ianwookim.org/hoodle"; description = "Data types for programs for hoodle file format"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; }; }) - From 4350308ec74de7dfb69451e2b8f449ece19d6009 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 086/118] haskell-transformers-free: re-generate with cabal2nix --- pkgs/development/libraries/haskell/transformers-free/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix index bab500a7d5ee..da05e122e529 100644 --- a/pkgs/development/libraries/haskell/transformers-free/default.nix +++ b/pkgs/development/libraries/haskell/transformers-free/default.nix @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0"; buildDepends = [ transformers ]; meta = { - homepage = "https://github.com/Gabriel439/Haskell-Transformers-Free-Library"; description = "Free monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 6fd153677ba8f3b02354cef940acdc7c73dbd9bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 087/118] haskell-xournal-parser: re-generate with cabal2nix --- .../libraries/haskell/xournal-parser/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix index 7b32b5b587f2..d874543a967a 100644 --- a/pkgs/development/libraries/haskell/xournal-parser/default.nix +++ b/pkgs/development/libraries/haskell/xournal-parser/default.nix @@ -1,11 +1,17 @@ -{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict, text, transformers, xmlConduit, xmlTypes, xournalTypes, zlibConduit }: +{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict +, text, transformers, xmlConduit, xmlTypes, xournalTypes +, zlibConduit +}: cabal.mkDerivation (self: { pname = "xournal-parser"; version = "0.5.0.2"; sha256 = "1s9z7s6mcsn4s2krrcb1x63ca1d0rpyzdhb147w9524qw7gvbjin"; - buildDepends = [ attoparsec attoparsecConduit conduit lens mtl strict text transformers xmlConduit xmlTypes xournalTypes zlibConduit ]; - #jailbreak = true; + buildDepends = [ + attoparsec attoparsecConduit conduit lens mtl strict text + transformers xmlConduit xmlTypes xournalTypes zlibConduit + ]; + jailbreak = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Xournal file parser"; From 75934cbe0939631eb0de00d3e234421a2bc8ce04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:05:00 +0100 Subject: [PATCH 088/118] haskell-xournal-types: re-generate with cabal2nix --- .../libraries/haskell/xournal-types/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix index 34fdb8b03496..2281520703f2 100644 --- a/pkgs/development/libraries/haskell/xournal-types/default.nix +++ b/pkgs/development/libraries/haskell/xournal-types/default.nix @@ -1,13 +1,12 @@ -{ cabal, TypeCompose, cereal, lens, strict }: +{ cabal, cereal, lens, strict, TypeCompose }: cabal.mkDerivation (self: { pname = "xournal-types"; version = "0.5.0.2"; sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm"; - buildDepends = [ TypeCompose cereal lens strict ]; - #jailbreak = true; + buildDepends = [ cereal lens strict TypeCompose ]; + jailbreak = true; meta = { - homepage = "http://ianwookim.org/hoodle"; description = "Data types for programs for xournal file format"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 5333854aa4005dc491559d7d512b3c3ce577d427 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:06:05 +0100 Subject: [PATCH 089/118] haskell-cabal2nix: re-generate with cabal2nix --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index d0d7e7b39b24..342eb3ecfd11 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.58"; - sha256 = "0xsp0f87583pcjdfhngbc9465yisk2m3sn6904s0szprkpi2p03x"; + version = "1.59"; + sha256 = "1prm07mnnasfn042635kc6h6mymvninic0y9zimii7k4rqblf598"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 3d1f6e3a7544dd0a8ca76f6706b85014791bac43 Mon Sep 17 00:00:00 2001 From: Roger Mason Date: Thu, 16 Jan 2014 16:55:04 -0330 Subject: [PATCH 090/118] Add fricas, a computer algebra system --- .../science/math/fricas/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pkgs/applications/science/math/fricas/default.nix diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix new file mode 100644 index 000000000000..a438fa5102f3 --- /dev/null +++ b/pkgs/applications/science/math/fricas/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: + +stdenv.mkDerivation rec { + name = "fricas-1.2.2"; + + src = fetchurl { + url = "http://sourceforge.net/projects/fricas/files/fricas/1.2.2/${name}-full.tar.bz2"; + sha256 = "87db64a1fd4211f3b776793acea931b4271d2e7a28396414c7d7397d833defe1"; + }; + + buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; + + dontStrip = true; + + meta = { + description = "Fricas CAS"; + homepage = http://fricas.sourceforge.net/; + maintainers = stdenv.lib.maintainers.sprock; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.license.bsd3; + }; +} From e9928a1f25e30deaa9e88471e9f09d45ccea0fe4 Mon Sep 17 00:00:00 2001 From: Roger Mason Date: Mon, 13 Jan 2014 17:13:54 -0330 Subject: [PATCH 091/118] Add CERN's 'root' Application Framework. --- .../science/physics/root/cmake.patch | 11 +++++++++ .../science/physics/root/default.nix | 24 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/science/physics/root/cmake.patch create mode 100644 pkgs/applications/science/physics/root/default.nix diff --git a/pkgs/applications/science/physics/root/cmake.patch b/pkgs/applications/science/physics/root/cmake.patch new file mode 100644 index 000000000000..b6efd7444fe9 --- /dev/null +++ b/pkgs/applications/science/physics/root/cmake.patch @@ -0,0 +1,11 @@ +--- cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330 ++++ cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330 +@@ -149,7 +149,7 @@ + + #---General Build options---------------------------------------------------------------------- + # use, i.e. don't skip the full RPATH for the build tree +-set(CMAKE_SKIP_BUILD_RPATH FALSE) ++set(CMAKE_SKIP_BUILD_RPATH TRUE) + # when building, don't use the install RPATH already (but later on when installing) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + # add the automatically determined parts of the RPATH diff --git a/pkgs/applications/science/physics/root/default.nix b/pkgs/applications/science/physics/root/default.nix new file mode 100644 index 000000000000..f07f7eae0a7d --- /dev/null +++ b/pkgs/applications/science/physics/root/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }: + +stdenv.mkDerivation rec { + name = "root_v5.34.14"; + + src = fetchurl { + url = "ftp://root.cern.ch/root/${name}.source.tar.gz"; + sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b"; + }; + + buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ]; + + # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in + # /cmake/modules/RootBuildOptions.cmake. + # This patch sets it to TRUE. + patches = [ ./cmake.patch ]; + patchFlags = "-p0"; + + meta = { + description = "A data analysis framework"; + #maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.mesaPlatforms; + }; +} From 43d59a9a3bc285f36d50b737121f16b91b7c6f1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:18:35 +0100 Subject: [PATCH 092/118] lib/maintainers.nix: add missing entry for 'sprock' --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c29259c6386c..3c7a399623d5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -58,6 +58,7 @@ shlevy = "Shea Levy "; simons = "Peter Simons "; smironov = "Sergey Mironov "; + sprock = "Roger Mason "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; tomberek = "Thomas Bereknyei "; From 6475f0d1fe9ac2b22711e97b2ba08b50801926e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:20:08 +0100 Subject: [PATCH 093/118] fricas: clean up meta section --- pkgs/applications/science/math/fricas/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index a438fa5102f3..1817c43ed7be 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -13,10 +13,11 @@ stdenv.mkDerivation rec { dontStrip = true; meta = { + homepage = http://fricas.sourceforge.net/; description = "Fricas CAS"; - homepage = http://fricas.sourceforge.net/; + license = stdenv.lib.licenses.bsd3; + + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = stdenv.lib.maintainers.sprock; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.license.bsd3; }; } From baeb19d0ce0f0600e6036c053831dd0a1886cbfd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:24:27 +0100 Subject: [PATCH 094/118] root: clean up meta section and move build into 'science/misc' section --- .../science/{physics => misc}/root/cmake.patch | 0 .../science/{physics => misc}/root/default.nix | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/applications/science/{physics => misc}/root/cmake.patch (100%) rename pkgs/applications/science/{physics => misc}/root/default.nix (78%) diff --git a/pkgs/applications/science/physics/root/cmake.patch b/pkgs/applications/science/misc/root/cmake.patch similarity index 100% rename from pkgs/applications/science/physics/root/cmake.patch rename to pkgs/applications/science/misc/root/cmake.patch diff --git a/pkgs/applications/science/physics/root/default.nix b/pkgs/applications/science/misc/root/default.nix similarity index 78% rename from pkgs/applications/science/physics/root/default.nix rename to pkgs/applications/science/misc/root/default.nix index f07f7eae0a7d..6f484dc82241 100644 --- a/pkgs/applications/science/physics/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }: stdenv.mkDerivation rec { - name = "root_v5.34.14"; + name = "root-${version}"; + version = "5.34.14"; src = fetchurl { - url = "ftp://root.cern.ch/root/${name}.source.tar.gz"; + url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz"; sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b"; }; @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; meta = { + homepage = "http://root.cern.ch/drupal/"; description = "A data analysis framework"; - #maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; } From 630dc74638b403adda42c8db2a44cbbf814e09c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:24:56 +0100 Subject: [PATCH 095/118] all-packages.nix: move 'science/misc' builds into the proper place and add attribute for 'fricas' --- pkgs/top-level/all-packages.nix | 40 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 096880a63317..0fcfe95a07d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9851,25 +9851,6 @@ let ### SCIENCE - celestia = callPackage ../applications/science/astronomy/celestia { - lua = lua5_1; - inherit (xlibs) libXmu; - inherit (pkgs.gnome) gtkglext; - }; - - xplanet = callPackage ../applications/science/astronomy/xplanet { }; - - gravit = callPackage ../applications/science/astronomy/gravit { }; - - spyder = callPackage ../applications/science/spyder { - inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended - inherit (pythonPackages) ipython pep8; # optional - inherit pylint; - }; - - stellarium = callPackage ../applications/science/astronomy/stellarium { }; - - ### SCIENCE/GEOMETRY drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) { @@ -10058,6 +10039,8 @@ let eukleides = callPackage ../applications/science/math/eukleides { }; + fricas = callPackage ../applications/science/math/fricas { }; + gap = callPackage ../applications/science/math/gap { }; maxima = callPackage ../applications/science/math/maxima { }; @@ -10103,14 +10086,33 @@ let boinc = callPackage ../applications/science/misc/boinc { }; + celestia = callPackage ../applications/science/astronomy/celestia { + lua = lua5_1; + inherit (xlibs) libXmu; + inherit (pkgs.gnome) gtkglext; + }; + + gravit = callPackage ../applications/science/astronomy/gravit { }; + golly = callPackage ../applications/science/misc/golly { }; + root = callPackage ../applications/science/misc/root { }; + simgrid = callPackage ../applications/science/misc/simgrid { }; + spyder = callPackage ../applications/science/spyder { + inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended + inherit (pythonPackages) ipython pep8; # optional + inherit pylint; + }; + + stellarium = callPackage ../applications/science/astronomy/stellarium { }; + tulip = callPackage ../applications/science/misc/tulip { }; vite = callPackage ../applications/science/misc/vite { }; + xplanet = callPackage ../applications/science/astronomy/xplanet { }; ### MISC From 2991fdca52ce43218f166c706114ab294dd21b3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 18:26:32 +0100 Subject: [PATCH 096/118] root: enable parallel building --- pkgs/applications/science/misc/root/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 6f484dc82241..f4de3ba6eea0 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./cmake.patch ]; patchFlags = "-p0"; + enableParallelBuilding = true; + meta = { homepage = "http://root.cern.ch/drupal/"; description = "A data analysis framework"; From f0740ac2bc5f170e411dda7fd443c18f69584215 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 11:58:44 +0100 Subject: [PATCH 097/118] happy: add version 1.19.3 --- .../development/tools/parsing/happy/1.19.3.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/parsing/happy/1.19.3.nix diff --git a/pkgs/development/tools/parsing/happy/1.19.3.nix b/pkgs/development/tools/parsing/happy/1.19.3.nix new file mode 100644 index 000000000000..b1a03fa3b9f8 --- /dev/null +++ b/pkgs/development/tools/parsing/happy/1.19.3.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, perl }: + +cabal.mkDerivation (self: { + pname = "happy"; + version = "1.19.3"; + sha256 = "1q3hipgcwvrf333wlyqmg4mgf24gwiagddlfyr9zgi4k42p2373x"; + isLibrary = false; + isExecutable = true; + buildDepends = [ mtl ]; + buildTools = [ perl ]; + meta = { + homepage = "http://www.haskell.org/happy/"; + description = "Happy is a parser generator for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b7187351b3b2..476313209846 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -176,7 +176,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall = self.cabalInstall_1_18_0_2; alex = self.alex_3_1_3; haddock = self.haddock_2_13_2_1; - happy = self.happy_1_19_2; + happy = self.happy_1_19_3; primitive = self.primitive_0_5_1_0; # semi-official, but specified }; @@ -2632,7 +2632,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {}; happy_1_19_2 = callPackage ../development/tools/parsing/happy/1.19.2.nix {}; - happy = self.happy_1_19_2; + happy_1_19_3 = callPackage ../development/tools/parsing/happy/1.19.3.nix {}; + happy = self.happy_1_19_3; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; From 12bb3d783b0e042b168b850d26815d052a3f59d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 11:59:35 +0100 Subject: [PATCH 098/118] haskell-case-insensitive: update to version 1.1.0.3 --- .../haskell/case-insensitive/{1.1.0.2.nix => 1.1.0.3.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/case-insensitive/{1.1.0.2.nix => 1.1.0.3.nix} (84%) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix similarity index 84% rename from pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix rename to pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix index 5fd438e320d5..45cc7c11fc28 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "1.1.0.2"; - sha256 = "0200jpz2xs67sw5dczfj8nlz2yp40k05bv3rk1phdc093n13kaww"; + version = "1.1.0.3"; + sha256 = "0fr69lfb976gflr8w6d68zn4pz86jfxbb2i49fw3mmam67k5y9bv"; buildDepends = [ deepseq hashable text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 476313209846..764955b72104 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x inherit (self) cabal ghc; async = self.async_2_0_1_5; attoparsec = self.attoparsec_0_11_1_0; - caseInsensitive = self.caseInsensitive_1_1_0_2; + caseInsensitive = self.caseInsensitive_1_1_0_3; cgi = self.cgi_3001_1_8_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_5_0_2; @@ -699,8 +699,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; - caseInsensitive_1_1_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.2.nix {}; - caseInsensitive = self.caseInsensitive_1_1_0_2; + caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {}; + caseInsensitive = self.caseInsensitive_1_1_0_3; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; From e701d2b062b0e45c413cff7b7b03e63e3b1aed7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:43:49 +0100 Subject: [PATCH 099/118] haskell-aeson: add version 0.7.0.0 (but don't use it yet) --- .../aeson/{default.nix => 0.6.2.1.nix} | 0 .../libraries/haskell/aeson/0.7.0.0.nix | 26 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++- 3 files changed, 29 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/aeson/{default.nix => 0.6.2.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/aeson/0.7.0.0.nix diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/aeson/default.nix rename to pkgs/development/libraries/haskell/aeson/0.6.2.1.nix diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix new file mode 100644 index 000000000000..41bbdbf5a0b9 --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix @@ -0,0 +1,26 @@ +{ cabal, attoparsec, deepseq, dlist, hashable, HUnit, mtl +, QuickCheck, scientific, syb, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text, time, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "aeson"; + version = "0.7.0.0"; + sha256 = "14xh7i07ha2hgljq0y0v7f5gkn0pv2zqj8l9j92957mf7f17zwf6"; + buildDepends = [ + attoparsec deepseq dlist hashable mtl scientific syb text time + unorderedContainers vector + ]; + testDepends = [ + attoparsec HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text time unorderedContainers vector + ]; + doCheck = false; + meta = { + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 764955b72104..798103153ece 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -522,7 +522,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x abstractPar = callPackage ../development/libraries/haskell/abstract-par {}; - aeson = callPackage ../development/libraries/haskell/aeson {}; + aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {}; + aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {}; + aeson = self.aeson_0_6_2_1; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {}; From e6226d7d3c51ffdb1719114847ab123393962d63 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:50 +0100 Subject: [PATCH 100/118] haskell-JuicyPixels: update to version 3.1.3 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 485a80dadb3c..d8d0ac69badd 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.2"; - sha256 = "19bal3g3cp4nn8g3zp4yi5g4zw5wnkbi74gcra8mxs4zy99bf8s2"; + version = "3.1.3"; + sha256 = "1zyrdd8mhgj0lchsznyhqhxb48ql8fhfqi5qs54qaxan514w6x70"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; From 0178eba86eb9e59e823c7bd83f67cb544583d845 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:50 +0100 Subject: [PATCH 101/118] haskell-base16-bytestring: update to version 0.1.1.6 --- .../libraries/haskell/base16-bytestring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index 3f81258f4263..3de2bdf60ff2 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base16-bytestring"; - version = "0.1.1.5"; - sha256 = "1fgd3zdzjfry6jaz8hwhim0p2c35l73cxxambh0ff7p5fqjrlwym"; + version = "0.1.1.6"; + sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs"; meta = { homepage = "http://github.com/bos/base16-bytestring"; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; From c5456a7f8914919ca135a4901c0c59091b4b792f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:50 +0100 Subject: [PATCH 102/118] haskell-conduit: update to version 1.0.11.1 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 395b03d26830..980791156071 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.10"; - sha256 = "12vqh747rdldw3n42cxzd77rzb66129dc690n23q5xy7pbhzilfp"; + version = "1.0.11.1"; + sha256 = "115iqdhwmnn04bmby2bmbm6pykb2akaca0c3i79nvw1annml65lg"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void From 032ea31c47eb3fafdd3e07ca4b109f894c6782d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:50 +0100 Subject: [PATCH 103/118] haskell-cryptohash: update to version 0.11.2 --- pkgs/development/libraries/haskell/cryptohash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 839bf4518a19..b888ce6153ab 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.11.1"; - sha256 = "0ww7bikl8i50m1pwkqp145bfsiy07npnjw48j3il4w2ia0b3axmy"; + version = "0.11.2"; + sha256 = "0az2p7lql1lchl85ca26b5sbvhqsv47daavyfqy84qmr3w3wyr28"; buildDepends = [ byteable ]; testDepends = [ byteable HUnit QuickCheck testFramework testFrameworkHunit From 496b53e44fd617e2af0b9debb2fd1ef4596dd873 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:50 +0100 Subject: [PATCH 104/118] haskell-gloss-raster: update to version 1.8.1.2 --- pkgs/development/libraries/haskell/gloss-raster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix index 4d1b85669dab..4a34c7195c20 100644 --- a/pkgs/development/libraries/haskell/gloss-raster/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss-raster"; - version = "1.8.1.1"; - sha256 = "0qqk2fizmv1zdvi8lljxiqdwlmfzni4qzsdvm2jbvgg5qjx9l9qp"; + version = "1.8.1.2"; + sha256 = "1cpibilv027rfx7xz957f1d7wy6b5z6dgfjrw425ck497r8gfgp4"; buildDepends = [ gloss repa ]; extraLibraries = [ llvm ]; meta = { From df89207c9e15d6dec589ccaaba3e23ea7ddbbc3d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:50 +0100 Subject: [PATCH 105/118] haskell-gloss: update to version 1.8.1.2 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 0f0777909e82..223a72ec3818 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.8.1.1"; - sha256 = "135rrgzx4xq8279zbsl4538hjn8np4g6409fgva2cb9shw8z5pmj"; + version = "1.8.1.2"; + sha256 = "1ky1gckvyww855dy3fzllf1ixbmc3jpdvz85hx719pcygy7qh71m"; buildDepends = [ bmp GLUT OpenGL ]; jailbreak = true; meta = { From 3a0f4d4fcd5408981252f75829e532cc908a3ccf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:50 +0100 Subject: [PATCH 106/118] haskell-gnuidn: update to version 0.2.1 --- pkgs/development/libraries/haskell/gnuidn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix index 6ae78cf49b6a..9192f6bb29bb 100644 --- a/pkgs/development/libraries/haskell/gnuidn/default.nix +++ b/pkgs/development/libraries/haskell/gnuidn/default.nix @@ -2,14 +2,14 @@ cabal.mkDerivation (self: { pname = "gnuidn"; - version = "0.2"; - sha256 = "0xk72p3z1lwlmab0jcf7m48p5pncgz00hb7l96naz1gdkbq7xizd"; + version = "0.2.1"; + sha256 = "1jii635wc3j1jnwwx24j9gg9xd91g2iw5967acn74p7db62lqx37"; buildDepends = [ text ]; buildTools = [ c2hs ]; extraLibraries = [ libidn ]; pkgconfigDepends = [ libidn ]; meta = { - homepage = "http://john-millikin.com/software/bindings/gnuidn/"; + homepage = "https://john-millikin.com/software/haskell-gnuidn/"; description = "Bindings for GNU IDN"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; From e90fb2442ac8d6806f9dc667c2620e9cebc88dfa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:50 +0100 Subject: [PATCH 107/118] haskell-hakyll: update to version 4.4.3.1 --- pkgs/development/libraries/haskell/hakyll/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 36e56de639c3..d4f6561ff1bd 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.4.3.0"; - sha256 = "1ngjzqgyhdfkzikyg6cicqdb6cpw2bbfr4g73vgmzlg8spy1cyg5"; + version = "4.4.3.1"; + sha256 = "0k301mzy8sagrxdzkhz006j1i1zmsx9iy5ais9gif3gxj2sd3b2a"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26,9 +26,6 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 text time ]; doCheck = false; - patchPhase = '' - sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal - ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; From 19466e48fc2629c49c52d23409bfb6391ab62af3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 108/118] haskell-heist: update to version 0.13.0.5 --- pkgs/development/libraries/haskell/heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 5ce91d688076..9f0eb8981aeb 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.0.4"; - sha256 = "15iixsjlx3zd44dcdxla5pgpl16995pk9g34zjqynmhcj7sfv5as"; + version = "0.13.0.5"; + sha256 = "17lpqiidy1s6yzhh865y7dhkcv34p7pxzljpn64yyfa2pc8885dj"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time From eaf5b1cde1d097062f69af56cddfe0f40e32f073 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 109/118] haskell-pipes-bytestring: update to version 1.0.3 --- .../libraries/haskell/pipes-bytestring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix index 83f08ecf148b..4e085105c202 100644 --- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-bytestring"; - version = "1.0.2"; - sha256 = "09wzmi3xh9n69xsxw0ik4qf2ld1vksca88ggknqbzbnjxq82jjrr"; + version = "1.0.3"; + sha256 = "11jiaf5vs0jz8m0x9dlcvflh636131bj4jnlrj3r5nz1v7a64v6b"; buildDepends = [ pipes pipesParse transformers ]; meta = { description = "ByteString support for pipes"; From c0270c7dfa8f721d2698fd09d75f6cec6da4bf78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 110/118] haskell-snap: update to version 0.13.2.1 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 28ce546ee167..92c02a27f42c 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.0"; - sha256 = "1jwgl6dmi1ljfqvfjxcsv3q4h9lcqpmxk4zsjkxdx77z201lhm3b"; + version = "0.13.2.1"; + sha256 = "0jkjxyw7pcfl8r6gs0amzpkxardncvxsh20m7lad6aqjkcwh8r4l"; isLibrary = true; isExecutable = true; buildDepends = [ From 80658f3cfb3f8a01f7fe62b5063082b00184c76c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 111/118] haskell-stm-conduit: update to version 2.2 --- pkgs/development/libraries/haskell/stm-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 4ab74d23bc23..7e24db4476a4 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.1.4"; - sha256 = "0xl3g96blawy5bkvialq6jxnf4wajxb5fg1sh7p9kvw1gvacqwqk"; + version = "2.2"; + sha256 = "14fz8izr8fxi3s78fhz4p5yfdkfcipcfpcj6dn5w0fkcd2hc2a66"; buildDepends = [ async conduit liftedAsync liftedBase monadControl monadLoops resourcet stm stmChans transformers From 75672819ea82be8b76a07127ef5c8b2e446ce140 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 112/118] haskell-threepenny-gui: update to version 0.4.0.2 --- pkgs/development/libraries/haskell/threepenny-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix index 11becfeacc74..70f96c8ac9d7 100644 --- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "threepenny-gui"; - version = "0.4.0.1"; - sha256 = "18ahfcbzlp0k5ry9fdzdv8jdwv10iplnbbnh2xyr3cqils2yp68m"; + version = "0.4.0.2"; + sha256 = "0dx6jrpxvd6ypz314hmq8nngy0wjx3bwx3r9h1c6y70id31lr9pg"; isLibrary = true; isExecutable = true; buildDepends = [ From a58a0b17c9aa07e59e1f8fdc0ee793888a254440 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 113/118] haskell-vector-space-points: update to version 0.1.3 --- .../libraries/haskell/vector-space-points/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix index 2a5c1eb2fc42..2edb15beeda5 100644 --- a/pkgs/development/libraries/haskell/vector-space-points/default.nix +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-space-points"; - version = "0.1.2.1"; - sha256 = "0prbmk48xdr2gbxqpv0g89xz5v3k9wps9v2gymkh32jag2lgzi66"; + version = "0.1.3"; + sha256 = "0bk2zrccf5bxh14dzhhv89mr755j801ziqyxgv69ksdyxh8hx2qg"; buildDepends = [ newtype vectorSpace ]; meta = { description = "A type for points, as distinct from vectors"; From 119d4b8d5c46c834d5c22f6da7694d1a181392ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 114/118] haskell-wai-extra: update to version 2.0.3 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index c7b673ecbc9f..78d802692545 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.0.2"; - sha256 = "1va9lds6vziid3kksyp1pl4bz1l02qjybm4x438q5a7n6yxmmd65"; + version = "2.0.3"; + sha256 = "18x5jcq4yl33ixl7rb79ncx107bw6y8dmw2gwcmxb93h5yiam7s5"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase From e7302c891e95bf6e86d6e9bd6ed2e72e04c02507 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 115/118] haskell-yesod-auth: update to version 1.2.5.3 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index b261d22ace6e..56048aeb6277 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.5.2"; - sha256 = "13gvcwgpq4l3d50h855qdcn0k93a8cy918jg577ch3fqhwk70q8g"; + version = "1.2.5.3"; + sha256 = "0rpyx9p3si5453166v9paq18nz209w6lxz3hy5nxg1hyihwh8gy9"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network From c13a56a036f8dd118436d98053af49abd5803ce1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 116/118] haskell-yesod-form: update to version 1.3.4.3 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 66b2117ee829..35b55bde887a 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.4.2"; - sha256 = "06qw2hx0iv46xdmkbbw1sgwzvyr82h0v267dxfw19235s9yfzbfg"; + version = "1.3.4.3"; + sha256 = "1yf9kvnlkgfdpv44afj2zwdk8jh382lxj56jvafgw1bxa1hsn408"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet From 9c065f77d8fdb816546b9fc9d1c27bc64fa48f26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 12:44:51 +0100 Subject: [PATCH 117/118] haskell-yesod-platform: update to version 1.2.6 --- .../haskell/yesod-platform/default.nix | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 929dd698b7dd..0c9c31778cad 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -2,65 +2,67 @@ , attoparsecConduit, authenticate, base64Bytestring , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml , blazeMarkup, byteable, byteorder, caseInsensitive, cereal -, certificate, cipherAes, cipherRc4, clientsession, conduit -, connection, controlMonadLoop, cookie, cprngAes, cryptoApi -, cryptoCipherTypes, cryptoConduit, cryptohash, cryptohashCryptoapi -, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom +, certificate, cipherAes, cipherBlowfish, cipherCamellia, cipherDes +, cipherRc4, clientsession, conduit, connection, controlMonadLoop +, cookie, cprngAes, cryptoApi, cryptocipher, cryptoCipherTypes +, cryptoConduit, cryptohash, cryptohashCryptoapi, cryptoNumbers +, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom, cryptoRandomApi , cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist , dataDefaultInstancesOldLocale, dlist, emailValidate, entropy -, failure, fastLogger, fileEmbed, filesystemConduit, hamlet, hjsmin -, hspec, hspecExpectations, htmlConduit, httpAttoparsec, httpClient -, httpClientConduit, httpClientTls, httpConduit, httpDate -, httpTypes, languageJavascript, liftedBase, mimeMail, mimeTypes -, mmorph, monadControl, monadLogger, monadLoops, networkConduit -, pathPieces, pem, persistent, persistentTemplate, poolConduit -, primitive, processConduit, publicsuffixlist, pureMD5, pwstoreFast -, quickcheckIo, resourcePool, resourcet, safe, securemem -, semigroups, setenv, SHA, shakespeare, shakespeareCss -, shakespeareI18n, shakespeareJs, shakespeareText, silently -, simpleSendfile, skein, socks, stmChans, stringsearch -, systemFileio, systemFilepath, tagged, tagsoup, tagstreamConduit -, tls, tlsExtra, transformersBase, unixCompat, unorderedContainers -, utf8Light, utf8String, vector, void, wai, waiAppStatic, waiExtra -, waiLogger, waiTest, warp, word8, xmlConduit, xmlTypes -, xssSanitize, yaml, yesod, yesodAuth, yesodCore, yesodForm -, yesodPersistent, yesodRoutes, yesodStatic, yesodTest -, zlibBindings, zlibConduit +, esqueleto, failure, fastLogger, fileEmbed, filesystemConduit +, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit +, httpAttoparsec, httpClient, httpClientConduit, httpClientTls +, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase +, mimeMail, mimeTypes, mmorph, monadControl, monadLogger +, monadLoops, networkConduit, pathPieces, pem, persistent +, persistentTemplate, poolConduit, primitive, processConduit +, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo +, resourcePool, resourcet, safe, scientific, securemem, semigroups +, setenv, SHA, shakespeare, shakespeareCss, shakespeareI18n +, shakespeareJs, shakespeareText, silently, simpleSendfile, skein +, socks, stmChans, stringsearch, systemFileio, systemFilepath +, tagged, tagsoup, tagstreamConduit, tls, tlsExtra +, transformersBase, unixCompat, unorderedContainers, utf8Light +, utf8String, vector, void, wai, waiAppStatic, waiExtra, waiLogger +, waiTest, warp, warpTls, word8, xmlConduit, xmlTypes, xssSanitize +, yaml, yesod, yesodAuth, yesodCore, yesodForm, yesodPersistent +, yesodRoutes, yesodStatic, yesodTest, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.5.3"; - sha256 = "0k9srgsnz9cgpxhdk04qz27lqp1xm97bprxjv93j1sxny92v6122"; + version = "1.2.6"; + sha256 = "15ixhxim14672hl9cl92sbi94yzv6g6zgg07jvkciixg0hd8xr6p"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder - caseInsensitive cereal certificate cipherAes cipherRc4 - clientsession conduit connection controlMonadLoop cookie cprngAes - cryptoApi cryptoCipherTypes cryptoConduit cryptohash - cryptohashCryptoapi cryptoNumbers cryptoPubkey cryptoPubkeyTypes - cryptoRandom cssText dataDefault dataDefaultClass + caseInsensitive cereal certificate cipherAes cipherBlowfish + cipherCamellia cipherDes cipherRc4 clientsession conduit connection + controlMonadLoop cookie cprngAes cryptoApi cryptocipher + cryptoCipherTypes cryptoConduit cryptohash cryptohashCryptoapi + cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom + cryptoRandomApi cssText dataDefault dataDefaultClass dataDefaultInstancesBase dataDefaultInstancesContainers dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist - emailValidate entropy failure fastLogger fileEmbed + emailValidate entropy esqueleto failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit httpAttoparsec httpClient httpClientConduit httpClientTls httpConduit httpDate httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph monadControl monadLogger monadLoops networkConduit pathPieces pem persistent persistentTemplate poolConduit primitive processConduit publicsuffixlist pureMD5 - pwstoreFast quickcheckIo resourcePool resourcet safe securemem - semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n - shakespeareJs shakespeareText silently simpleSendfile skein socks - stmChans stringsearch systemFileio systemFilepath tagged tagsoup - tagstreamConduit tls tlsExtra transformersBase unixCompat - unorderedContainers utf8Light utf8String vector void wai - waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit - xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm - yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings - zlibConduit + pwstoreFast quickcheckIo resourcePool resourcet safe scientific + securemem semigroups setenv SHA shakespeare shakespeareCss + shakespeareI18n shakespeareJs shakespeareText silently + simpleSendfile skein socks stmChans stringsearch systemFileio + systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra + transformersBase unixCompat unorderedContainers utf8Light + utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest + warp warpTls word8 xmlConduit xmlTypes xssSanitize yaml yesod + yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes + yesodStatic yesodTest zlibBindings zlibConduit ]; jailbreak = true; meta = { From 8088837dc8f35ef7853787f88bb1db7248900cc4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Jan 2014 17:38:55 +0100 Subject: [PATCH 118/118] haskell-hakyll: jailbreak to fix build with recent version of pandoc-citeproc --- pkgs/development/libraries/haskell/hakyll/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index d4f6561ff1bd..ace860bcd1cb 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -25,6 +25,9 @@ cabal.mkDerivation (self: { snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; + patchPhase = '' + sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal + ''; doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll";