[Nix-commits] SVN commit: nix - r29162 - nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase
Author: urkud
Date: Sun Sep 11 07:25:30 2011
New Revision: 29162
URL: https://ssl.nixos.org/websvn/nix/?rev=29162sc=1
Log:
Drop unused buildInput
Mark virtuoso as a runtime dependency of kdebase-runtime.
The propagatedUserEnvPackages is not used by buildEnv, but I'm going to let it
use this property (instead of/in addition to)
$prefix/nix-support/propagated-user-env-packages.
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix Sat Sep 10
20:09:11 2011(r29161)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix Sun Sep 11
07:25:30 2011(r29162)
@@ -1,15 +1,17 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
-, libcanberra, virtuoso, makeWrapper, samba
+, libcanberra, virtuoso, samba
}:
# TODO: Re-enable ntrack once it is fixed upstream
kde {
buildInputs =
-[ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica virtuoso
- makeWrapper samba (libcanberra.override { gtk = null; })
+[ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
+ samba (libcanberra.override { gtk = null; })
];
+ passthru.propagatedUserEnvPackages = [ virtuoso ];
+
meta = {
license = LGPL;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29163 - nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant
Author: urkud
Date: Sun Sep 11 07:27:01 2011
New Revision: 29163
URL: https://ssl.nixos.org/websvn/nix/?rev=29163sc=1
Log:
wpa_supplicant-0.7.3
Add D-Bus interface required by NM-0.9
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix Sun Sep
11 07:25:30 2011(r29162)
+++ nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix Sun Sep
11 07:27:01 2011(r29163)
@@ -1,10 +1,10 @@
-{stdenv, fetchurl, openssl, qt4, inkscape}:
+{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig}:
let
- version = 0.7.2;
+ version = 0.7.3;
src = fetchurl {
url = http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz;;
-sha256 = 1gnwhnczli50gidsq22ya68hixmdrhd1sxw202ygihvg6xsjl06z;
+sha256 = 0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh;
};
in
@@ -16,10 +16,22 @@
cd wpa_supplicant
cp -v defconfig .config
echo CONFIG_DEBUG_SYSLOG=y | tee -a .config
+echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config
+echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config
+echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config
substituteInPlace Makefile --replace /usr/local $out
'';
- buildInputs = [openssl];
+ buildInputs = [openssl dbus_libs];
+
+ buildNativeInputs = [ pkgconfig ];
+
+ # Upstream patch required for NetworkManager-0.9
+ patches = [ (fetchurl {
+url =
http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57;;
+name = wpa_supplicant-nm-0.9.patch;
+sha256 = 1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8;
+}) ];
postInstall = ''
ensureDir $out/share/man/man5 $out/share/man/man8
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29164 - nixpkgs/trunk/pkgs/development/compilers/ghc
Author: andres
Date: Sun Sep 11 09:14:22 2011
New Revision: 29164
URL: https://ssl.nixos.org/websvn/nix/?rev=29164sc=1
Log:
Bump GHC HEAD snapshot.
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix Sun Sep 11
07:27:01 2011(r29163)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix Sun Sep 11
09:14:22 2011(r29164)
@@ -1,7 +1,7 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
stdenv.mkDerivation rec {
- version = 7.3.20110825;
+ version = 7.3.20110910;
name = ghc-${version};
@@ -10,7 +10,7 @@
src = fetchurl {
url = ${homepage}/dist/current/dist/${name}-src.tar.bz2;
-sha256 = 06ngp3blg1nb1akiyxx2iypiwmybw4jg67lk9nmsn1jmj41v7dsm;
+sha256 = 1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5;
};
buildInputs = [ghc perl gmp ncurses];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: SVN commit: nix - r29158 - nixpkgs/branches/syscall-tracing/pkgs/stdenv
Hi Eelco,
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nixSat Sep
10 13:28:18 2011(r29157)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nixSat Sep
10 14:18:18 2011(r29158)
@@ -4,6 +4,7 @@
{ dietlibc, fetchurl, runCommand }:
+let pkgs = import /etc/nixos/nixpkgs { }; in
shouldn't that be
let pkgs = import (builtins.getEnv NIXPKGS_ALL) {}; in
...?
Take care,
Peter
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29165 - in nixpkgs/trunk/pkgs: development/libraries/haskell/shakespeare-text top-level
Author: simons
Date: Sun Sep 11 10:32:59 2011
New Revision: 29165
URL: https://ssl.nixos.org/websvn/nix/?rev=29165sc=1
Log:
haskell-shakespeare-text: added version 0.10.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text/
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text/default.nix
Sun Sep 11 10:32:59 2011(r29165)
@@ -0,0 +1,14 @@
+{ cabal, shakespeare, text }:
+
+cabal.mkDerivation (self: {
+ pname = shakespeare-text;
+ version = 0.10.1;
+ sha256 = 1p05nsfmlibhpik6dd40m0djk5yckl4i2ylx9lwyi68lx0izbm5j;
+ buildDepends = [ shakespeare text ];
+ meta = {
+homepage = http://www.yesodweb.com/book/templates;;
+description = Interpolation with quasi-quotation: put variables strings;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 09:14:22
2011(r29164)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 10:32:59
2011(r29165)
@@ -1075,9 +1075,11 @@
shakespeare = callPackage ../development/libraries/haskell/shakespeare {};
+ shakespeareCss = callPackage
../development/libraries/haskell/shakespeare-css {};
+
shakespeareJs = callPackage ../development/libraries/haskell/shakespeare-js
{};
- shakespeareCss = callPackage
../development/libraries/haskell/shakespeare-css {};
+ shakespeareText = callPackage
../development/libraries/haskell/shakespeare-text {};
Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix
{};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29166 - in nixpkgs/trunk/pkgs: development/libraries/haskell/hamlet top-level
Author: simons
Date: Sun Sep 11 10:33:08 2011
New Revision: 29166
URL: https://ssl.nixos.org/websvn/nix/?rev=29166sc=1
Log:
haskell-hamlet: updated to version 0.10.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.1.nix
- copied, changed from r29165,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.1.nix (from
r29165, nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix Sun Sep
11 10:32:59 2011(r29165, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.1.nix Sun Sep
11 10:33:08 2011(r29166)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = hamlet;
- version = 0.10.0;
- sha256 = 0xqlc03g0qnpnrw957108rpjbs88p9wwvcgmz7vc1f0k88lc0h6n;
+ version = 0.10.1;
+ sha256 = 1n68nz2s61j8yfwjpgp9bjl0mc7gcpc5ysmx0vgggqxz2r3gayf6;
buildDepends = [
blazeBuilder blazeHtml failure parsec shakespeare text
];
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 10:32:59
2011(r29165)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 10:33:08
2011(r29166)
@@ -634,8 +634,8 @@
};
hamlet_0_8_2_1 = callPackage
../development/libraries/haskell/hamlet/0.8.2.1.nix {};
- hamlet_0_10_0 = callPackage
../development/libraries/haskell/hamlet/0.10.0.nix {};
- hamlet = self.hamlet_0_10_0;
+ hamlet_0_10_1 = callPackage
../development/libraries/haskell/hamlet/0.10.1.nix {};
+ hamlet = self.hamlet_0_10_1;
happstackData = callPackage
../development/libraries/haskell/happstack/happstack-data.nix {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29167 - nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate
Author: simons
Date: Sun Sep 11 10:33:15 2011
New Revision: 29167
URL: https://ssl.nixos.org/websvn/nix/?rev=29167sc=1
Log:
haskell-authenticate: updated to version 0.10.2.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
Sun Sep 11 10:33:08 2011(r29166)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
Sun Sep 11 10:33:15 2011(r29167)
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = authenticate;
- version = 0.10.2;
- sha256 = 02zgl7r2jpiw2srd6bzxkhxmbzvggbqs4qd4fhv7jn5y4jbwaw75;
+ version = 0.10.2.1;
+ sha256 = 1bi46bls57wzmd90grrp6rpvgzsz064yi804b6pavq0pxiz1yaj9;
buildDepends = [
aesonNative attoparsec base64Bytestring blazeBuilder
caseInsensitive enumerator failure httpEnumerator httpTypes network
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29168 - nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template
Author: simons
Date: Sun Sep 11 10:33:23 2011
New Revision: 29168
URL: https://ssl.nixos.org/websvn/nix/?rev=29168sc=1
Log:
haskell-persistent-template: updated to version 0.6.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
Sun Sep 11 10:33:15 2011(r29167)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
Sun Sep 11 10:33:23 2011(r29168)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = persistent-template;
- version = 0.6.1;
- sha256 = 1ggfdq1d32i5ny57cvdf8yw5pwhbw2sc31mrj1whb0ggkcwaqh9l;
+ version = 0.6.2;
+ sha256 = 1gnqryn701b97fwzjhkk4x4k7p1w5w8cdn5x9hz8sb68vkgrplfx;
buildDepends = [ monadControl persistent text ];
meta = {
homepage = http://www.yesodweb.com/book/persistent;;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29169 - nixpkgs/trunk/pkgs/development/libraries/haskell/persistent
Author: simons
Date: Sun Sep 11 10:33:31 2011
New Revision: 29169
URL: https://ssl.nixos.org/websvn/nix/?rev=29169sc=1
Log:
haskell-persistent: updated to version 0.6.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Sun Sep 11 10:33:23 2011(r29168)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Sun Sep 11 10:33:31 2011(r29169)
@@ -1,14 +1,14 @@
-{ cabal, blazeHtml, enumerator, monadControl, mtl, parsec
-, pathPieces, pool, sqlite, text, time, transformers
+{ cabal, blazeHtml, enumerator, monadControl, mtl, pathPieces, pool
+, sqlite, text, time, transformers
}:
cabal.mkDerivation (self: {
pname = persistent;
- version = 0.6.1;
- sha256 = 1pb34n7rwj6jvk18c802kd99rrlhrav1hkx600rs6pp5zjic3mp7;
+ version = 0.6.2;
+ sha256 = 1bzv3wqqy32z20xbda8kr4m1fybnziv0gp6m8v3w0brrvmns20g2;
buildDepends = [
-blazeHtml enumerator monadControl mtl parsec pathPieces pool text
-time transformers
+blazeHtml enumerator monadControl mtl pathPieces pool text time
+transformers
];
extraLibraries = [ sqlite ];
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29170 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css
Author: simons
Date: Sun Sep 11 10:33:36 2011
New Revision: 29170
URL: https://ssl.nixos.org/websvn/nix/?rev=29170sc=1
Log:
haskell-shakespeare-css: updated to version 0.10.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Sun Sep 11 10:33:31 2011(r29169)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Sun Sep 11 10:33:36 2011(r29170)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = shakespeare-css;
- version = 0.10.0;
- sha256 = 12gdpxsh6x95m9vp0nrffri1bh8d6zhd7qqjrrkp49rvjf8fjwrk;
+ version = 0.10.1;
+ sha256 = 1qdql6qcm7jzb5r1fvrmpyighn1ykrjgs9za1n9m2r47y0n03hsg;
buildDepends = [ parsec shakespeare text ];
meta = {
homepage = http://www.yesodweb.com/book/templates;;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29171 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text
Author: simons Date: Sun Sep 11 10:33:43 2011 New Revision: 29171 URL: https://ssl.nixos.org/websvn/nix/?rev=29171sc=1 Log: haskell-shakespeare-text: updated to version 0.10.1 Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text/default.nix == --- nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text/default.nix Sun Sep 11 10:33:36 2011(r29170) +++ nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text/default.nix Sun Sep 11 10:33:43 2011(r29171) @@ -10,5 +10,9 @@ description = Interpolation with quasi-quotation: put variables strings; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; +maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons +]; }; }) ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29172 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare
Author: simons
Date: Sun Sep 11 10:33:49 2011
New Revision: 29172
URL: https://ssl.nixos.org/websvn/nix/?rev=29172sc=1
Log:
haskell-shakespeare: updated to version 0.10.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare/default.nix
Sun Sep 11 10:33:43 2011(r29171)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare/default.nix
Sun Sep 11 10:33:49 2011(r29172)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = shakespeare;
- version = 0.10.0;
- sha256 = 14q0z2q7c27pp6hnwzn50zjb4rzhy7znmahnzn8b59274jkbbzjs;
+ version = 0.10.1;
+ sha256 = 1ckzfxrs65n8cx0hm64c3jd4hbw48x1vi0cvnkz39k500jpq874f;
buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
meta = {
homepage = http://www.yesodweb.com/book/templates;;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29173 - nixpkgs/trunk/pkgs/development/libraries/haskell/wai
Author: simons
Date: Sun Sep 11 10:33:56 2011
New Revision: 29173
URL: https://ssl.nixos.org/websvn/nix/?rev=29173sc=1
Log:
haskell-wai: updated to version 0.4.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wai/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/wai/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wai/default.nixSun Sep
11 10:33:49 2011(r29172)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wai/default.nixSun Sep
11 10:33:56 2011(r29173)
@@ -4,13 +4,13 @@
cabal.mkDerivation (self: {
pname = wai;
- version = 0.4.1;
- sha256 = 089i9qj7vban1qdrdpx836c31yakg3l3lx7y36h56livy6n37k72;
+ version = 0.4.2;
+ sha256 = 18w4wzryyqcqqihwckbz92smkqhhxh3lmi0kgxkcgivyzvhd2jqy;
buildDepends = [
blazeBuilder enumerator httpTypes network text transformers
];
meta = {
-homepage = http://github.com/snoyberg/wai;;
+homepage = https://github.com/yesodweb/wai;;
description = Web Application Interface;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29175 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth
Author: simons
Date: Sun Sep 11 10:34:13 2011
New Revision: 29175
URL: https://ssl.nixos.org/websvn/nix/?rev=29175sc=1
Log:
haskell-yesod-auth: updated to version 0.7.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Sun Sep 11 10:34:04 2011(r29174)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Sun Sep 11 10:34:13 2011(r29175)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = yesod-auth;
- version = 0.7.1.1;
- sha256 = 1jh9m8knrgjrm553s3y239ryvk8cv84v5yq8zng20b7marrhfy0p;
+ version = 0.7.2;
+ sha256 = 18i1ijxrhmmxy45ymc89f7m2zazd7lca4jv4q08d7mr1hdgsx8cn;
buildDepends = [
aesonNative authenticate blazeHtml controlMonadAttempt hamlet
httpEnumerator mimeMail persistent persistentTemplate pureMD5
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29176 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core
Author: simons
Date: Sun Sep 11 10:34:17 2011
New Revision: 29176
URL: https://ssl.nixos.org/websvn/nix/?rev=29176sc=1
Log:
haskell-yesod-core: updated to version 0.9.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Sun Sep 11 10:34:13 2011(r29175)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Sun Sep 11 10:34:17 2011(r29176)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = yesod-core;
- version = 0.9.1.1;
- sha256 = 1cwywjks37i7411m6ab827q5vx1yjgnqn04am0bxzw001vciadm5;
+ version = 0.9.2;
+ sha256 = 1h9w5fgdr4w4ikp5axzxmsvc14ikbsjmlwd2lmlrh1cjcx8xzjwf;
buildDepends = [
blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie
enumerator failure hamlet httpTypes monadControl parsec pathPieces
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29177 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form
Author: simons
Date: Sun Sep 11 10:34:22 2011
New Revision: 29177
URL: https://ssl.nixos.org/websvn/nix/?rev=29177sc=1
Log:
haskell-yesod-form: updated to version 0.3.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Sun Sep 11 10:34:17 2011(r29176)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Sun Sep 11 10:34:22 2011(r29177)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = yesod-form;
- version = 0.3.1;
- sha256 = 0xa9950michbwlp90xcr8ybpig7f026zwq28lg03zavnaqisqkfj;
+ version = 0.3.2;
+ sha256 = 08lf4fqb9vp9xmj5y5diqyl0iv2gf254l5hspxyihnnnf1nsz69k;
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
persistent shakespeareCss shakespeareJs text time transformers wai
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29178 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod
Author: simons
Date: Sun Sep 11 10:34:26 2011
New Revision: 29178
URL: https://ssl.nixos.org/websvn/nix/?rev=29178sc=1
Log:
haskell-yesod: updated to version 0.9.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Sun Sep
11 10:34:22 2011(r29177)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Sun Sep
11 10:34:26 2011(r29178)
@@ -1,20 +1,21 @@
{ cabal, attoparsecText, blazeBuilder, blazeHtml, hamlet, httpTypes
-, monadControl, parsec, shakespeareCss, shakespeareJs, text, time
-, transformers, unixCompat, wai, waiExtra, warp, yesodAuth
-, yesodCore, yesodForm, yesodJson, yesodPersistent
+, monadControl, parsec, shakespeareCss, shakespeareJs
+, shakespeareText, text, time, transformers, unixCompat, wai
+, waiExtra, warp, yesodAuth, yesodCore, yesodForm, yesodJson
+, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = yesod;
- version = 0.9.1.1;
- sha256 = 1f1l9davhqdf6fnkcrclf2dvszqsw2jby7y865y4sgcb73jb32fp;
+ version = 0.9.2;
+ sha256 = 1074vbrab8c0nrmkv1fn4rm65fyfw08b3mj498cxala3nm382whd;
isLibrary = true;
isExecutable = true;
buildDepends = [
attoparsecText blazeBuilder blazeHtml hamlet httpTypes monadControl
-parsec shakespeareCss shakespeareJs text time transformers
-unixCompat wai waiExtra warp yesodAuth yesodCore yesodForm
-yesodJson yesodPersistent
+parsec shakespeareCss shakespeareJs shakespeareText text time
+transformers unixCompat wai waiExtra warp yesodAuth yesodCore
+yesodForm yesodJson yesodPersistent
];
meta = {
homepage = http://www.yesodweb.com/;;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29179 - in nixpkgs/trunk/pkgs: desktops/kde-4.7 desktops/kde-4.7/kde-baseapps desktops/kde-4.7/kde-package desktops/kde-4.7/kdebase desktops/kde-4.7/l10n top-level
Author: urkud
Date: Sun Sep 11 12:39:06 2011
New Revision: 29179
URL: https://ssl.nixos.org/websvn/nix/?rev=29179sc=1
Log:
KDE SC 4.7.1
Mostly automatic update. The only manual change caused by some movements on
projects.kde.org. Untested.
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-baseapps/
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
- copied, changed from r29178,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kate.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
- copied, changed from r29178,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-baseapps.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
- copied, changed from r29178,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/konsole.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-runtime.nix
- copied, changed from r29178,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-workspace.nix
- copied, changed from r29178,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix
Deleted:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Sun Sep 11 10:34:26
2011(r29178)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Sun Sep 11 12:39:06
2011(r29179)
@@ -1,7 +1,7 @@
{ callPackage, callPackageOrig, stdenv, qt47 }:
let
- release = 4.7.0;
+ release = 4.7.1;
# Need callPackageOrig to avoid infinite cycle
kde = callPackageOrig ./kde-package {
@@ -47,7 +47,12 @@
qt4 = qt47;
- kdebase_workspace = kde.individual.kde_workspace;
+ kdebase_workspace = kde.modules.kde_workspace;
+
+ kde_baseapps = kde.modules.kde_baseapps // {
+inherit (kde.individual) kate konsole;
+propagatedUserEnvPackages = [ kde.individual.kate kde.individual.konsole ];
+ };
inherit release;
Copied and modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
(from r29178, nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kate.nix)
==
Copied and modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix (from r29178,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-baseapps.nix)
==
Copied and modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix (from r29178,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/konsole.nix)
==
Added: nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix Sun Sep 11
12:39:06 2011(r29179)
@@ -0,0 +1,273 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+
{name=blinken;value=0946y6g67bqbkdcnqas97izr514190f08qzq5jg12xjv3q5i9xnr;}
+ {name=cantor;value=1yipf6019nr1vacdl1mp6wwffwaq7khyh1rp5wx0f3y70p7q6w8v;}
+
{name=gwenview;value=00vxhpg2481pz7bh0kac1fsl8dawjlxm7x38y572802qbhd02jr4;}
+
{name=kalgebra;value=1rkl8jyiqi9ymwl4inflgwg2252k5x5yag25zr8crwg1ax9rvmhv;}
+
{name=kalzium;value=110l065vwjfyjr0130xklrsr3jwlqb27fv9mhc9w5v9i5shl79xm;}
+ {name=kamera;value=17sac0bydq4d2rv63jzjy87dry9g3n6chw7gg6nncisvkgz1dyz2;}
+
{name=kanagram;value=10nhgb1gf5vh6767xrbfwicdhw4kd3za4lnwrsww823dqpi6cryz;}
+ {name=kate;value=1n3zs4rs3y4z9g2ssiqi6jy7c2li0pah2p0vsdjw0ifq0xqvvz67;}
+ {name=kbruch;value=0x3y5gbq4xhqjrp4g91v3wjggrimxx6k8nsvny0ykriqql6xzq77;}
+
{name=kcolorchooser;value=1fwjf0fys3iz4c86jfhzq6j43ps7jiab9qhspkv6cvnv1dyi0ryy;}
+
{name=kdeaccessibility;value=1980y2vqxkhz40xkkljqawkafshhrimlyb7hvk5waz9a2jz0vwwj;}
+
{name=kdeadmin;value=1614acnvycihysxy3k26q8xsxswsx73m32n0c34hb0d5xj87ndk0;}
+
{name=kdeartwork;value=0xsmq5x9lbplj3rxza0lxxdbnz5srmxjzw993rzwj9687jvgi6hv;}
+
{name=kde-baseapps;value=1jpfslapsl4l7yqxq4cry0dwj2hps2s6kayj81dcs2crqrz75plc;}
+
{name=kdegames;value=0b3zljmkhyml31kfj9n75sa9h3xknn8v0y099mdc1wcny7p7zyrl;}
+
{name=kdegraphics-strigi-analyzer;value=1xnaipyn29wa5i26rgv2jbijii64qklz5fgcy49zpd0pxqnkxxwl;}
+
{name=kdegraphics-thumbnailers;value=07nvydwzzwnr1a5x3v732mry1qw7lvn8l3h3b73r6fvmnhs91iyp;}
+
{name=kdelibs;value=1gwgilr2m95m8w4q55d79g3qsgpq5jv7aq7crq7xbrhz3smv6ciw;}
+
{name=kdemultimedia;value=1p76vrzr1wmlpnkspy9nf8v1am6bdi5wc6zl4y9lp6y6qv9diz1w;}
+
[Nix-commits] SVN commit: nix - r29180 - nixos/trunk/modules/misc
Author: urkud
Date: Sun Sep 11 12:41:47 2011
New Revision: 29180
URL: https://ssl.nixos.org/websvn/nix/?rev=29180sc=1
Log:
Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config
Namely, allow {pkgs}: { packageOverrides = p: ...; };
Modified:
nixos/trunk/modules/misc/nixpkgs.nix
Modified: nixos/trunk/modules/misc/nixpkgs.nix
==
--- nixos/trunk/modules/misc/nixpkgs.nixSun Sep 11 12:39:06 2011
(r29179)
+++ nixos/trunk/modules/misc/nixpkgs.nixSun Sep 11 12:41:47 2011
(r29180)
@@ -11,7 +11,11 @@
then f x
else f;
- mergeConfig = lhs: rhs:
+ mergeConfig = lhs_: rhs_:
+let
+ lhs = optCall lhs_ { inherit pkgs; };
+ rhs = optCall rhs_ { inherit pkgs; };
+in
lhs // rhs //
optionalAttrs (lhs ? packageOverrides) {
packageOverrides = pkgs:
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29181 - nixos/trunk/modules/services/x11/desktop-managers
Author: urkud Date: Sun Sep 11 12:44:54 2011 New Revision: 29181 URL: https://ssl.nixos.org/websvn/nix/?rev=29181sc=1 Log: Adjust DM/kde4.nix to latest changes in kde-4.7 Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix == --- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Sun Sep 11 12:41:47 2011(r29180) +++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Sun Sep 11 12:44:54 2011(r29181) @@ -106,7 +106,13 @@ else # KDE = 4.7 [ pkgs.kde4.kdelibs - pkgs.kde4.kdebase # contains kde-workspace etc. + + pkgs.kde4.kde_baseapps # Splitted kdebase + pkgs.kde4.kde_workspace + pkgs.kde4.kde_runtime + pkgs.kde4.konsole + pkgs.kde4.kate + pkgs.kde4.kde_wallpapers # contains kdm's default background pkgs.kde4.oxygen_icons pkgs.virtuoso # to enable Nepomuk to find Virtuoso ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29182 - configurations/trunk/tud
Author: eelco
Date: Sun Sep 11 14:18:39 2011
New Revision: 29182
URL: https://ssl.nixos.org/websvn/nix/?rev=29182sc=1
Log:
* Move the JIRA DB to webdsl.org.
Modified:
configurations/trunk/tud/mrkitty.nix
configurations/trunk/tud/network.nix
Modified: configurations/trunk/tud/mrkitty.nix
==
--- configurations/trunk/tud/mrkitty.nixSun Sep 11 12:44:54 2011
(r29181)
+++ configurations/trunk/tud/mrkitty.nixSun Sep 11 14:18:39 2011
(r29182)
@@ -8,7 +8,7 @@
jiraJetty = (import ../../services/jira/jira-instance.nix {
inherit pkgs;
-dbHost = 192.168.1.25;
+dbHost = 130.161.159.114; # webdsl.org
dbPassword = import ./jira-password.nix;
}).jetty;
Modified: configurations/trunk/tud/network.nix
==
--- configurations/trunk/tud/network.nixSun Sep 11 12:44:54 2011
(r29181)
+++ configurations/trunk/tud/network.nixSun Sep 11 14:18:39 2011
(r29182)
@@ -8,6 +8,6 @@
wendy = import ./wendy.nix;
ike = import ./build-machines-dell-r815.nix;
shelley = import ./build-machines-dell-r815.nix;
- #mrkitty = import ./mrkitty.nix;
+ mrkitty = import ./mrkitty.nix;
#mrhankey = import ./mrhankey.nix;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29183 - nixpkgs/trunk/pkgs/top-level
Author: andres
Date: Sun Sep 11 15:18:53 2011
New Revision: 29183
URL: https://ssl.nixos.org/websvn/nix/?rev=29183sc=1
Log:
Updating comments: latest ghc-7.3 snapshot succeeds on more packages.
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 14:18:39
2011(r29182)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 15:18:53
2011(r29183)
@@ -124,7 +124,7 @@
haskellPlatformArgs_future = self : {
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4; # 7.2 ok, 7.3 ok
-fgl = self.fgl_5_4_2_4; # 7.2 ok, 7.3 fails
+fgl = self.fgl_5_4_2_4; # 7.2 ok, 7.3 ok
GLUT = self.GLUT_2_1_2_1; # 7.2 ok, 7.3 ok
haskellSrc = self.haskellSrc_1_0_1_4; # 7.2 fails, 7.3 fails
html = self.html_1_0_1_2; # 7.2 ok, 7.3 ok
@@ -141,9 +141,9 @@
syb = self.syb_0_3_3; # 7.2 ok, 7.3 ok
xhtml= self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
-HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 fails
+HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 ok
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
-text = self.text_0_11_1_5; # 7.2 ok, 7.3 fails
+text = self.text_0_11_1_5; # 7.2 ok, 7.3 ok
transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok
mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok
random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29184 - configurations/trunk/tud
Author: eelco
Date: Sun Sep 11 15:54:18 2011
New Revision: 29184
URL: https://ssl.nixos.org/websvn/nix/?rev=29184sc=1
Log:
* Lucifer no longer needs a PostgreSQL server.
Modified:
configurations/trunk/tud/lucifer.nix
Modified: configurations/trunk/tud/lucifer.nix
==
--- configurations/trunk/tud/lucifer.nixSun Sep 11 15:18:53 2011
(r29183)
+++ configurations/trunk/tud/lucifer.nixSun Sep 11 15:54:18 2011
(r29184)
@@ -64,20 +64,6 @@
services.hydraChannelMirror.period = 0-59/15 * * * *;
services.hydraChannelMirror.dataDir = /data/releases;
- services.postgresql = {
-enable = true;
-enableTCPIP = true;
-dataDir = /data/postgresql;
-authentication =
- ''
-local all mediawikiident mediawiki-users
-local all all ident sameuser
-host all all 127.0.0.1/32 md5
-host all all ::1/128 md5
-host all all 192.168.1.0/24 md5
- '';
- };
-
services.tomcat = {
enable = true;
baseDir = /data/tomcat;
@@ -87,7 +73,6 @@
+ -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/data/tomcat/logs/java_pidpid.hprof;
};
-
services.cron.systemCronJobs =
[ */5 * * * * hydra-mirror flock -x /data/releases/.lock -c
/home/hydra-mirror/release/mirror/mirror-nixos-isos.sh
/home/hydra-mirror/nixos-mirror.log 21 ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29185 - nixos/trunk/modules/services/monitoring
Author: eelco
Date: Sun Sep 11 15:55:43 2011
New Revision: 29185
URL: https://ssl.nixos.org/websvn/nix/?rev=29185sc=1
Log:
* Zabbix: only enable PostgreSQL if it's on the same machine.
Modified:
nixos/trunk/modules/services/monitoring/zabbix-server.nix
Modified: nixos/trunk/modules/services/monitoring/zabbix-server.nix
==
--- nixos/trunk/modules/services/monitoring/zabbix-server.nix Sun Sep 11
15:54:18 2011(r29184)
+++ nixos/trunk/modules/services/monitoring/zabbix-server.nix Sun Sep 11
15:55:43 2011(r29185)
@@ -63,7 +63,7 @@
config = mkIf cfg.enable {
-services.postgresql.enable = true;
+services.postgresql.enable = cfg.dbServer == localhost;
users.extraUsers = singleton
{ name = zabbix;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29187 - nixpkgs/trunk/pkgs/applications/version-management/veracity
Author: raskin
Date: Sun Sep 11 16:46:17 2011
New Revision: 29187
URL: https://ssl.nixos.org/websvn/nix/?rev=29187sc=1
Log:
Fixing some of Veracity tests
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
==
--- nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Sun Sep 11 16:45:42 2011(r29186)
+++ nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Sun Sep 11 16:46:17 2011(r29187)
@@ -31,7 +31,8 @@
mkdir pseudo-home
export HOME=$PWD/pseudo-home
export LC_ALL=en_US.UTF-8
-${if a.stdenv.isLinux then export
LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale-archive; else }
+export LANG=en_US.UTF-8
+${if a.stdenv.isLinux then export
LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale/locale-archive; else }
make test || true
'' else ) [doMake minInit];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29188 - in nixpkgs/trunk/pkgs: development/interpreters/love top-level
Author: raskin
Date: Sun Sep 11 17:05:48 2011
New Revision: 29188
URL: https://ssl.nixos.org/websvn/nix/?rev=29188sc=1
Log:
Adding LOVE Lua-based game framework/interpreter
Added:
nixpkgs/trunk/pkgs/development/interpreters/love/
nixpkgs/trunk/pkgs/development/interpreters/love/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/interpreters/love/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/interpreters/love/default.nixSun Sep
11 17:05:48 2011(r29188)
@@ -0,0 +1,58 @@
+x@{builderDefsPackage
+ , lua5, mpg123, physfs, freetype, libdevil, openal, SDL, libvorbis
+ , libogg, flac, mesa, libtiff, libpng, libjpeg, libmodplug
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=love;
+version=0.7.2;
+name=${baseName}-${version};
+url=https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz;;
+hash=0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5;
+ };
+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 = [setVars fixSrc doConfigure doMakeInstall];
+
+ fixSrc =a.fullDepEntry ''
+sed -e '/typedef void (\*__GLXextFuncPtr)/d' -i
src/modules/graphics/opengl/GLee.h
+ '' [minInit doUnpack];
+
+ setVars = a.noDepEntry ''
+export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL
+export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE
-I${freetype}/include/freetype2
+ '';
+
+ meta = {
+description = A Lua-based 2D game engine/scripting language;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.zlib;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://love2d.org/;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Sep 11 16:46:17
2011(r29187)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Sep 11 17:05:48
2011(r29188)
@@ -2490,6 +2490,8 @@
kona = callPackage ../development/interpreters/kona {};
+ love = callPackage ../development/interpreters/love {};
+
lua4 = callPackage ../development/interpreters/lua-4 { };
lua5 = callPackage ../development/interpreters/lua-5 { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29189 - nixpkgs/trunk/pkgs/top-level
Author: shlevy
Date: Sun Sep 11 18:28:14 2011
New Revision: 29189
URL: https://ssl.nixos.org/websvn/nix/?rev=29189sc=1
Log:
Fix evaluation errors for haskellPackages.gtk on darwin. Note that the build is
currently not successful.
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 17:05:48
2011(r29188)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 18:28:14
2011(r29189)
@@ -434,6 +434,7 @@
cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib;
+glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
caseInsensitive_0_3 = callPackage
../development/libraries/haskell/case-insensitive/0.3.nix {};
@@ -601,6 +602,7 @@
glib = callPackage ../development/libraries/haskell/glib {
glib = pkgs.glib;
+glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
@@ -616,6 +618,7 @@
gtk = callPackage ../development/libraries/haskell/gtk {
inherit (pkgs.gtkLibs) gtk;
+glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
gtk2hsBuildtools = callPackage
../development/libraries/haskell/gtk2hs-buildtools {};
@@ -891,6 +894,7 @@
pango = callPackage ../development/libraries/haskell/pango {
inherit (pkgs.gtkLibs) pango;
+glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
parallel_1_1_0_1 = callPackage
../development/libraries/haskell/parallel/1.1.0.1.nix {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] BuilderDefs
Hi,
On 09/11/2011 06:45 PM, Michael Raskin wrote:
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
(snip)
Could you stick to the standard way of writing packages? That is,
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = libmodplug-0.8.8.4;
src = fetchurl { ... };
meta = ...;
}
That style is easier to read, shorter, uses fewer strange idioms
(‘helperArgNames’?), is better documented, and easier to maintain by
others (because it is the standard notation).
The purported advantage of builderDefs (making it easier to customise
build phases etc.) I haven't really seen in practice — stdenv's
setup.sh has plenty of customisation mechanisms.
--
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29189 - nixpkgs/trunk/pkgs/top-level
Hi,
On 09/11/2011 08:28 PM, Shea Levy wrote:
cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib;
+glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
A better approach is to have cairo use the stdenv.gcc.libc attribute,
which is null on impure platforms such as Darwin.
--
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29190 - in nixpkgs/trunk/pkgs: development/libraries/haskell/cairo development/libraries/haskell/glib development/libraries/haskell/gtk development/libraries/haskell/p
Author: shlevy
Date: Sun Sep 11 18:48:46 2011
New Revision: 29190
URL: https://ssl.nixos.org/websvn/nix/?rev=29190sc=1
Log:
haskellPackages.{cairo,pango,glib,gtk}: Depend on the stdenv libc instead of
glibc
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix Sun Sep
11 18:28:14 2011(r29189)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix Sun Sep
11 18:48:46 2011(r29190)
@@ -1,4 +1,4 @@
-{ cabal, cairo, glibc, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
+{ cabal, cairo, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
cabal.mkDerivation (self: {
pname = cairo;
@@ -6,7 +6,7 @@
sha256 = 0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9;
buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ cairo glibc pkgconfig zlib ];
+ extraLibraries = [ cairo self.stdenv.gcc.libc pkgconfig zlib ];
pkgconfigDepends = [ cairo ];
meta = {
homepage = http://www.haskell.org/gtk2hs/;;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix Sun Sep
11 18:28:14 2011(r29189)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix Sun Sep
11 18:48:46 2011(r29190)
@@ -1,11 +1,11 @@
-{ cabal, glib, glibc, gtk2hsBuildtools, pkgconfig }:
+{ cabal, glib, gtk2hsBuildtools, pkgconfig }:
cabal.mkDerivation (self: {
pname = glib;
version = 0.12.0;
sha256 = 1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19;
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
pkgconfigDepends = [ glib ];
meta = {
homepage = http://www.haskell.org/gtk2hs/;;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nixSun Sep
11 18:28:14 2011(r29189)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nixSun Sep
11 18:48:46 2011(r29190)
@@ -1,4 +1,4 @@
-{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, mtl, pango
+{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango
, pkgconfig
}:
@@ -8,7 +8,7 @@
sha256 = 1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2;
buildDepends = [ cairo glib mtl pango ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
pkgconfigDepends = [ glib gtk ];
meta = {
homepage = http://www.haskell.org/gtk2hs/;;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix Sun Sep
11 18:28:14 2011(r29189)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix Sun Sep
11 18:48:46 2011(r29190)
@@ -1,4 +1,4 @@
-{ cabal, cairo, glib, glibc, gtk2hsBuildtools, mtl, pango
+{ cabal, cairo, glib, gtk2hsBuildtools, mtl, pango
, pkgconfig
}:
@@ -8,7 +8,7 @@
sha256 = 1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb;
buildDepends = [ cairo glib mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
pkgconfigDepends = [ cairo pango ];
meta = {
homepage = http://www.haskell.org/gtk2hs/;;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 18:28:14
2011(r29189)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 18:48:46
2011(r29190)
@@ -434,7 +434,6 @@
cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib;
-glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
caseInsensitive_0_3 = callPackage
../development/libraries/haskell/case-insensitive/0.3.nix {};
@@ -602,7 +601,6 @@
glib = callPackage ../development/libraries/haskell/glib {
glib = pkgs.glib;
-glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
GlomeVec = callPackage
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29189 - nixpkgs/trunk/pkgs/top-level
Hi,
On 09/11/2011 08:28 PM, Shea Levy wrote:
cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib;
+glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
A better approach is to have cairo use the stdenv.gcc.libc attribute,
which is null on impure platforms such as Darwin.
--
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
Thanks, fixed.
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29191 - nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils
Author: shlevy
Date: Sun Sep 11 18:58:24 2011
New Revision: 29191
URL: https://ssl.nixos.org/websvn/nix/?rev=29191sc=1
Log:
GNU Coreutils 8.13
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
Sun Sep 11 18:48:46 2011(r29190)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
Sun Sep 11 18:58:24 2011(r29191)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gmp ? null
+{ stdenv, fetchurl, perl, xz, gmp ? null
, aclSupport ? false, acl ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null }:
@@ -6,14 +6,14 @@
assert selinuxSupport - ( (libselinux != null) (libsepol != null) );
stdenv.mkDerivation (rec {
- name = coreutils-8.10;
+ name = coreutils-8.13;
src = fetchurl {
-url = mirror://gnu/coreutils/${name}.tar.gz;
-sha256 = 11fr0hkdk9h7a5ggpp3hj45ryvq3gc8ri2kksbgn7v8rjmp1x1jb;
+url = mirror://gnu/coreutils/${name}.tar.xz;
+sha256 = 06xc4jfkr5h8pc6wq14ncihapf5chcwvvcjvpwkby1ngw0xbxz8b;
};
- buildNativeInputs = [ perl ];
+ buildNativeInputs = [ perl xz ];
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl
++ stdenv.lib.optional selinuxSupport libselinux
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: SVN commit: nix - r29158 - nixpkgs/branches/syscall-tracing/pkgs/stdenv
Peter Simons wrote:
Hi Eelco,
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Sat
Sep
10 13:28:18 2011 (r29157)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Sat
Sep
10 14:18:18 2011 (r29158) @@ -4,6 +4,7 @@
{ dietlibc, fetchurl, runCommand }:
+let pkgs = import /etc/nixos/nixpkgs { }; in
shouldn't that be
let pkgs = import (builtins.getEnv NIXPKGS_ALL) {}; in
...?
Or better import ../../ {};?
--
Yury G. Kudryashov,
mailto: ur...@mccme.ru
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29192 - patchelf/trunk/src
Author: eelco
Date: Sun Sep 11 20:10:14 2011
New Revision: 29192
URL: https://ssl.nixos.org/websvn/nix/?rev=29192sc=1
Log:
* Support executables created by the Gold linker (NixOS/140). These
are marked as ET_DYN (not ET_EXEC) and have a starting virtual
address of 0 so they cannot grow downwards. In order not to run
into a Linux kernel bug, the virtual address and the offset of the
new PT_LOAD segment have to be equal; otherwise ld-linux segfaults.
To ensure this, it may be necessary to add some padding to the
executable (potentially a lot of padding, if the executable has a
large uninitialised data segment).
* Use size_t rather than off_t in some places.
Modified:
patchelf/trunk/src/patchelf.cc
Modified: patchelf/trunk/src/patchelf.cc
==
--- patchelf/trunk/src/patchelf.cc Sun Sep 11 18:58:24 2011(r29191)
+++ patchelf/trunk/src/patchelf.cc Sun Sep 11 20:10:14 2011(r29192)
@@ -55,6 +55,8 @@
bool changed;
+bool isExecutable;
+
typedef string SectionName;
typedef mapSectionName, string ReplacedSections;
@@ -245,6 +247,8 @@
templateElfFileParams
void ElfFileElfFileParamNames::parse()
{
+isExecutable = false;
+
/* Check the ELF header for basic validity. */
if (fileSize (off_t) sizeof(Elf_Ehdr)) error(missing ELF header);
@@ -268,8 +272,10 @@
error(program headers have wrong size);
/* Copy the program and section headers. */
-for (int i = 0; i rdi(hdr-e_phnum); ++i)
+for (int i = 0; i rdi(hdr-e_phnum); ++i) {
phdrs.push_back(* ((Elf_Phdr *) (contents + rdi(hdr-e_phoff)) + i));
+if (rdi(phdrs[i].p_type) == PT_INTERP) isExecutable = true;
+}
for (int i = 0; i rdi(hdr-e_shnum); ++i)
shdrs.push_back(* ((Elf_Shdr *) (contents + rdi(hdr-e_shoff)) + i));
@@ -486,7 +492,7 @@
{
string sectionName = i-first;
Elf_Shdr shdr = findSection(sectionName);
-debug(rewriting section `%s' from offset %d (size %d) to offset %d
(size %d)\n,
+debug(rewriting section `%s' from offset 0x%x (size %d) to offset
0x%x (size %d)\n,
sectionName.c_str(), rdi(shdr.sh_offset), rdi(shdr.sh_size),
curOff, i-second.size());
memcpy(contents + curOff, (unsigned char *) i-second.c_str(),
@@ -552,11 +558,40 @@
debug(needed space is %d\n, neededSpace);
-off_t startOffset = roundUp(fileSize, pageSize);
+size_t startOffset = roundUp(fileSize, pageSize);
growFile(startOffset + neededSpace);
+/* Even though this file is of type ET_DYN, it could actually be
+ an executable. For instance, Gold produces executables marked
+ ET_DYN. In that case we can still hit the kernel bug that
+ necessitated rewriteSectionsExecutable(). However, such
+ executables also tend to start at virtual address 0, so
+ rewriteSectionsExecutable() won't work because it doesn't have
+ any virtual address space to grow downwards into. As a
+ workaround, make sure that the virtual address of our new
+ PT_LOAD segment relative to the first PT_LOAD segment is equal
+ to its offset; otherwise we hit the kernel bug. This may
+ require creating a hole in the executable. The bigger the size
+ of the uninitialised data segment, the bigger the hole. */
+if (isExecutable) {
+if (startOffset = startPage) {
+debug(shifting new PT_LOAD segment by %d bytes to work around a
Linux kernel bug\n, startOffset - startPage);
+} else {
+size_t hole = startPage - startOffset;
+/* Print a warning, because the hole could be very big. */
+fprintf(stderr, warning: working around a Linux kernel bug by
creating a hole of %zu bytes in ‘%s’\n, hole, fileName.c_str());
+assert(hole % pageSize == 0);
+/* !!! We could create an actual hole in the file here,
+ but it's probably not worth the effort. */
+growFile(fileSize + hole);
+startOffset += hole;
+}
+startPage = startOffset;
+}
+
+
/* Add a segment that maps the replaced sections and program
headers into memory. */
phdrs.resize(rdi(hdr-e_phnum) + 1);
@@ -610,7 +645,7 @@
SHT_PROGBITS). These cannot be moved in virtual address space
since that would invalidate absolute references to them. */
assert(lastReplaced + 1 shdrs.size()); /* !!! I'm lazy. */
-off_t startOffset = rdi(shdrs[lastReplaced + 1].sh_offset);
+size_t startOffset = rdi(shdrs[lastReplaced + 1].sh_offset);
Elf_Addr startAddr = rdi(shdrs[lastReplaced + 1].sh_addr);
string prevSection;
for (unsigned int i = 1; i = lastReplaced; ++i) {
@@ -651,7 +686,7 @@
/* Compute the total space needed for the replaced sections, the
ELF header, and the program headers. */
-
[Nix-commits] SVN commit: nix - r29193 - homepage/trunk/css
Author: eelco
Date: Sun Sep 11 20:16:33 2011
New Revision: 29193
URL: https://ssl.nixos.org/websvn/nix/?rev=29193sc=1
Log:
Modified:
homepage/trunk/css/nixos-site.css
Modified: homepage/trunk/css/nixos-site.css
==
--- homepage/trunk/css/nixos-site.css Sun Sep 11 20:10:14 2011(r29192)
+++ homepage/trunk/css/nixos-site.css Sun Sep 11 20:16:33 2011(r29193)
@@ -5,7 +5,7 @@
/* The main container element. */
div#page {
-max-width: 55em;
+max-width: 80%;
margin: 1em auto;
background-color: white;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29194 - homepage/trunk/css
Author: eelco
Date: Sun Sep 11 20:17:32 2011
New Revision: 29194
URL: https://ssl.nixos.org/websvn/nix/?rev=29194sc=1
Log:
* The Nix homepage used to use nix-common.css from Hydra, but that one
got replaced by an empty file for some reason.
Added:
homepage/trunk/css/nix-common.css
- copied unchanged from r18751,
hydra/trunk/src/root/static/css/nix-common.css
Copied: homepage/trunk/css/nix-common.css (from r18751,
hydra/trunk/src/root/static/css/nix-common.css)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ homepage/trunk/css/nix-common.css Sun Sep 11 20:17:32 2011
(r29194, copy of r18751, hydra/trunk/src/root/static/css/nix-common.css)
@@ -0,0 +1,85 @@
+body {
+font-family: sans-serif;
+background: white;
+margin: 2em 1em 2em 1em;
+}
+
+h1, h2, h3 {
+font-weight: bold;
+color: #005aa0;
+}
+
+h1 {
+font-size: 180%;
+}
+
+h2 {
+font-size: 130%;
+margin-top: 1em;
+}
+
+h3 {
+font-size: 100%;
+}
+
+table {
+empty-cells: show;
+border-collapse: collapse;
+border-spacing: 0px;
+}
+
+tr.odd {
+background: #f4f4ff;
+}
+
+th {
+text-align: center;
+font-weight: bold;
+background: #c0;
+}
+
+td, th {
+padding: 2px 5px;
+border: solid black 1px;
+}
+
+td {
+vertical-align: top;
+}
+
+td.centered {
+text-align: center;
+}
+
+a {
+text-decoration: none;
+}
+
+a:hover, a:visited:hover {
+text-decoration: underline;
+}
+
+a:link { color: #0048b3; }
+a:visited { color: #002a6a; }
+a.no-hover:hover { background: none; }
+
+img {
+border-style: none;
+}
+
+li {
+margin-top: 0.5em;
+margin-bottom: 0.5em;
+}
+
+pre {
+margin-left: 1.5em;
+margin-right: 1.5em;
+}
+
+pre.code {
+border: 1px solid #6185a0;
+padding: 6px 6px;
+color: #60;
+background: #f4f4f8;
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29195 - hydra/trunk/src/root/static/css
Author: eelco Date: Sun Sep 11 20:17:59 2011 New Revision: 29195 URL: https://ssl.nixos.org/websvn/nix/?rev=29195sc=1 Log: * Remove empty file. Deleted: hydra/trunk/src/root/static/css/nix-common.css ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29196 - homepage/trunk/css
Author: eelco
Date: Sun Sep 11 20:37:16 2011
New Revision: 29196
URL: https://ssl.nixos.org/websvn/nix/?rev=29196sc=1
Log:
Modified:
homepage/trunk/css/nix-common.css
Modified: homepage/trunk/css/nix-common.css
==
--- homepage/trunk/css/nix-common.css Sun Sep 11 20:17:59 2011(r29195)
+++ homepage/trunk/css/nix-common.css Sun Sep 11 20:37:16 2011(r29196)
@@ -1,5 +1,5 @@
body {
-font-family: sans-serif;
+font-family: Nimbus Sans L, sans-serif;
background: white;
margin: 2em 1em 2em 1em;
}
@@ -83,3 +83,10 @@
color: #60;
background: #f4f4f8;
}
+
+/* Consistent font size for monospaced elements. See
+ http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */
+tt, code, pre {
+font-family: monospace, sans-serif;
+font-size: 95%;
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29197 - in nixpkgs/trunk/pkgs: applications/networking/browsers/chromium development/tools/misc/patchelf
Author: eelco
Date: Sun Sep 11 20:48:02 2011
New Revision: 29197
URL: https://ssl.nixos.org/websvn/nix/?rev=29197sc=1
Log:
* Chromium updated to the latest version. Because Chromium now used
Gold, this requires a new patchelf.
* Changed the package name from ‘chrome’ to ‘chromium’.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
nixpkgs/trunk/pkgs/development/tools/misc/patchelf/0.6.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
Sun Sep 11 20:37:16 2011(r29196)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
Sun Sep 11 20:48:02 2011(r29197)
@@ -2,23 +2,28 @@
, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11
, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
, libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
-, stdenv, unzip, zlib, pam }:
+, stdenv, unzip, zlib, pam, pcre }:
assert stdenv.system == i686-linux || stdenv.system == x86_64-linux ;
stdenv.mkDerivation rec {
- name = chrome-${version};
- version = 88807;
+ name = chromium-16.0.879.0-pre${version};
+
+ # To determine the latest revision, get
+ #
‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’.
+ # For the version number, see ‘about:config’.
+ version = 100626;
+
src =
if stdenv.system == x86_64-linux then
fetchurl {
url =
http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip;;
-sha256 =
c158f58fa8220782ec8dec4170f90c564b978d1c6ead298cc2f67e84613f17b1;
+sha256 = 1dymz7h9v5hkivn6qn26bnj1waw60z3mngh8g46yvvc5xn4npc3l;
}
else if stdenv.system == i686-linux then
fetchurl {
url =
http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip;;
-sha256 = 01sr882c7hr53001p8bnk5vyj8zfjm6r3i4a6wxzxd17xjh1bcxb;
+sha256 = 0zqaj90lfzdddbs6sjygmyxlh8nw3xfr9xw450g9cabg6a2sh7ca;
}
else throw Chromium is not supported on this platform.;
@@ -31,7 +36,7 @@
[ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
ffmpeg fontconfig freetype libX11 libXScrnSaver
libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
- libpng nspr nss stdenv.gcc.gcc zlib stdenv.gcc.libc
+ libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango
pam
];
@@ -41,6 +46,8 @@
ensureDir $out/libexec/chrome
cp -R * $out/libexec/chrome
+
+strip $out/libexec/chrome/chrome
${patchelf}/bin/patchelf \
--interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) \
@@ -48,7 +55,7 @@
$out/libexec/chrome/chrome
makeWrapper $out/libexec/chrome/chrome $out/bin/chrome \
- --prefix LD_LIBRARY_PATH : ${nss}/lib
+ --prefix LD_LIBRARY_PATH : ${pcre}/lib:${nss}/lib
'';
meta = with stdenv.lib; {
Modified: nixpkgs/trunk/pkgs/development/tools/misc/patchelf/0.6.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/patchelf/0.6.nix Sun Sep 11
20:37:16 2011(r29196)
+++ nixpkgs/trunk/pkgs/development/tools/misc/patchelf/0.6.nix Sun Sep 11
20:48:02 2011(r29197)
@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = patchelf-0.6pre23458;
-
+ name = patchelf-0.6pre29192;
+
src = fetchurl {
-url =
http://hydra.nixos.org/build/838169/download/2/patchelf-0.6pre23458.tar.bz2;;
-sha256 = 18d74n14s4xh8aqwisvz63gx9j4d5b9bzb8k1jnp8whvvwzasdq5;
+url = http://hydra.nixos.org/build/1319933/download/2/${name}.tar.bz2;;
+sha256 =
1873d76994c112355f53d1ac6233ce334d0852ce67cae6b21f492b9b8e0b48b5;
};
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] NixOS - Issue 140
NixOS #140 (29 Aug)patchelf fails tests when linked with gold linkerIssue has been closed by Eelco Dolstra, saying:This should be fixed in r29192. (Tested on the Chromium binary.) -- Issue on YellowGrass -- http://yellowgrass.org -- ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] Hydra job nixpkgs:trunk:tarball build 1320117: Failed with non-zero exit code
Hi, This is to let you know that Hydra build 1320117 of job nixpkgs:trunk:tarball has changed from 'Success' to 'Failed with non-zero exit code'. Complete build information can be found on this page: http://hydra.nixos.org/build/1320117 The last 50 lines of the build log are shown at the bottom of this email. A summary of the build information follows: Build ID: | 1320117 Nix name: | nixpkgs-tarball-0pre29197 Short description: | Build of a source distribution from a checkout Maintainer(s): | Nix Committers nix-comm...@cs.uu.nl System:| x86_64-linux Derivation store path: | /nix/store/86iijcwwlni413ljl7fljmqwdfqgk5aw-nixpkgs-tarball-0pre29197.drv Output store path: | /nix/store/9zj02i3bpizmdmhx8x736w5m22l54mch-nixpkgs-tarball-0pre29197 Time added:| 2011-09-11 23:18:29 Build started: | 2011-09-11 23:18:28 Build finished:| 2011-09-11 23:18:29 Duration: | 1s The build inputs were: Name| Type| Value +-+ nixpkgs | svn | https://svn.nixos.org/repos/nix/nixpkgs/trunk:29197 officialRelease | boolean | false Regards, The Hydra build daemon. --- mkdir: cannot create directory `/nix/store/9zj02i3bpizmdmhx8x736w5m22l54mch-nixpkgs-tarball-0pre29197': No space left on device build time elapsed: 0m0.023s 0m0.010s 0m0.000s 0m0.001s builder for `/nix/store/86iijcwwlni413ljl7fljmqwdfqgk5aw-nixpkgs-tarball-0pre29197.drv' failed with exit code 1 error: build of `/nix/store/86iijcwwlni413ljl7fljmqwdfqgk5aw-nixpkgs-tarball-0pre29197.drv' failed ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29198 - nixpkgs/trunk/pkgs/os-specific/linux/kernel
Author: shlevy
Date: Mon Sep 12 03:38:12 2011
New Revision: 29198
URL: https://ssl.nixos.org/websvn/nix/?rev=29198sc=1
Log:
linux-3.1.nix: Bump to rc5
I wanted to wait for kernel.org to get back up, but there doesn't seem to be
any information about when that will be. If you don't trust that this is
Torvalds' github, see https://lkml.org/lkml/2011/9/4/92 for how to verify
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Sun Sep 11
20:48:02 2011(r29197)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Mon Sep 12
03:38:12 2011(r29198)
@@ -200,13 +200,14 @@
import ./generic.nix (
rec {
-version = 3.1-rc4;
+version = 3.1-rc5;
-modDirVersion = 3.1.0-rc4;
+modDirVersion = 3.1.0-rc5;
src = fetchurl {
- url =
mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.bz2;
- sha256 = 1inb4iyj9r7lk68bw1mznxk726n3cxcbylqnb62ycisi1z2gxwjw;
+ url = https://github.com/torvalds/linux/tarball/v${version};;
+ sha256 = 1gs12hnkci1w21wwkpd9985ws6aldki6gzgdi4xmffcr4ypf1j4k;
+ name = v${version}.tar.gz;
};
config = configWithPlatform stdenv.platform;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] Hydra job nixpkgs:trunk:tarball build 1320212: Success
Hi, This is to let you know that Hydra build 1320212 of job nixpkgs:trunk:tarball has changed from 'Failed with non-zero exit code' to 'Success'. Complete build information can be found on this page: http://hydra.nixos.org/build/1320212 A summary of the build information follows: Build ID: | 1320212 Nix name: | nixpkgs-tarball-0pre29198 Short description: | Build of a source distribution from a checkout Maintainer(s): | Nix Committers nix-comm...@cs.uu.nl System:| x86_64-linux Derivation store path: | /nix/store/1kc4w3ancic0v5y7g6y0na2g75gk1na9-nixpkgs-tarball-0pre29198.drv Output store path: | /nix/store/9mabswgkxsqphk9byc01hiz87565bcbm-nixpkgs-tarball-0pre29198 Time added:| 2011-09-12 05:55:43 Build started: | 2011-09-12 05:54:11 Build finished:| 2011-09-12 05:55:43 Duration: | 92s The build inputs were: Name| Type| Value +-+ nixpkgs | svn | https://svn.nixos.org/repos/nix/nixpkgs/trunk:29198 officialRelease | boolean | false Regards, The Hydra build daemon. ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
