Re: [Nix-dev] [RFC] Merging of multiple-outputs-sandbox into trunk
On 11/26/2011 01:17 PM, Shea Levy wrote: Should I consider the lack of response as a rejection of the merge request? Nope, haven't had time to look at it yet :-( Hopefully this week. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30580 - configurations/trunk/tud
Author: eelco
Date: Mon Nov 28 10:17:54 2011
New Revision: 30580
URL: https://nixos.org/websvn/nix/?rev=30580sc=1
Log:
Modified:
configurations/trunk/tud/cartman.nix
Modified: configurations/trunk/tud/cartman.nix
==
--- configurations/trunk/tud/cartman.nixMon Nov 28 10:02:58 2011
(r30579)
+++ configurations/trunk/tud/cartman.nixMon Nov 28 10:17:54 2011
(r30580)
@@ -109,7 +109,7 @@
{ mountPoint = /data/releases;
device = 192.168.1.25:/data/releases;
fsType = nfs;
-options = vers=3; # !!! check why vers=4 doesn't work
+options = vers=3,soft; # !!! check why vers=4 doesn't work
}
];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] Hydra job nixpkgs:trunk:tarball build 1571893: Failed with non-zero exit code
Hi, This is to let you know that Hydra build 1571893 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/1571893 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: | 1571893 Nix name: | nixpkgs-tarball-0pre30578 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/ki4scwl34asjyasxj8zpfih9m1dr54sm-nixpkgs-tarball-0pre30578.drv Output store path: | /nix/store/ndfyqzkgllx6aragj98w29b7wj78hcz9-nixpkgs-tarball-0pre30578 Time added:| 2011-11-28 11:27:12 Build started: | 2011-11-28 11:25:13 Build finished:| 2011-11-28 11:27:12 Duration: | 119s The build inputs were: Name| Type| Value +-+ nixpkgs | svn | https://svn.nixos.org/repos/nix/nixpkgs/trunk:30578 officialRelease | boolean | false Regards, The Hydra build daemon. --- trace: networkmanager trace: networkmanagerapplet trace: neverball trace: nfsUtils trace: nginx trace: ngspice trace: nilfs_utils trace: nix trace: nixSqlite trace: nixUnstable trace: nmap trace: nodejs trace: notmuch trace: nss_ldap trace: nssmdns trace: ntfs3g trace: ntp trace: nut trace: obexftp trace: ocaml trace: ocamlPackages trace: camlp5_5_strict trace: camlp5_5_transitional trace: camlp5_6_strict trace: camlp5_6_transitional trace: camlp5_strict trace: camlp5_transitional trace: camlzip trace: camomile trace: camomile_0_8_2 trace: cryptokit trace: findlib trace: lablgtk trace: menhir trace: ocaml trace: ocaml_batteries trace: ocaml_cryptgps trace: ocaml_lwt trace: ocaml_pcre trace: ocaml_react trace: ocaml_sqlite3 trace: ocaml_ssl trace: ocamlgraph trace: ocamlnet trace: opa error: value is a string while a list was expected (use `--show-trace' to show detailed location information) build time elapsed: 0m0.039s 0m0.019s 1m39.357s 0m12.957s builder for `/nix/store/ki4scwl34asjyasxj8zpfih9m1dr54sm-nixpkgs-tarball-0pre30578.drv' failed with exit code 1 error: build of `/nix/store/ki4scwl34asjyasxj8zpfih9m1dr54sm-nixpkgs-tarball-0pre30578.drv' failed ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Compiling the Linux kernel for the Sheevaplug
I can now report that I have a nice fresh NixOS running on my Sheevaplug. Thanks for all help! $ uname -a Linux rn-srv01 3.1.2 #1 PREEMPT Mon Nov 28 04:16:02 UTC 2011 armv5tel GNU/Linux / Rickard Den 2011-11-27 17:43:35 skrev Rickard Nilsson rickard.nils...@telia.com: Hi, Den 2011-11-27 11:04:45 skrev Lluís Batlle i Rossell vi...@viric.name: On Sun, Nov 27, 2011 at 10:46:15AM +0100, Rickard Nilsson wrote: Hi, I managed to get my Sheevaplug running NixOS with the help of Lluís' nixos-system-tarball (http://vicerveza.homeunix.net/~viric/tmp/nix/nixos-system-armv5tel-linux.tar.xz). Brave! I'm really impressed, how you could work out with such an unpolished work. Congratulations! :) I've then tried to build my system with a recent kernel (3.1). But the build stops after the kernel config step, with the output unused option: xxx. If I comment out the option in question in the linux_3_1 nix expression, I can run the build again, and now it complains about some other unused option. I can continue commenting out that option too, but I don't want to carry on like that... I think that you have not set the platform in your nixpkgs: nixpkgs.config.platform = pkgs.platform.sheevaplug; That did the trick! The kernel is now building, at least. I suspect it will take some time :) You also need that in the ~/.nixpkgs/config.nix for normal profiles to install proper packages. That will use all the sheevaplug details in building (like kernel configurations, etc.) Regards, Lluís. / Rickard ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Compiling the Linux kernel for the Sheevaplug
On Mon, Nov 28, 2011 at 02:54:51PM +0100, Rickard Nilsson wrote: I can now report that I have a nice fresh NixOS running on my Sheevaplug. Thanks for all help! $ uname -a Linux rn-srv01 3.1.2 #1 PREEMPT Mon Nov 28 04:16:02 UTC 2011 armv5tel GNU/Linux Great! The third nixos on armv5tel of the world. :) I could not convince Delft to buy sheevaplugs for us to get prebuilt binaries... but three armv5tel are already an important ratio of nixos computers, related to x86 :) ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30582 - nixpkgs/trunk/pkgs/development/compilers/urweb
Author: kkallio
Date: Mon Nov 28 15:12:02 2011
New Revision: 30582
URL: https://nixos.org/websvn/nix/?rev=30582sc=1
Log:
Update urweb compiler to release 2027.
Modified:
nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix Mon Nov 28
14:54:50 2011(r30581)
+++ nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix Mon Nov 28
15:12:02 2011(r30582)
@@ -2,23 +2,23 @@
stdenv.mkDerivation rec {
pname = urweb;
- version = 20110917;
+ version = 2027;
name = ${pname}-${version};
src = fetchurl {
url = http://www.impredicative.com/ur/${name}.tgz;;
-sha256 = 1qgb25bwpdcs303q7yz1dm577xyy5pzzyvaqabhkvhbgxmlcpl73;
+sha256 = 1mhicigbi434fdr4gim4dswnmff9dldszh93g2w2542nlxvn9lbj;
};
buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];
prePatch = ''
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
-sed -e 's@gcc @${stdenv.gcc}/bin/gcc @g' -i src/compiler.sml
'';
preConfigure =
''
+ export CC=${stdenv.gcc}/bin/gcc;
export CCARGS=-I$out/include \
-L${mysql}/lib/mysql -L${postgresql}/lib
-L${sqlite}/lib;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30583 - nixpkgs/trunk/pkgs/development/compilers/opa
Author: shlevy Date: Mon Nov 28 15:49:14 2011 New Revision: 30583 URL: https://nixos.org/websvn/nix/?rev=30583sc=1 Log: Platforms needs to be a list Should this really be x86_64-linux only? Why? Modified: nixpkgs/trunk/pkgs/development/compilers/opa/default.nix Modified: nixpkgs/trunk/pkgs/development/compilers/opa/default.nix == --- nixpkgs/trunk/pkgs/development/compilers/opa/default.nixMon Nov 28 15:12:02 2011(r30582) +++ nixpkgs/trunk/pkgs/development/compilers/opa/default.nixMon Nov 28 15:49:14 2011(r30583) @@ -58,6 +58,6 @@ homepage = http://opalang.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; -platforms = x86_64-linux; +platforms = [ x86_64-linux ]; }; } ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30584 - nixpkgs/trunk/pkgs/top-level
Author: kkallio
Date: Mon Nov 28 15:52:46 2011
New Revision: 30584
URL: https://nixos.org/websvn/nix/?rev=30584sc=1
Log:
Opa does not compile with ocaml before version 3.12.0
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Nov 28 15:49:14
2011(r30583)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Nov 28 15:52:46
2011(r30584)
@@ -2407,8 +2407,6 @@
ocaml_ssl = callPackage ../development/ocaml-modules/ssl { };
-opa = callPackage ../development/compilers/opa { };
-
ounit = callPackage ../development/ocaml-modules/ounit { };
ulex = callPackage ../development/ocaml-modules/ulex { };
@@ -2423,6 +2421,8 @@
ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1
pkgs.ocamlPackages_3_11_1;
ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0
pkgs.ocamlPackages_3_12_0;
+ opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage
../development/compilers/opa { };
+
opencxx = callPackage ../development/compilers/opencxx {
gcc = gcc33;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] Hydra job nixpkgs:trunk:tarball build 1572642: Success
Hi, This is to let you know that Hydra build 1572642 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/1572642 A summary of the build information follows: Build ID: | 1572642 Nix name: | nixpkgs-tarball-0pre30583 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/sgxy1qvlalc1fq1jjldq1b6bgx3rjs85-nixpkgs-tarball-0pre30583.drv Output store path: | /nix/store/8r1zdz898zz8f1x1g4wdqplzivvhdr32-nixpkgs-tarball-0pre30583 Time added:| 2011-11-28 17:03:12 Build started: | 2011-11-28 17:01:17 Build finished:| 2011-11-28 17:03:12 Duration: | 115s The build inputs were: Name| Type| Value +-+ nixpkgs | svn | https://svn.nixos.org/repos/nix/nixpkgs/trunk:30583 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
[Nix-commits] SVN commit: nix - r30588 - nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession
Author: simons
Date: Mon Nov 28 18:11:34 2011
New Revision: 30588
URL: https://nixos.org/websvn/nix/?rev=30588sc=1
Log:
haskell-clientsession: updated to version 0.7.3.5
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
Mon Nov 28 18:11:31 2011(r30587)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
Mon Nov 28 18:11:34 2011(r30588)
@@ -1,13 +1,14 @@
-{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher, entropy
-, skein
+{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi
+, cryptocipher, entropy, skein
}:
cabal.mkDerivation (self: {
pname = clientsession;
- version = 0.7.3.4;
- sha256 = 16blm8p0c2hk06yn5f5qmrrxwsrsdv7l7x1s07ygn8s9jmb9xyqr;
+ version = 0.7.3.5;
+ sha256 = 0j5vwlmc9vz2zrwpjfjxfz1hl94zc1dbs8jm55dnd6c043i5ag4w;
buildDepends = [
-base64Bytestring cereal cryptoApi cryptocipher entropy skein
+base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
+skein
];
meta = {
homepage = http://github.com/snoyberg/clientsession/tree/master;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30587 - nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate
Author: simons
Date: Mon Nov 28 18:11:31 2011
New Revision: 30587
URL: https://nixos.org/websvn/nix/?rev=30587sc=1
Log:
haskell-authenticate: updated to version 0.10.3
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
Mon Nov 28 18:11:27 2011(r30586)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
Mon Nov 28 18:11:31 2011(r30587)
@@ -1,4 +1,4 @@
-{ cabal, aesonNative, attoparsec, base64Bytestring, blazeBuilder
+{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder
, caseInsensitive, enumerator, failure, httpEnumerator, httpTypes
, network, random, RSA, SHA, tagsoup, text, time, tls, transformers
, xmlEnumerator
@@ -6,12 +6,12 @@
cabal.mkDerivation (self: {
pname = authenticate;
- version = 0.10.2.2;
- sha256 = 10w13wcd8cwaf4ifxllsiijwza2ys4a5zyhjcbl4938609p60hi8;
+ version = 0.10.3;
+ sha256 = 1sp8yanb8wray3pnakaj7jqsxirjw6ds2f1j2p72p9hn3kcf4255;
buildDepends = [
-aesonNative attoparsec base64Bytestring blazeBuilder
-caseInsensitive enumerator failure httpEnumerator httpTypes network
-random RSA SHA tagsoup text time tls transformers xmlEnumerator
+aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
+enumerator failure httpEnumerator httpTypes network random RSA SHA
+tagsoup text time tls transformers xmlEnumerator
];
meta = {
homepage = http://github.com/snoyberg/authenticate/tree/master;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30589 - nixpkgs/trunk/pkgs/development/libraries/haskell/cookie
Author: simons
Date: Mon Nov 28 18:11:37 2011
New Revision: 30589
URL: https://nixos.org/websvn/nix/?rev=30589sc=1
Log:
haskell-cookie: updated to version 0.3.0.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/cookie/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/cookie/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cookie/default.nix Mon Nov
28 18:11:34 2011(r30588)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cookie/default.nix Mon Nov
28 18:11:37 2011(r30589)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = cookie;
- version = 0.3.0.1;
- sha256 = 1gqz2q09fnbk8scd164mg02jsdh0sg5g06grr627qsjy583i2ad7;
+ version = 0.3.0.2;
+ sha256 = 123ylraxcavj82qcvrbfpb172k8zl5qgzh2byv84did1f1dz0ris;
buildDepends = [ blazeBuilder text time ];
meta = {
homepage = http://github.com/snoyberg/cookie;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30591 - nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet
Author: simons
Date: Mon Nov 28 18:11:43 2011
New Revision: 30591
URL: https://nixos.org/websvn/nix/?rev=30591sc=1
Log:
haskell-hamlet: updated to version 0.10.5
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix Mon Nov
28 18:11:40 2011(r30590)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix Mon Nov
28 18:11:43 2011(r30591)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = hamlet;
- version = 0.10.4;
- sha256 = 10ik9rbj9srb1f7vavs5siidyybzbr4fpy3akv90qldd2xyifhxa;
+ version = 0.10.5;
+ sha256 = 0kizy0qij6zbayrbb3gr4iqys1551ax5c8w5lvh6chg3ypl1i1m3;
buildDepends = [
blazeBuilder blazeHtml failure parsec shakespeare text
];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30592 - nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator
Author: simons
Date: Mon Nov 28 18:11:46 2011
New Revision: 30592
URL: https://nixos.org/websvn/nix/?rev=30592sc=1
Log:
haskell-http-enumerator: updated to version 0.7.1.5
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Mon Nov 28 18:11:43 2011(r30591)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Mon Nov 28 18:11:46 2011(r30592)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = http-enumerator;
- version = 0.7.1.4;
- sha256 = 1dp3hw10wpf8izmp48jai90x7mxws05gbjqx9s24gl7y2m24q2xg;
+ version = 0.7.1.5;
+ sha256 = 1ycbw6r7nsp59ncchrsb60qyyvf74pf43fyr44invhv1hjh5cb61;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30593 - nixpkgs/trunk/pkgs/development/libraries/haskell/mime-mail
Author: simons
Date: Mon Nov 28 18:11:49 2011
New Revision: 30593
URL: https://nixos.org/websvn/nix/?rev=30593sc=1
Log:
haskell-mime-mail: updated to version 0.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/mime-mail/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/mime-mail/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/mime-mail/default.nix
Mon Nov 28 18:11:46 2011(r30592)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/mime-mail/default.nix
Mon Nov 28 18:11:49 2011(r30593)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = mime-mail;
- version = 0.3.0.3;
- sha256 = 0aag2mj1jchgwgnlh6hmv9qz78qjxffn1b52nwl6257sk0qv6va6;
+ version = 0.4;
+ sha256 = 0hlyk3mypn9iw7g8hhn528ycbm3qayiczwf4paw0sxd6xsg9a28s;
buildDepends = [ blazeBuilder dataenc random text ];
meta = {
homepage = http://github.com/snoyberg/mime-mail;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30594 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css
Author: simons
Date: Mon Nov 28 18:11:52 2011
New Revision: 30594
URL: https://nixos.org/websvn/nix/?rev=30594sc=1
Log:
haskell-shakespeare-css: updated to version 0.10.3
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
Mon Nov 28 18:11:49 2011(r30593)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Mon Nov 28 18:11:52 2011(r30594)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = shakespeare-css;
- version = 0.10.2;
- sha256 = 181bknfws2s7jygy527w93v07i04xf1pwyfmylva59p0z45adlb4;
+ version = 0.10.3;
+ sha256 = 1r0m1pqgg43dmc1gb1aj99hyk1jw0ciln9k7q3mq8vwc602kfd5r;
buildDepends = [ parsec shakespeare text ];
meta = {
homepage = http://www.yesodweb.com/book/templates;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30595 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js
Author: simons
Date: Mon Nov 28 18:11:54 2011
New Revision: 30595
URL: https://nixos.org/websvn/nix/?rev=30595sc=1
Log:
haskell-shakespeare-js: updated to version 0.10.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
Mon Nov 28 18:11:52 2011(r30594)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
Mon Nov 28 18:11:54 2011(r30595)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = shakespeare-js;
- version = 0.10.2;
- sha256 = 1yyqfp2lj8vq7x2a74wrgm7kx6zp1djp67bls9ip74kxi24dbznv;
+ version = 0.10.3;
+ sha256 = 1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2;
buildDepends = [ shakespeare text ];
meta = {
homepage = http://www.yesodweb.com/book/templates;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30596 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text
Author: simons
Date: Mon Nov 28 18:11:57 2011
New Revision: 30596
URL: https://nixos.org/websvn/nix/?rev=30596sc=1
Log:
haskell-shakespeare-text: updated to version 0.10.3
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
Mon Nov 28 18:11:54 2011(r30595)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-text/default.nix
Mon Nov 28 18:11:57 2011(r30596)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = shakespeare-text;
- version = 0.10.2;
- sha256 = 04n1aflg4b5byfsg494d4dskx25nyy0a654wl4cxz8920sl7qpha;
+ version = 0.10.3;
+ sha256 = 0w3qf0zykdi5ixjcp0l9zdgwhbnnljn6ib88xkai05xkm6wzh06s;
buildDepends = [ shakespeare text ];
meta = {
homepage = http://www.yesodweb.com/book/templates;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30598 - nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra
Author: simons
Date: Mon Nov 28 18:12:03 2011
New Revision: 30598
URL: https://nixos.org/websvn/nix/?rev=30598sc=1
Log:
haskell-wai-extra: updated to version 0.4.5.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
Mon Nov 28 18:12:00 2011(r30597)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
Mon Nov 28 18:12:03 2011(r30598)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = wai-extra;
- version = 0.4.4;
- sha256 = 04mzpqa6q3ggk5r0shzc11q5qmmri566nzbsafpv2sbmiwm5s7nd;
+ version = 0.4.5.1;
+ sha256 = 1aq0zvxyk5hgdvpydvf8hlvv61ilrsmbmdaxhiq46waaabxqgdfc;
buildDepends = [
blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault
enumerator httpTypes network text time transformers wai
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30599 - nixpkgs/trunk/pkgs/development/libraries/haskell/wai
Author: simons
Date: Mon Nov 28 18:12:06 2011
New Revision: 30599
URL: https://nixos.org/websvn/nix/?rev=30599sc=1
Log:
haskell-wai: updated to version 0.4.3
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.nixMon Nov
28 18:12:03 2011(r30598)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wai/default.nixMon Nov
28 18:12:06 2011(r30599)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = wai;
- version = 0.4.2;
- sha256 = 18w4wzryyqcqqihwckbz92smkqhhxh3lmi0kgxkcgivyzvhd2jqy;
+ version = 0.4.3;
+ sha256 = 08dmsl90ibs6a4sadsd2dhf5mssf5jswk6n2jv19q5sg3dra4m84;
buildDepends = [
blazeBuilder enumerator httpTypes network text transformers
];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30603 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form
Author: simons
Date: Mon Nov 28 18:12:18 2011
New Revision: 30603
URL: https://nixos.org/websvn/nix/?rev=30603sc=1
Log:
haskell-yesod-form: updated to version 0.3.4
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
Mon Nov 28 18:12:16 2011(r30602)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Mon Nov 28 18:12:18 2011(r30603)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = yesod-form;
- version = 0.3.3;
- sha256 = 1lym9h7xr26i36n62cvbdyzjxna1p0alyhx9qhi5zhg0xz4nd3xq;
+ version = 0.3.4;
+ sha256 = 05hvffzhwb6x6cmpvpf60hbzm4lvn7gp47rvspm5k6y6d999az3l;
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
persistent shakespeareCss shakespeareJs text time transformers wai
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30601 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth
Author: simons
Date: Mon Nov 28 18:12:12 2011
New Revision: 30601
URL: https://nixos.org/websvn/nix/?rev=30601sc=1
Log:
haskell-yesod-auth: updated to version 0.7.6.1
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
Mon Nov 28 18:12:09 2011(r30600)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Mon Nov 28 18:12:12 2011(r30601)
@@ -1,4 +1,4 @@
-{ cabal, aesonNative, authenticate, blazeHtml, controlMonadAttempt
+{ cabal, aeson, authenticate, blazeHtml, controlMonadAttempt
, hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate
, pureMD5, pwstoreFast, random, SHA, shakespeareCss, text
, transformers, wai, yesodCore, yesodForm, yesodJson
@@ -7,10 +7,10 @@
cabal.mkDerivation (self: {
pname = yesod-auth;
- version = 0.7.5;
- sha256 = 1njs3z01as6mamdflx2686s4qq4qwpkl0xnfdlrhswzgfpn8qqb6;
+ version = 0.7.6.1;
+ sha256 = 11x4vs332727x7sbl5w98a5ga709kl53fp9xrqv7c7qrlphiknzy;
buildDepends = [
-aesonNative authenticate blazeHtml controlMonadAttempt hamlet
+aeson authenticate blazeHtml controlMonadAttempt hamlet
httpEnumerator mimeMail persistent persistentTemplate pureMD5
pwstoreFast random SHA shakespeareCss text transformers wai
yesodCore yesodForm yesodJson yesodPersistent
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30602 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core
Author: simons
Date: Mon Nov 28 18:12:16 2011
New Revision: 30602
URL: https://nixos.org/websvn/nix/?rev=30602sc=1
Log:
haskell-yesod-core: updated to version 0.9.3.4
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
Mon Nov 28 18:12:12 2011(r30601)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Mon Nov 28 18:12:16 2011(r30602)
@@ -1,19 +1,19 @@
-{ cabal, aesonNative, blazeBuilder, blazeHtml, caseInsensitive
-, cereal, clientsession, cookie, dataObject, dataObjectYaml
-, enumerator, failure, hamlet, httpTypes, monadControl, parsec
-, pathPieces, random, shakespeare, shakespeareCss, shakespeareJs
+{ cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal
+, clientsession, cookie, dataObject, dataObjectYaml, enumerator
+, failure, hamlet, httpTypes, monadControl, parsec, pathPieces
+, random, shakespeare, shakespeareCss, shakespeareJs
, strictConcurrency, text, time, transformers, vector, wai
, waiExtra
}:
cabal.mkDerivation (self: {
pname = yesod-core;
- version = 0.9.3.3;
- sha256 = 0qy926x009mci17fhlrcn758vc9lxybzfg16pb69ydzbdr9lqa77;
+ version = 0.9.3.4;
+ sha256 = 1hnzmbspdj15480n0r4r1gayapwwz3d5r3hzj5k4qd9975lyxcw1;
buildDepends = [
-aesonNative blazeBuilder blazeHtml caseInsensitive cereal
-clientsession cookie dataObject dataObjectYaml enumerator failure
-hamlet httpTypes monadControl parsec pathPieces random shakespeare
+aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
+cookie dataObject dataObjectYaml enumerator failure hamlet
+httpTypes monadControl parsec pathPieces random shakespeare
shakespeareCss shakespeareJs strictConcurrency text time
transformers vector wai waiExtra
];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30604 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-json
Author: simons
Date: Mon Nov 28 18:12:21 2011
New Revision: 30604
URL: https://nixos.org/websvn/nix/?rev=30604sc=1
Log:
haskell-yesod-json: updated to version 0.2.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-json/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-json/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-json/default.nix
Mon Nov 28 18:12:18 2011(r30603)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-json/default.nix
Mon Nov 28 18:12:21 2011(r30604)
@@ -1,10 +1,10 @@
-{ cabal, aesonNative, shakespeareJs, text, vector, yesodCore }:
+{ cabal, aeson, shakespeareJs, text, vector, yesodCore }:
cabal.mkDerivation (self: {
pname = yesod-json;
- version = 0.2.1;
- sha256 = 1d710pqrdafyz8s0spd19vwvx5v9kwy44wb0byz3445jhi3kwn88;
- buildDepends = [ aesonNative shakespeareJs text vector yesodCore ];
+ version = 0.2.2;
+ sha256 = 11n34wg0jjamghd93ild48rzganbwzbqf6shv8lyy1lsm2jl8q0v;
+ buildDepends = [ aeson shakespeareJs text vector yesodCore ];
meta = {
homepage = http://www.yesodweb.com/;;
description = Generate content for Yesod using the aeson package;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30607 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod
Author: simons
Date: Mon Nov 28 18:12:31 2011
New Revision: 30607
URL: https://nixos.org/websvn/nix/?rev=30607sc=1
Log:
haskell-yesod: updated to version 0.9.3.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 Mon Nov
28 18:12:28 2011(r30606)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Mon Nov
28 18:12:31 2011(r30607)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = yesod;
- version = 0.9.3.1;
- sha256 = 0af4nyfrpvkyr070fkg1qf4pn783n5443j8hi3wqn4i371vqsmp0;
+ version = 0.9.3.2;
+ sha256 = 1dwdjf7iydbpnbfpixjmw90dbb25030mv1s2a9cmbpdg70dzzknp;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30608 - nixpkgs/trunk/pkgs/development/tools/haskell/hlint
Author: simons
Date: Mon Nov 28 18:12:33 2011
New Revision: 30608
URL: https://nixos.org/websvn/nix/?rev=30608sc=1
Log:
haskell-hlint: updated to version 1.8.19
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Mon Nov
28 18:12:31 2011(r30607)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Mon Nov
28 18:12:33 2011(r30608)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = hlint;
- version = 1.8.18;
- sha256 = 1dn5ca8z6cvmz8nlyb87glk2sk2pma8pjrg8yamn4vr54zq1bf7a;
+ version = 1.8.19;
+ sha256 = 0nbj5nkwmiadkp7h8nbx2xg79mvgd97hm9wk0nmfv9ncwnkz9xcc;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] some basic questions from a new NixOS user
On Sat, Nov 26, 2011 at 09:20:34PM -0700, Kevin Quick wrote:
On Sat, 26 Nov 2011 15:42:03 -0700, Linus Arver
linusar...@gmail.com wrote:
this in my configuration.nix:
services.xserver = {
enable = true;
layout = us;
# Automatic login as regular user (no need to put up with entering
# password)
displayManager = {
auto = {
enable = true;
user = l; # login as l
};
};
# Enable XMonad
windowManager = {
xmonad.enable = true;
};
};
I have:
services.xserver = {
enable = true;
...
windowManager.xmonad.enable = true;
windowManager.default = xmonad;
...
};
This seems to work fine.
Thanks! I added
windowManager.default = xmonad;
into my configuration and now xmonad finally starts up automatically on
boot!
Although xmonad restarts itself out of
your .xmonad directory, the main version is available:
$ which xmonad
/home/kquick/.nix-profile/bin/xmonad
$ ls -lh `which xmonad`
lrwxrwxrwx 1 root nixbld 67 Nov 2 12:59
/home/kquick/.nix-profile/bin/xmonad -
/nix/store/f6zlgcyhy76k2kal3v47vmj5bsvpm3px-xmonad-0.9.2/bin/xmonad
$
So, I stated in my previous email that I thought the xmonad-related
things in configuration.nix were essentially broken. I've since
installed xmonad with nix-env, and now xmonad is in my path.
But I must ask, how did you install xmonad? I tried nix-env -i xmonad
but it did not work, so I looked into all the available packages and
found haskell-xmonad-ghc7.0.4 which is what I ended up installing.
Strangely, it appears that the haskell packages cannot see each other
properly, because I cannot use any of the xmonad-contrib modules in my
xmonad.hs, even though I've installed xmonad-contrib. I can fire up
ghci, but I can't even load up the XMonad Haskell module, either.
Strange...
I guess this is the price you have to pay to run an exotic setup on an
alpha-stage OS...
I did a nixos-rebuild switch, but xmonad does not get started.
In my experience there are some elements that cannot switch and a
reboot is required; I don't recall if xmonad was one of these, but
it may be if X is not restarted by the switch.
First, let me clarify my poor choice of words --- what I really meant
was: I did a 'nix-rebuild switch', but xmonad does not get started
after I reboot into the new configuration. But yes, your point still
stands --- X and xmonad do not get restarted immediately after
nixos-rebuild switch. I did read somewhere in the manual that not all
processes get restarted (or that NixOS *tries* to restart all services
if it can), so this quirk won't confuse newbies, I think.
-Linus
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] slock (was: SVN commit: nix - r29326 - in nixpkgs/trunk/pkgs: misc/screensavers/slock top-level)
On Пятница 25 ноября 2011 18:16:51 Peter Simons wrote:
Hi Alexander,
misc/screensavers/slock: New nixpkg.
I tried to run slock (because it's really quite small!), but I get the
following error message:
$ slock
slock: cannot retrieve password entry (make sure to suid slock)
Do you have an idea how to remedy that issue (preferably in a way that
doesn't require slock to run as root)?
This is how I made kde screen locking work:
security.setuidOwners = singleton
{ program = kcheckpass;
source = ${pkgs.kde4.kdebase_workspace}/lib/kde4/libexec/kcheckpass;
owner = root;
group = root;
setuid = true;
};
I assume this is a similar case.
--
Evgeny
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30609 - in configurations/trunk/misc/raskin: . lesser-expressions
Author: raskin
Date: Tue Nov 29 05:09:03 2011
New Revision: 30609
URL: https://nixos.org/websvn/nix/?rev=30609sc=1
Log:
Various package set updates
Modified:
configurations/trunk/misc/raskin/lesser-expressions/pb.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
Modified: configurations/trunk/misc/raskin/lesser-expressions/pb.nix
==
--- configurations/trunk/misc/raskin/lesser-expressions/pb.nix Mon Nov 28
18:12:33 2011(r30608)
+++ configurations/trunk/misc/raskin/lesser-expressions/pb.nix Tue Nov 29
05:09:03 2011(r30609)
@@ -35,6 +35,17 @@
packageOverrides = p : {
linuxHeaders26Cross = p.forceBuildDrv
(p.linuxHeaders_2_6_28.override {cross = crossSystem;});
+ guile = p.guile_1_8;
+ glibcLocales = p.glibcLocales.override {
+ locales=[en_US.UTF-8/UTF-8 ru_RU.UTF-8/UTF-8
+ ru_RU.KOI8-R/KOI8-R ru_RU.CP1251/CP1251
+ C POSIX
+ ];
+ allLocales = false;
+ };
+ };
+ gnutls={
+guile = false;
};
};
};
@@ -46,15 +57,15 @@
justUse
[
hello bashInteractive
- guile_1_8 strace
+ guile strace
binutils gdb
utillinuxng less
gnugrep gnused
coreutils
+ tmux glibcLocales
])
++
[
-(pkgs.gcc46.hostDrv)
-#(pkgs.lsh.override{guile=pkgs.guile_1_8;}).hostDrv
+(pkgs.gcc45.hostDrv)
]
)).hostDrv
Modified: configurations/trunk/misc/raskin/package-groups.nix
==
--- configurations/trunk/misc/raskin/package-groups.nix Mon Nov 28 18:12:33
2011(r30608)
+++ configurations/trunk/misc/raskin/package-groups.nix Tue Nov 29 05:09:03
2011(r30609)
@@ -80,11 +80,11 @@
# relfs
sshfsFuse fuse fusesmb ntfs3g
- glusterfs smbnetfs xtreemfs
+ glusterfs smbnetfs /*xtreemfs*/
curlftpfs
- baseKernel.kernelPackages.aufs3_util
+ baseKernel.kernelPackages.aufs_util
];
networkTools
@@ -100,8 +100,8 @@
opera chromeWrapper
mozplugger
- (wrapFirefox { browser = firefox70Pkgs.firefox; nameSuffix=7; })
- (wrapFirefox { browser = firefox80bPkgs.firefox; nameSuffix=; })
+ (wrapFirefox { browser = firefox80Pkgs.firefox; nameSuffix=8; })
+ (wrapFirefox { browser = firefox90bPkgs.firefox; nameSuffix=; })
];
graphicEdit = [
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Mon Nov 28
18:12:33 2011(r30608)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Tue Nov 29
05:09:03 2011(r30609)
@@ -40,7 +40,7 @@
myKDE = pkgs.kde47;
kernelToUse = rec {
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_3_1 kernelPackages;
-extraModulePackages = [kernelPackages.acpi_call
/*kernelPackages.aufs2_1*/];
+extraModulePackages = [kernelPackages.acpi_call kernelPackages.aufs ];
};
packageGroups = import
/etc/nixos/configurations/misc/raskin/package-groups.nix {
inherit pkgs myTexLive myKDE;
@@ -274,8 +274,6 @@
manifests = if false then [] else [
http://hydra.nixos.org/jobset/nixpkgs/trunk/channel/latest/MANIFEST
http://hydra.nixos.org/jobset/nixpkgs/stdenv/channel/latest/MANIFEST
-
http://hydra.nixos.org/job/nix/trunk/build/channel/latest/MANIFEST
- http://hydra.nixos.org/project/nixos/channel/latest/MANIFEST
http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30610 - nixpkgs/trunk/pkgs/tools/system/fakeroot
Author: raskin
Date: Tue Nov 29 05:13:20 2011
New Revision: 30610
URL: https://nixos.org/websvn/nix/?rev=30610sc=1
Log:
Update fakeroot
Modified:
nixpkgs/trunk/pkgs/tools/system/fakeroot/default.nix
Modified: nixpkgs/trunk/pkgs/tools/system/fakeroot/default.nix
==
--- nixpkgs/trunk/pkgs/tools/system/fakeroot/default.nixTue Nov 29
05:09:03 2011(r30609)
+++ nixpkgs/trunk/pkgs/tools/system/fakeroot/default.nixTue Nov 29
05:13:20 2011(r30610)
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
- name = fakeroot-1.14.5;
+ name = fakeroot-1.18.1;
src = fetchurl {
-url =
http://ftp.de.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.14.5.orig.tar.bz2;
-sha256 = 0s5f785qsh057z05l9i5k1h9cbj9x26ki37l4wh4iyabjhschddh;
+url =
http://ftp.de.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.18.1.orig.tar.bz2;
+sha256 = 0h5jsw715a9hv32cb1m1bajy26l7xxrbgrk6qk1b6m91lxh6rnw9;
};
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30611 - in nixos/trunk/modules: config services/networking/ssh
Author: NicolasPierron
Date: Tue Nov 29 06:08:55 2011
New Revision: 30611
URL: https://nixos.org/websvn/nix/?rev=30611sc=1
Log:
Convert users.extraUsers to an option set and add support for openssh
authorized_keys file generation.
Modified:
nixos/trunk/modules/config/users-groups.nix
nixos/trunk/modules/services/networking/ssh/sshd.nix
Modified: nixos/trunk/modules/config/users-groups.nix
==
--- nixos/trunk/modules/config/users-groups.nix Tue Nov 29 05:13:20 2011
(r30610)
+++ nixos/trunk/modules/config/users-groups.nix Tue Nov 29 06:08:55 2011
(r30611)
@@ -5,43 +5,83 @@
let
ids = config.ids;
+ users = config.users;
+ userOpts = {name, config, ...}:
- # User accounts to be created/updated by NixOS.
- users =
-let
- defaultUsers =
-[ { name = root;
-uid = ids.uids.root;
-description = System administrator;
-home = /root;
-shell = config.users.defaultUserShell;
-group = root;
- }
- { name = nobody;
-uid = ids.uids.nobody;
-description = Unprivileged account (don't use!);
- }
-];
-
- # !!! Use NixOS module system to add default attributes.
- addAttrs =
-{ name
-, description
-, uid ?
-, group ? nogroup
-, extraGroups ? []
-, home ? /var/empty
-, shell ? (if useDefaultShell then config.users.defaultUserShell else
/noshell)
-, createHome ? false
-, useDefaultShell ? false
-, password ? null
-, isSystemUser ? true
-}:
-{ inherit name description uid group extraGroups home shell createHome
password isSystemUser; };
-
-in map addAttrs (defaultUsers ++ config.users.extraUsers);
+ {
+options = {
+ name = mkOption {
+type = with types; uniq string;
+description = The name of the user account. If undefined, the name of
the attribute set will be used.;
+ };
+ description = mkOption {
+type = with types; uniq string;
+default = ;
+description = A short description of the user account.;
+ };
+ uid = mkOption {
+type = with types; uniq (nullOr int);
+default = null;
+description = The account UID. If undefined, NixOS will select a
UID.;
+ };
+ group = mkOption {
+type = with types; uniq string;
+default = nogroup;
+description = The user's primary group.;
+ };
+ extraGroups = mkOption {
+type = types.listOf types.string;
+default = [];
+description = The user's auxiliary groups.;
+ };
+ home = mkOption {
+type = with types; uniq string;
+default = /var/empty;
+description = The user's home directory.;
+ };
+ shell = mkOption {
+type = with types; uniq string;
+default = /noshell;
+description = The path to the user's shell.;
+ };
+ createHome = mkOption {
+type = types.bool;
+default = false;
+description = If true, the home directory will be created
automatically.;
+ };
+ useDefaultShell = mkOption {
+type = types.bool;
+default = false;
+description = If true, the user's shell will be set to
literalusers.defaultUserShell/literal.;
+ };
+ password = mkOption {
+type = with types; uniq (nullOr string);
+default = null;
+description = The user's password. If undefined, no password is set
for the user. Warning: do not set confidential information here because this
data would be readable by all. This option should only be used for public
account such as guest.;
+ };
+ isSystemUser = mkOption {
+type = types.bool;
+default = true;
+description = Indicates if the user is a system user or not.;
+ };
+ createUser = mkOption {
+type = types.bool;
+default = true;
+description =
+ Indicates if the user should be created automatically as a local
user.
+ Set this to false if the user for instance is an LDAP user. NixOS
will
+ then not modify any of the basic properties for the user account.
+;
+ };
+};
+config = {
+ name = mkDefault name;
+ uid = mkDefault (attrByPath [name] null ids.uids);
+ shell = mkIf config.useDefaultShell (mkDefault users.defaultUserShell);
+};
+ };
# Groups to be created/updated by NixOS.
groups =
@@ -109,11 +149,14 @@
# Note: the 'X' in front of the password is to distinguish between
# having an empty password, and not having a password.
- serializedUser = u: ${u.name}\n${u.description}\n${toString
u.uid}\n${u.group}\n${toString (concatStringsSep ,
u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if
u.password != null then X +
