[Nix-commits] SVN commit: nix - r28860 - nixpkgs/trunk/pkgs/development/compilers/ghc
Author: simons
Date: Mon Aug 29 07:25:56 2011
New Revision: 28860
URL: https://svn.nixos.org/websvn/nix/?rev=28860sc=1
Log:
pkgs/development/compilers/ghc/7.0.4-binary.nix: support linux, too
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Mon Aug
29 01:20:12 2011(r28859)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Mon Aug
29 07:25:56 2011(r28860)
@@ -1,7 +1,7 @@
{stdenv, fetchurl, perl, ncurses, gmp}:
let
- supportedPlatforms = [x86_64-darwin];
+ supportedPlatforms = [x86_64-linux i686-linux x86_64-darwin];
in
assert stdenv.lib.elem stdenv.system supportedPlatforms;
@@ -12,7 +12,17 @@
name = ghc-${version}-binary;
src =
-if stdenv.system == x86_64-darwin then
+if stdenv.system == i686-linux then
+ fetchurl {
+url =
http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2;;
+sha256 = 0mfnihiyjl06f5w1yrjp36sw9g67g2ymg5sdl0g23h1pab99jx63;
+ }
+else if stdenv.system == x86_64-linux then
+ fetchurl {
+url =
http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2;;
+sha256 = 0mc4rhqcxz427wq4zgffmnn0d2yjqvy6af4x9mha283p1gdj5q99;
+ }
+else if stdenv.system == x86_64-darwin then
fetchurl {
url =
http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2;;
sha256 = 1m2ml88p1swf4dnv2vq8hz4drcp46n3ahpfi05wh01ajkf8hnn3l;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28861 - nixpkgs/trunk/pkgs/development/compilers/ghc
Author: simons Date: Mon Aug 29 07:32:37 2011 New Revision: 28861 URL: https://svn.nixos.org/websvn/nix/?rev=28861sc=1 Log: pkgs/development/compilers/ghc/7.0.4-binary.nix: pass $@ in double quotes to avoid issues with arguments that contain whitespace Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix == --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Mon Aug 29 07:25:56 2011(r28860) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Mon Aug 29 07:32:37 2011(r28861) @@ -89,7 +89,7 @@ mkdir $out/bin for i in $(cd $out/bin-orig ls); do echo #! $SHELL -e $out/bin/$i -echo DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \$@ $out/bin/$i +echo DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \\$@\ $out/bin/$i chmod +x $out/bin/$i done '' else ) ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28862 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Mon Aug 29 07:39:08 2011
New Revision: 28862
URL: https://svn.nixos.org/websvn/nix/?rev=28862sc=1
Log:
pkgs/top-level/all-packages.nix: strip trailing whitespace
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 Aug 29 07:32:37
2011(r28861)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 07:39:08
2011(r28862)
@@ -7820,63 +7820,63 @@
recurseForRelease = true;
akunambol = callPackage ../applications/networking/sync/akunambol { };
-
+
amarok = callPackage ../applications/audio/amarok { };
-
+
bangarang = callPackage ../applications/video/bangarang { };
-
+
bluedevil = callPackage ../tools/bluetooth/bluedevil { };
-
+
digikam = callPackage ../applications/graphics/digikam { };
-
+
filelight = callPackage ../applications/misc/filelight { };
-
+
k3b = callPackage ../applications/misc/k3b { };
-
+
kadu = callPackage ../applications/networking/instant-messengers/kadu {
};
-
+
kbluetooth = callPackage ../tools/bluetooth/kbluetooth { };
-
+
kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
-
+
kdenlive = callPackage ../applications/video/kdenlive { };
-
+
kdesvn = callPackage ../applications/version-management/kdesvn { };
-
+
kdevelop = callPackage ../applications/editors/kdevelop { };
-
+
kdevplatform = callPackage ../development/libraries/kdevplatform { };
-
+
kdiff3 = callPackage ../tools/text/kdiff3 { };
-
+
kmplayer = callPackage ../applications/video/kmplayer {
inherit (pkgs.gtkLibs) pango;
};
-
+
kipi_plugins = callPackage ../applications/graphics/kipi-plugins {
inherit (pkgs.gtkLibs) gdk_pixbuf;
};
-
+
koffice = callPackage ../applications/office/koffice { };
-
+
konq_plugins = callPackage
../applications/networking/browsers/konq-plugins { };
-
+
konversation = callPackage ../applications/networking/irc/konversation {
};
-
+
krename = callPackage ../applications/misc/krename { };
-
+
krusader = callPackage ../applications/misc/krusader { };
-
+
ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
-
+
libktorrent = callPackage ../development/libraries/libktorrent { };
-
+
liblikeback = callPackage ../development/libraries/liblikeback { };
-
+
partitionManager = callPackage ../tools/misc/partition-manager { };
-
+
polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
-
+
psi = callPackage ../applications/networking/instant-messengers/psi { };
quassel = callPackage ../applications/networking/irc/quassel { };
@@ -7892,11 +7892,11 @@
});
rekonq = callPackage ../applications/networking/browsers/rekonq { };
-
+
rsibreak = callPackage ../applications/misc/rsibreak { };
-
+
semnotes = callPackage ../applications/misc/semnotes { };
-
+
yakuake = callPackage ../applications/misc/yakuake { };
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28863 - nixpkgs/trunk/pkgs/development/compilers/ghc
Author: simons Date: Mon Aug 29 07:39:29 2011 New Revision: 28863 URL: https://svn.nixos.org/websvn/nix/?rev=28863sc=1 Log: pkgs/development/compilers/ghc/7.0.4.nix: add myself as a maintainer Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix == --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Mon Aug 29 07:39:08 2011(r28862) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Mon Aug 29 07:39:29 2011(r28863) @@ -36,6 +36,7 @@ maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons ]; platforms = 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 - r28864 - nixpkgs/trunk/pkgs/top-level
Author: simons Date: Mon Aug 29 07:46:30 2011 New Revision: 28864 URL: https://svn.nixos.org/websvn/nix/?rev=28864sc=1 Log: pkgs/top-level/all-packages.nix: bootstrap ghc 7.0.4 and 7.2.1 with 7.0.4-binary on Darwin 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 Aug 29 07:39:29 2011(r28863) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 07:46:30 2011(r28864) @@ -2148,12 +2148,14 @@ haskellPackages_ghc704 = haskellPackagesFun ../development/compilers/ghc/7.0.4.nix - ghc6101Binary (x : x.ghc704Prefs) false false (x : x); + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) false false (x : x); haskellPackages_ghc721 = recurseIntoAttrs (haskellPackagesFun ../development/compilers/ghc/7.2.1.nix -ghc6121Binary (x : x.ghc721Prefs) false false lowPrio); +(if stdenv.isDarwin then ghc704Binary else ghc6121Binary) +(x : x.ghc721Prefs) false false lowPrio); # Still a release candidate. haskellPackages_ghcHEAD = ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28865 - nixpkgs/trunk/pkgs/top-level
Author: simons Date: Mon Aug 29 07:46:38 2011 New Revision: 28865 URL: https://svn.nixos.org/websvn/nix/?rev=28865sc=1 Log: pkgs/top-level/all-packages.nix: don't use tabs for indention 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 Aug 29 07:46:30 2011(r28864) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 07:46:38 2011(r28865) @@ -5209,7 +5209,7 @@ [ kernelPatches.fbcondecor_2_6_25 kernelPatches.sec_perm_2_6_24 kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 +kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5220,7 +5220,7 @@ [ kernelPatches.fbcondecor_2_6_25 kernelPatches.sec_perm_2_6_24 kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 +kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5230,7 +5230,7 @@ kernelPatches = [ kernelPatches.fbcondecor_2_6_27 kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_25 +kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5242,7 +5242,7 @@ kernelPatches.sec_perm_2_6_24 kernelPatches.ext4_softlockups_2_6_28 kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 +kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5251,7 +5251,7 @@ kernelPatches = [ kernelPatches.fbcondecor_2_6_29 kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_29 +kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5328,7 +5328,7 @@ [ kernelPatches.fbcondecor_2_6_33 kernelPatches.aufs2_2_6_33 kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_29 +kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5354,7 +5354,7 @@ [ /*kernelPatches.fbcondecor_2_6_33*/ kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_34 - kernelPatches.cifs_timeout_2_6_29 +kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5370,7 +5370,7 @@ [ #kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_35 - kernelPatches.cifs_timeout_2_6_35 +kernelPatches.cifs_timeout_2_6_35 ] ++ lib.optional (platform.kernelArch == arm) kernelPatches.sheevaplug_modules_2_6_35; }; @@ -5405,7 +5405,7 @@ kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_36 kernelPatches.mips_restart_2_6_36 - kernelPatches.cifs_timeout_2_6_35 + kernelPatches.cifs_timeout_2_6_35 ]; }; @@ -5443,7 +5443,7 @@ [ kernelPatches.fbcondecor_2_6_37 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_37 - kernelPatches.cifs_timeout_2_6_35 +kernelPatches.cifs_timeout_2_6_35 #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5460,7 +5460,7 @@ [ kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_38 - kernelPatches.cifs_timeout_2_6_38 +kernelPatches.cifs_timeout_2_6_38 #kernelPatches.mips_restart_2_6_36 ]; }; ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28866 - nixpkgs/trunk/pkgs/development/compilers/ghc
Author: simons
Date: Mon Aug 29 07:49:35 2011
New Revision: 28866
URL: https://svn.nixos.org/websvn/nix/?rev=28866sc=1
Log:
pkgs/development/compilers/ghc/7.0.4-binary.nix: added (untested) support for
i686-darwin
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Mon Aug
29 07:46:38 2011(r28865)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Mon Aug
29 07:49:35 2011(r28866)
@@ -1,7 +1,7 @@
{stdenv, fetchurl, perl, ncurses, gmp}:
let
- supportedPlatforms = [x86_64-linux i686-linux x86_64-darwin];
+ supportedPlatforms = [x86_64-linux i686-linux i686-darwin
x86_64-darwin];
in
assert stdenv.lib.elem stdenv.system supportedPlatforms;
@@ -22,6 +22,11 @@
url =
http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2;;
sha256 = 0mc4rhqcxz427wq4zgffmnn0d2yjqvy6af4x9mha283p1gdj5q99;
}
+else if stdenv.system == i686-darwin then
+ fetchurl {
+url =
http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2;;
+sha256 = 0qj45hslrrr8zfks8m1jcb3awwx9rh35ndnpfmb0gwb6j7azq5n3;
+ }
else if stdenv.system == x86_64-darwin then
fetchurl {
url =
http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2;;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28869 - nixpkgs/trunk/pkgs/development/compilers/ghc
Author: shlevy Date: Mon Aug 29 08:09:27 2011 New Revision: 28869 URL: https://svn.nixos.org/websvn/nix/?rev=28869sc=1 Log: ghc/7.0.4-binary.nix: Remove comments about wrapper scripts Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix == --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Mon Aug 29 08:00:55 2011(r28868) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4-binary.nix Mon Aug 29 08:09:27 2011(r28869) @@ -79,9 +79,6 @@ # calls install-strip ... buildPhase = true; - # The binaries for Darwin use frameworks, so fake those frameworks, - # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so - # that the executables work with no special setup. postInstall = '' # Sanity check, can ghc create executables? ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] [PATCH] Root filesystem on NFS
Hi Nicolas,
On Sun, 28 Aug 2011 01:13:30 +0200, Nicolas Pierron
nicolas.b.pier...@gmail.com wrote:
Hi Rickard,
On Sat, Aug 27, 2011 at 13:05, Rickard Nilsson
rickard.nils...@telia.com wrote:
The only way I have managed to get root fs on NFS to work in NixOS
is by
using the nfsmount program from klibc. The following patch works
fine for
me, but since I'm new to NixOS I'm open for any changes:
I am happy to see new users willing to share their configuration.
Index: modules/system/boot/stage-1.nix
===
--- modules/system/boot/stage-1.nix (revision 28845)
+++ modules/system/boot/stage-1.nix (working copy)
@@ -169,6 +169,10 @@
cp
${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName}
$out/bin/splash_helper
''}
+ # Copy nfsmount
+ # TODO: Maybe only do this if there is a nfs mount point
defined?
Sure, we don't want to pollute other user environment:
${if fileSystems != [] filter (fs.fsType == nfs) fileSystems
then ''
+ cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
'' else }
+
${config.boot.initrd.extraUtilsCommands}
# Run patchelf to make the programs refer to the copied
libraries.
By applying this patch, the following root device specification in
configuration.nix works perfectly for me:
fileSystems = [
{ mountPoint = /;
fsType = nfs;
device = 192.168.42.1:/export/nixos_root;
}
];
However, you of course also need to get the network up before
mounting the
root fs. I have solved this in the following way directly in
configuration.nix, but I would really appreciate any suggestions on
how to
solve it more generally in the NixOS repository, so I could write a
proper
patch for it:
boot.initrd.extraUtilsCommands =
''
cp ${pkgs.iproute}/sbin/ip $out/bin
cp ${pkgs.glibc}/lib/libresolv.so.* $out/lib
'';
This is ok.
boot.initrd.postDeviceCommands =
''
ip link set eth0 up
ip addr add 192.168.42.200/24 dev eth0
'';
But we probably don't want to hard write this one, best would be to
take into account the networking user configuration. Such things
could be done by extracting the jobs.dhclient script and giving it as
argument of boot.initrd.postDeviceCommands, but this has never been
experimented before.
# This is necessary, otherwise upstart will tear
# down the network connection and the root fs will stop working.
networking.useDHCP = false;
This should not be necessary if you reused the upstart jobs content
to
write the init script. Otherwise, if another definition gives you
trouble you can still use mkOverride to force it to another value.
I will look into getting DHCP working during init. It is something I
have been thinking of already. Thanks for the hint about the upstart
jobs. Ideally I would like to adjust the existing network configuration
in NixOS to support the possibility to bring up the network before the
root mounting. That way the user wouldn't have to do anything else then
activate networking.earlyInit = true or something like that. And it
could even be done automatically if you had a cifs or nfs root.
If you are searching option declarations / definitions, use
nixos-option -l option.name to locate it.
Thanks for the tip, I wasn't aware of nixos-option.
Thanks for your interest in NixOS.
Feel free to contribute, I'll take pleasure to review your patches.
I will polish the nfsmount patch a bit and then submit it again. The
network stuff will require some more work before being patch-worthy.
Best regards,
Rickard Nilsson
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] [PATCH] Root filesystem on NFS
On Mon, Aug 29, 2011 at 11:01:08AM +0200, Rickard Nilsson wrote: Thanks for your interest in NixOS. Feel free to contribute, I'll take pleasure to review your patches. I will polish the nfsmount patch a bit and then submit it again. The network stuff will require some more work before being patch-worthy. I liked the patch. I don't think it was any harmful, and would enable people to use nfs. I would also not mind having an initrd with even more tools beyond nfsmount. :) I've been using nfsroot in some machines, but in those cases, I have not used initrd because I did not want to find that nfsmount. :) Then I used a special kernel with some compiled in code, so I could use nfsroot=blabla ip=dhcp for example. Regards, Lluís. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] root tmpfs and remote nix store+database
I think that it's similar to the case of the vms in nixos, but... has anyone been using a root in tmpfs and /nix served by nfs? That should be quite a reliable way of having thin clients where that with write-access to /nix can even update software easily in those machines. Will that work straight? ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28870 - nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels
Author: simons
Date: Mon Aug 29 09:54:47 2011
New Revision: 28870
URL: https://svn.nixos.org/websvn/nix/?rev=28870sc=1
Log:
haskell-fclabels: updated to version 1.0.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels/default.nix
Mon Aug 29 08:09:27 2011(r28869)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels/default.nix
Mon Aug 29 09:54:47 2011(r28870)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = fclabels;
- version = 1.0.2;
- sha256 = 14l7q481qx3fnln6xv5xvb8a8kphvh5dyd3d953wwrswqy0dr91l;
+ version = 1.0.3;
+ sha256 = 0sl45pv18qfyphixl9qyng5m6i19c9n18izkm278z6fvih2x5wd0;
buildDepends = [ mtl transformers ];
meta = {
description = First class accessor labels;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28871 - nixpkgs/trunk/pkgs/build-support/fetchgit
Author: raskin Date: Mon Aug 29 10:06:12 2011 New Revision: 28871 URL: https://svn.nixos.org/websvn/nix/?rev=28871sc=1 Log: Fix a typo Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git == --- nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Mon Aug 29 09:54:47 2011(r28870) +++ nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Mon Aug 29 10:06:12 2011(r28871) @@ -210,7 +210,7 @@ # If the hash was given, a file with that hash may already be in the # store. - if -n $expHash; then + if test -n $expHash; then finalPath=$(nix-store --print-fixed-path --recursive $hashType $expHash git-export) if ! nix-store --check-validity $finalPath 2 /dev/null; then finalPath= @@ -251,4 +251,4 @@ if test -n $PRINT_PATH; then echo $finalPath fi -fi \ No newline at end of file +fi ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28872 - in nixpkgs/trunk/pkgs: tools/networking/netboot top-level
Author: raskin
Date: Mon Aug 29 10:16:36 2011
New Revision: 28872
URL: https://svn.nixos.org/websvn/nix/?rev=28872sc=1
Log:
Adding netboot
Added:
nixpkgs/trunk/pkgs/tools/networking/netboot/
nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix Mon Aug 29
10:16:36 2011(r28872)
@@ -0,0 +1,59 @@
+x@{builderDefsPackage
+ , fetchgit, ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[fetchgit];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=netboot;
+rev=19a955cd87b399a5b56;
+name=${baseName}-git-head;
+url=git://github.com/ITikhonov/netboot.git;
+hash=7610c734dc46183439c161d327e7ef6a3d5bc07b5173850b92f71ec047b109d6;
+ };
+in
+rec {
+ srcDrv = a.fetchgit {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+rev = sourceInfo.rev;
+ };
+
+ src=srcDrv + /;
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doBuild doDeploy];
+
+ doBuild = a.fullDepEntry ''
+gcc netboot.c -o netboot
+ '' [doUnpack addInputs];
+
+ doDeploy = a.fullDepEntry ''
+ensureDir $out/bin
+cp netboot $out/bin
+ '' [defEnsureDir minInit];
+
+ meta = {
+description = Mini PXE server;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = free-noncopyleft;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = https://github.com/ITikhonov/netboot;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 10:06:12
2011(r28871)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 10:16:36
2011(r28872)
@@ -1006,6 +1006,8 @@
ndisc6 = callPackage ../tools/networking/ndisc6 { };
+ netboot = callPackage ../tools/networking/netboot {};
+
netcat = callPackage ../tools/networking/netcat { };
netkittftp = callPackage ../tools/networking/netkit/tftp { };
___
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 1281349: Failed with non-zero exit code
Hi, This is to let you know that Hydra build 1281349 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/1281349 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: | 1281349 Nix name: | nixpkgs-tarball-0pre28872 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/xmn2s2bzdrbh624hr9dwpda0qbi8g1da-nixpkgs-tarball-0pre28872.drv Output store path: | /nix/store/23hl42anbpiv12kzhx8grc4lisiz1b7y-nixpkgs-tarball-0pre28872 Time added:| 2011-08-29 12:26:09 Build started: | 2011-08-29 12:24:24 Build finished:| 2011-08-29 12:26:09 Duration: | 105s The build inputs were: Name| Type| Value +-+ nixpkgs | svn | https://svn.nixos.org/repos/nix/nixpkgs/trunk:28872 officialRelease | boolean | false Regards, The Hydra build daemon. --- trace: mktemp trace: mlton trace: mmex trace: mod_fastcgi trace: mod_python trace: mod_wsgi trace: module_init_tools trace: mono trace: monotone trace: mountall trace: mp3info trace: mp4v2 trace: mpc trace: mpc123 trace: mpd trace: mpfr trace: mpg321 trace: mpich2 trace: mtdutils trace: mtools trace: mtr trace: multipath_tools trace: multitran trace: mtutils trace: mupdf trace: mupen64plus trace: muscleframework trace: muscletool trace: mutt trace: myserver trace: mysql trace: mysql51 trace: mysql55 trace: mysqlWorkbench trace: naev trace: namazu trace: nano trace: navipowm trace: navit trace: nbd trace: ncat trace: ncbiCTools trace: ncurses trace: ndisc6 trace: neko trace: netboot error: attribute `version' missing build time elapsed: 0m0.037s 0m0.026s 1m23.754s 0m10.753s builder for `/nix/store/xmn2s2bzdrbh624hr9dwpda0qbi8g1da-nixpkgs-tarball-0pre28872.drv' failed with exit code 1 error: build of `/nix/store/xmn2s2bzdrbh624hr9dwpda0qbi8g1da-nixpkgs-tarball-0pre28872.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 - r28873 - nixpkgs/trunk/pkgs/tools/networking/netboot
Author: raskin
Date: Mon Aug 29 10:31:10 2011
New Revision: 28873
URL: https://svn.nixos.org/websvn/nix/?rev=28873sc=1
Log:
Fixing tarball build
Modified:
nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix
==
--- nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix Mon Aug 29
10:16:36 2011(r28872)
+++ nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix Mon Aug 29
10:31:10 2011(r28873)
@@ -9,6 +9,7 @@
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
+version=git-head-${rev};
baseName=netboot;
rev=19a955cd87b399a5b56;
name=${baseName}-git-head;
___
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 1281412: Success
Hi, This is to let you know that Hydra build 1281412 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/1281412 A summary of the build information follows: Build ID: | 1281412 Nix name: | nixpkgs-tarball-0pre28873 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/i87w17js3n5b31726a23dzrl6b6xc9g0-nixpkgs-tarball-0pre28873.drv Output store path: | /nix/store/dcd57vjncgyw08qsfa855pqndryb38ab-nixpkgs-tarball-0pre28873 Time added:| 2011-08-29 12:48:25 Build started: | 2011-08-29 12:46:29 Build finished:| 2011-08-29 12:48:25 Duration: | 116s The build inputs were: Name| Type| Value +-+ nixpkgs | svn | https://svn.nixos.org/repos/nix/nixpkgs/trunk:28873 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-dev] Re: [Nix-commits] SVN commit: nix - r28874 - in nixpkgs/trunk/pkgs: development/libraries/tcp-wrappers tools/networking/atftp top-level
Hi, On 08/29/2011 02:47 PM, Michael Raskin wrote: nixpkgs/trunk/pkgs/tools/networking/atftp/debian.patch Very large patches like this one (almost half a megabyte) don't belong in tree. Please use fetchurl to download them instead. -- 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 - r28875 - nixpkgs/trunk/pkgs/tools/networking/atftp
Author: raskin
Date: Mon Aug 29 13:17:44 2011
New Revision: 28875
URL: https://svn.nixos.org/websvn/nix/?rev=28875sc=1
Log:
Moving debian patch to fetchurl
Deleted:
nixpkgs/trunk/pkgs/tools/networking/atftp/debian.patch
Modified:
nixpkgs/trunk/pkgs/tools/networking/atftp/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/atftp/default.nix
==
--- nixpkgs/trunk/pkgs/tools/networking/atftp/default.nix Mon Aug 29
12:47:39 2011(r28874)
+++ nixpkgs/trunk/pkgs/tools/networking/atftp/default.nix Mon Aug 29
13:17:44 2011(r28875)
@@ -29,7 +29,12 @@
/* doConfigure should be removed if not needed */
phaseNames = [doPatch doConfigure doMakeInstall];
- patches = [./debian.patch];
+ debianPatch = a.fetchurl {
+url = http://patch-tracker.debian.org/patch/nondebian/dl/atftp/0.7.dfsg-10;
+sha256 = 0vannjp0wxvk10xxlr3hirgf0g57n9dr4vhmsyfd8x4cwgxwfgsa;
+ };
+
+ patches = [debianPatch];
meta = {
description = Advanced tftp tools;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28876 - nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm
Author: eelco
Date: Mon Aug 29 13:39:25 2011
New Revision: 28876
URL: https://svn.nixos.org/websvn/nix/?rev=28876sc=1
Log:
* qemu-kvm updated to 0.15.0.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix Mon Aug 29
13:17:44 2011(r28875)
+++ nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix Mon Aug 29
13:39:25 2011(r28876)
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
-, libjpeg, libpng, ncurses }:
+, libjpeg, libpng, ncurses, python, glib }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
- name = qemu-kvm-0.14.1;
+ name = qemu-kvm-0.15.0;
src = fetchurl {
url = mirror://sourceforge/kvm/${name}.tar.gz;
-sha256 = 09yshk2qzlb37hyp8iygyyf2if2d7r21b7rgkl0jyvv4p1m4z755;
+sha256 = 0y247bc2cyawliaiyk8k41kl3mcjvh52b9bgzvxv0h55zwdpg3l2;
};
patches = [ ./smb-tmpdir.patch ];
@@ -19,7 +19,7 @@
buildInputs =
[ zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
- ncurses
+ ncurses python glib
];
preBuild =
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] new possible movement to git (?)
Hi, On 08/24/2011 11:02 PM, Shea Levy wrote: It has been over a year since this discussion and I have not seen any move toward implementing the suggestions in the thread. If this is simply due to inertia, I would like to offer up help similar to what Marc Weber offers in his initial email (migrating scripts, providing advice to users, etc.). If it is because the NixOS community is undecided as to which vcs to switch to, perhaps we should have a discussion about how to fairly discuss and decide such things? I've been meaning to set a Git migration into motion for a while, but I haven't really been able to find the time. (Or the motivation, really - I don't seem to be suffering from Subversion to the same extent as other people...) Anyway, to make a switch to a new DVCS more worthwhile, I'd like to use it as an opportunity to improve NixOS/Nixpkgs stability. Right now doing an svn up is rather dangerous, since the trunk it quite often in a broken state. Also, the binaries in the Nixpkgs channel lag behind the Subversion repository, so doing an upgrade may require building lots of packages from source. So it would be nice if we had a more stable tree that users can update from safely. For example, we could have these Nixpkgs/NixOS trees/branches: - An unstable tree which receives developer commits. It might be in a broken state, so end users shouldn't use it. Hydra continuously builds it. Of course, complicated changes should be done in a feature tree/branch and pulled in when they're done. - A tested tree that automatically gets updated from the unstable tree when some set of Nixpkgs and NixOS tests succeed *and* the Nixpkgs channel is up to date. This tree should be fairly safe to use. - A stable tree that gets updated manually and conservatively (e.g., only security or stability updates). Does this sound reasonable? About where to host the repositories: we could do it on nixos.org, but using Github is rather nice because then I don't have to manage users or set up a web interface, and the pull request management seems rather nice. Random point: should the NixOS and Nixpkgs trees be in the same repository? I think so, since it allows them to be updated atomically, which is important given that Nixpkgs and NixOS changes are often related. -- 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 - r28877 - nixos/trunk/tests
Author: eelco
Date: Mon Aug 29 14:23:26 2011
New Revision: 28877
URL: https://svn.nixos.org/websvn/nix/?rev=28877sc=1
Log:
* Make some tests more robust. In particular, tests should make sure
that the network-interfaces job is up before accessing the network.
Modified:
nixos/trunk/tests/firewall.nix
nixos/trunk/tests/login.nix
nixos/trunk/tests/nat.nix
nixos/trunk/tests/tomcat.nix
Modified: nixos/trunk/tests/firewall.nix
==
--- nixos/trunk/tests/firewall.nix Mon Aug 29 13:39:25 2011(r28876)
+++ nixos/trunk/tests/firewall.nix Mon Aug 29 14:23:26 2011(r28877)
@@ -27,6 +27,7 @@
$walled-waitForJob(firewall);
$walled-waitForJob(httpd);
+ $attacker-waitForJob(network-interfaces);
# Local connections should still work.
$walled-succeed(curl -v http://localhost/ 2);
Modified: nixos/trunk/tests/login.nix
==
--- nixos/trunk/tests/login.nix Mon Aug 29 13:39:25 2011(r28876)
+++ nixos/trunk/tests/login.nix Mon Aug 29 14:23:26 2011(r28877)
@@ -35,11 +35,11 @@
# Check whether ConsoleKit/udev gives and removes device
# ownership as needed.
subtest device permissions, sub {
+ $machine-fail(getfacl /dev/snd/timer | grep -q alice);
$machine-succeed(chvt 1);
- $machine-sleep(1); # urgh
- $machine-succeed(getfacl /dev/snd/timer | grep -q alice);
+ $machine-waitUntilSucceeds(getfacl /dev/snd/timer | grep -q
alice);
$machine-succeed(chvt 2);
- $machine-sleep(1); # urgh
+ $machine-sleep(2); # urgh
$machine-fail(getfacl /dev/snd/timer | grep -q alice);
};
Modified: nixos/trunk/tests/nat.nix
==
--- nixos/trunk/tests/nat.nix Mon Aug 29 13:39:25 2011(r28876)
+++ nixos/trunk/tests/nat.nix Mon Aug 29 14:23:26 2011(r28877)
@@ -41,10 +41,12 @@
# The router should have access to the server.
$server-waitForJob(httpd);
+ $router-waitForJob(network-interfaces);
$router-succeed(curl --fail http://server/ 2);
# The client should be also able to connect via the NAT router.
$router-waitForJob(nat);
+ $client-waitForJob(network-interfaces);
$client-succeed(curl --fail http://server/ 2);
$client-succeed(ping -c 1 server 2);
Modified: nixos/trunk/tests/tomcat.nix
==
--- nixos/trunk/tests/tomcat.nixMon Aug 29 13:39:25 2011(r28876)
+++ nixos/trunk/tests/tomcat.nixMon Aug 29 14:23:26 2011(r28877)
@@ -25,7 +25,8 @@
$server-waitForJob(tomcat);
$server-sleep(30); # Dirty, but it takes a while before Tomcat handles to
requests properly
-$client-mustSucceed(curl --fail
http://server/examples/servlets/servlet/HelloWorldExample;);
-$client-mustSucceed(curl --fail
http://server/examples/jsp/jsp2/simpletag/hello.jsp;);
+$client-waitForJob(network-interfaces);
+$client-succeed(curl --fail
http://server/examples/servlets/servlet/HelloWorldExample;);
+$client-succeed(curl --fail
http://server/examples/jsp/jsp2/simpletag/hello.jsp;);
'';
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: announce: preliminary version of nixpkgs-python-overlay
first, tnx for the work...
devEnv = pythonEnv26 {
name = libs-coding-style;
# p = { pylint = [ 2.0 ]; } force pylint version being less # than
2.0
names = [ pylint pyflakes ];
};
1. its common that python packages depend on extras. would this be possible.
$ easy_install package-A[test]
$ easy_install package-A[test,docs]
2. also another useful feature which is used in zc.buildout is that
you can omit creation of scripts, or you can selectively allow their
creation.
$ easy_install Plone
you don't actually want all script from its dependencies to be created.
you would want to specify only some of them.
The code is based on the arbitrary-strings-as-names patch and maybe some
more things I put into my nix/nixos repositories (branches nix2/marc and
nix2/nix-python-sites)
3. would this work on macosx/nix setup? also i couldn't find this
patches, can you provide links?
lp rok
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] NixOS - Issue 140
NixOS #140 (29 Aug)By Justinpatchelf fails tests when linked with gold linkerWhen using the gold linker patchelf gets broken: ./set-rpath-library.sh: line 19: 25914 Floating point exception../src/patchelf --set-rpath $oldRPath:$(pwd)/scratch/libsA:$(pwd)/scratch/libsB scratch/main-scoped FAIL: set-rpath-library.sh Please find downstream Gentoo bug here https://bugs.gentoo.org/show_bug.cgi?id=377099 -- Issue on YellowGrass -- http://yellowgrass.org -- ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Re: announce: preliminary version of nixpkgs-python-overlay
I'm busy for at least 3 days. Sorry. We can then talk about it. Marc Weber ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] new possible movement to git (?)
Hi, On Mon, Aug 29, 2011 at 15:44, Eelco Dolstra e.dols...@tudelft.nl wrote: Random point: should the NixOS and Nixpkgs trees be in the same repository? I think so, since it allows them to be updated atomically, which is important given that Nixpkgs and NixOS changes are often related. Wouldn't this add more complexity for Nix-only users? Pros: - Avoid non-synchronized modifications (and related bugs). - Easier bug reports (only one revision). Cons: - Cannot fetch only Nixpkgs. -- Nicolas Pierron http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28878 - hydra/trunk/src/lib/Hydra/Controller
Author: rob
Date: Mon Aug 29 17:56:38 2011
New Revision: 28878
URL: https://svn.nixos.org/websvn/nix/?rev=28878sc=1
Log:
set threshold to show status on jobset page to a more usable size
Modified:
hydra/trunk/src/lib/Hydra/Controller/Jobset.pm
Modified: hydra/trunk/src/lib/Hydra/Controller/Jobset.pm
==
--- hydra/trunk/src/lib/Hydra/Controller/Jobset.pm Mon Aug 29 14:23:26
2011(r28877)
+++ hydra/trunk/src/lib/Hydra/Controller/Jobset.pm Mon Aug 29 17:56:38
2011(r28878)
@@ -58,7 +58,7 @@
push(@systems, $system-system);
}
-if($forceStatus || scalar(@{$c-stash-{activeJobs}}) = 20) {
+if($forceStatus || scalar(@{$c-stash-{activeJobs}}) = 50) {
my @select = ();
my @as = ();
push(@select, job); push(@as, job);
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] new possible movement to git (?)
Hi, On 08/24/2011 11:02 PM, Shea Levy wrote: It has been over a year since this discussion and I have not seen any move toward implementing the suggestions in the thread. If this is simply due to inertia, I would like to offer up help similar to what Marc Weber offers in his initial email (migrating scripts, providing advice to users, etc.). If it is because the NixOS community is undecided as to which vcs to switch to, perhaps we should have a discussion about how to fairly discuss and decide such things? I've been meaning to set a Git migration into motion for a while, but I haven't really been able to find the time. (Or the motivation, really - I don't seem to be suffering from Subversion to the same extent as other people...) Anyway, to make a switch to a new DVCS more worthwhile, I'd like to use it as an opportunity to improve NixOS/Nixpkgs stability. Right now doing an svn up is rather dangerous, since the trunk it quite often in a broken state. Also, the binaries in the Nixpkgs channel lag behind the Subversion repository, so doing an upgrade may require building lots of packages from source. So it would be nice if we had a more stable tree that users can update from safely. For example, we could have these Nixpkgs/NixOS trees/branches: - An unstable tree which receives developer commits. It might be in a broken state, so end users shouldn't use it. Hydra continuously builds it. Of course, complicated changes should be done in a feature tree/branch and pulled in when they're done. - A tested tree that automatically gets updated from the unstable tree when some set of Nixpkgs and NixOS tests succeed *and* the Nixpkgs channel is up to date. This tree should be fairly safe to use. - A stable tree that gets updated manually and conservatively (e.g., only security or stability updates). Does this sound reasonable? Sounds good to me. A few questions: 1. Would we still need stdenv-updates, or could we just use feature branches for the individual update we care about then merge it into unstable (or probably master in keeping with git lingo)? This would put rebuild work onto developers but since users should be using tested they'll never have to manually rebuild their system (though they will have to download it). 2. How does hydra decide which builds to add to its queue? If it only adds based on the latest commit in unstable, couldn't a steady enough flow of commits mean it never has a completely built channel for any given commit? Would there be a way to force hydra to try building the whole channel for a fixed commit if the tests pass or something like that? 3. I like the idea of stable, but given the current development environment I think might go stale unless there's some sort of automated way to tell us to think about merging from testing at a particular point (e.g. it has been 6 months since the last major update on stable and commit 123456 of testing has passed a full suite of tests, so send an email to the maintainers of stable to remind them to start the process of updating stable). 4. I'm not really sure which would be considered better practice, but couldn't the testing branch be accomplished with tags instead of a separate branch? From my understanding of your explanation, testing will always be a fast-forwardable subset of unstable, so it doesn't need to be its own branch. This doesn't apply to stable, since it will receive cherry-picked security updates between merges. About where to host the repositories: we could do it on nixos.org, but using Github is rather nice because then I don't have to manage users or set up a web interface, and the pull request management seems rather nice. I just assumed you'd want it on nixos.org, but I'd definitely prefer github. It does all the hard work for you. Random point: should the NixOS and Nixpkgs trees be in the same repository? I think so, since it allows them to be updated atomically, which is important given that Nixpkgs and NixOS changes are often related. It's probably overkill to have them in the same repository. They currently are in the same repository and they almost never receive simultaneous updates, but on the occasions where we might want to there is a tool called gitslave that might help: http://gitslave.sourceforge.net/ -- 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 mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] new possible movement to git (?)
On Thu, Aug 25, 2011 at 10:31:06AM +0200, Nicolas Pierron wrote: Hi, I just want to add one more point in favor to git. (compared to svn) The history does not have to be clone entirely if you want to checkout the HEAD / a branch / a tag. Nix-prefect-git (already used by Hydra and Nixpkgs) is able to do a minimal checkout. Compared to svn? Svn never requires a full clone of the history. :) ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28879 - in nixpkgs/trunk/pkgs: development/libraries/libdrm top-level
Author: shlevy
Date: Mon Aug 29 18:55:37 2011
New Revision: 28879
URL: https://svn.nixos.org/websvn/nix/?rev=28879sc=1
Log:
Get libdrm to compile on darwin
The added patch uses mach_absolute_time() to get a nanosecond-resolution
monotonic clock on darwin systems (See
http://developer.apple.com/library/mac/#qa/qa1398/_index.html for an
understanding of the added code). In addition, the patch changes one use of
clock_gettime to gettimeofday since only resolution of a second is needed at
that point. This code compiles on darwin, but the resulting library is not yet
tested.
Added:
nixpkgs/trunk/pkgs/development/libraries/libdrm/libdrm-apple.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/libdrm/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libdrm/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/libdrm/default.nix Mon Aug 29
17:56:38 2011(r28878)
+++ nixpkgs/trunk/pkgs/development/libraries/libdrm/default.nix Mon Aug 29
18:55:37 2011(r28879)
@@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
name = libdrm-2.4.24;
src = fetchurl {
@@ -10,16 +10,19 @@
buildInputs = [ pkgconfig libpthreadstubs ];
+ patches = [ ./libdrm-apple.patch ];
+
preConfigure = ''
# General case: non intel.
if test -n $crossConfig; then
configureFlags=$configureFlags --disable-intel;
fi
- '';
+ '' + stdenv.lib.optionalString stdenv.isDarwin
+ echo : \\\${ac_cv_func_clock_gettime=\'yes\'} config.cache;
meta = {
homepage = http://dri.freedesktop.org/libdrm/;
description = Library for accessing the kernel's Direct Rendering
Manager;
license = bsd;
};
-}
+} // (stdenv.lib.optionalAttrs stdenv.isDarwin { configureFlags = [ -C ]; }))
Added: nixpkgs/trunk/pkgs/development/libraries/libdrm/libdrm-apple.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libdrm/libdrm-apple.patch Mon Aug
29 18:55:37 2011(r28879)
@@ -0,0 +1,88 @@
+diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c
libdrm-2.4.26/intel/intel_bufmgr_gem.c
+--- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c2011-04-01
10:30:51.0 -0400
libdrm-2.4.26/intel/intel_bufmgr_gem.c 2011-08-29 02:17:20.0
-0400
+@@ -51,6 +51,7 @@
+ #include sys/mman.h
+ #include sys/stat.h
+ #include sys/types.h
++#include sys/time.h
+
+ #include errno.h
+ #include libdrm_lists.h
+@@ -987,9 +988,9 @@
+ if (atomic_dec_and_test(bo_gem-refcount)) {
+ drm_intel_bufmgr_gem *bufmgr_gem =
+ (drm_intel_bufmgr_gem *) bo-bufmgr;
+- struct timespec time;
++ struct timeval time;
+
+- clock_gettime(CLOCK_MONOTONIC, time);
++ gettimeofday(time, NULL);
+
+ pthread_mutex_lock(bufmgr_gem-lock);
+ drm_intel_gem_bo_unreference_final(bo, time.tv_sec);
+diff -Naur libdrm-2.4.26-orig/xf86drm.c libdrm-2.4.26/xf86drm.c
+--- libdrm-2.4.26-orig/xf86drm.c 2011-03-21 09:39:24.0 -0400
libdrm-2.4.26/xf86drm.c2011-08-29 02:17:49.0 -0400
+@@ -51,6 +51,9 @@
+ #include sys/mman.h
+ #include sys/time.h
+ #include stdarg.h
++#if defined(__APPLE__) defined(__MACH__)
++#include mach/mach_time.h
++#endif
+
+ /* Not all systems have MAP_FAILED defined */
+ #ifndef MAP_FAILED
+@@ -1941,20 +1944,43 @@
+ */
+ int drmWaitVBlank(int fd, drmVBlankPtr vbl)
+ {
++#if defined(__APPLE__) defined(__MACH__)
++uint64_t start, end, elapsed, elapsedNano;
++static const uint64_t maxElapsed = 20;
++static mach_timebase_info_data_t timebaseInfo;
++if ( timebaseInfo.denom == 0 ) {
++ (void) mach_timebase_info(timebaseInfo);
++}
++#else
+ struct timespec timeout, cur;
++#endif
+ int ret;
+
++#if defined(__APPLE__) defined(__MACH__)
++start = mach_absolute_time();
++#else
+ ret = clock_gettime(CLOCK_MONOTONIC, timeout);
+ if (ret 0) {
+ fprintf(stderr, clock_gettime failed: %s\n, strerror(ret));
+ goto out;
+ }
+ timeout.tv_sec++;
++#endif
+
+ do {
+ret = ioctl(fd, DRM_IOCTL_WAIT_VBLANK, vbl);
+vbl-request.type = ~DRM_VBLANK_RELATIVE;
+if (ret errno == EINTR) {
++#if defined(__APPLE__) defined(__MACH__)
++ end = mach_absolute_time();
++ elapsed = end - start;
++ elapsedNano = elapsed * timebaseInfo.numer / timebaseInfo.denom;
++ if (elapsedNano maxElapsed) {
++ errno = EBUSY;
++ ret = -1;
++ break;
++ }
++#else
+ clock_gettime(CLOCK_MONOTONIC, cur);
+ /* Timeout
[Nix-commits] SVN commit: nix - r28880 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Mon Aug 29 18:57:35 2011
New Revision: 28880
URL: https://svn.nixos.org/websvn/nix/?rev=28880sc=1
Log:
pkgs/top-level/all-packages.nix: fixed Darwin build of
haskellPackages_ghc704_{,no_}profiling
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 Aug 29 18:55:37
2011(r28879)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 18:57:35
2011(r28880)
@@ -2141,13 +2141,15 @@
haskellPackages_ghc704_no_profiling =
recurseIntoAttrs
(haskellPackagesFun ../development/compilers/ghc/7.0.4.nix
-ghc6101Binary (x : x.ghc704Prefs) true false
+(if stdenv.isDarwin then ghc704Binary else ghc6101Binary)
+(x : x.ghc704Prefs) true false
(haskellDefaultVersionPrioFun false));
haskellPackages_ghc704_profiling =
recurseIntoAttrs
(haskellPackagesFun ../development/compilers/ghc/7.0.4.nix
-ghc6101Binary (x : x.ghc704Prefs) true true
+(if stdenv.isDarwin then ghc704Binary else ghc6101Binary)
+(x : x.ghc704Prefs) true true
(haskellDefaultVersionPrioFun true));
haskellPackages_ghc704 =
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28881 - nixpkgs/trunk/pkgs/servers/x11/xorg
Author: shlevy
Date: Mon Aug 29 18:58:59 2011
New Revision: 28881
URL: https://svn.nixos.org/websvn/nix/?rev=28881sc=1
Log:
Get libpciaccess to compile on darwin
The added patch uses the correct byte-conversion functions on Apple systems.
The library compiles on darwin but is not yet tested.
Added:
nixpkgs/trunk/pkgs/servers/x11/xorg/libpciaccess-apple.patch
Modified:
nixpkgs/trunk/pkgs/servers/x11/xorg/overrides.nix
Added: nixpkgs/trunk/pkgs/servers/x11/xorg/libpciaccess-apple.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/servers/x11/xorg/libpciaccess-apple.patchMon Aug
29 18:58:59 2011(r28881)
@@ -0,0 +1,26 @@
+diff -Naur libpciaccess-0.12.1-orig/src/common_interface.c
libpciaccess-0.12.1/src/common_interface.c
+--- libpciaccess-0.12.1-orig/src/common_interface.c2010-07-12
00:32:05.0 -0400
libpciaccess-0.12.1/src/common_interface.c 2011-08-29 00:48:17.0
-0400
+@@ -67,6 +67,22 @@
+ # define HTOLE_32(x) (x)
+ #endif /* Solaris */
+
++#elif defined(__APPLE__)
++
++#include architecture/byte_order.h
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++# define LETOH_16(x) OSSwapInt16(x)
++# define HTOLE_16(x) OSSwapInt16(x)
++# define LETOH_32(x) OSSwapInt32(x)
++# define HTOLE_32(x) OSSwapInt32(x)
++#else
++# define LETOH_16(x) (x)
++# define HTOLE_16(x) (x)
++# define LETOH_32(x) (x)
++# define HTOLE_32(x) (x)
++#endif /* darwin */
++
+ #else
+
+ #include sys/endian.h
Modified: nixpkgs/trunk/pkgs/servers/x11/xorg/overrides.nix
==
--- nixpkgs/trunk/pkgs/servers/x11/xorg/overrides.nix Mon Aug 29 18:57:35
2011(r28880)
+++ nixpkgs/trunk/pkgs/servers/x11/xorg/overrides.nix Mon Aug 29 18:58:59
2011(r28881)
@@ -47,6 +47,10 @@
buildNativeInputs = [ args.perl ];
};
+ libpciaccess = attrs : attrs // {
+patches = [ ./libpciaccess-apple.patch ];
+ };
+
libX11 = attrs: attrs // {
preConfigure = setMalloc0ReturnsNullCrossCompiling;
postInstall =
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r28881 - nixpkgs/trunk/pkgs/servers/x11/xorg
Whoops, forgot to give proper credit to
https://trac.macports.org/attachment/ticket/21912/byteswap-osx.patch for
the names of the functions.
Author: shlevy
Date: Mon Aug 29 18:58:59 2011
New Revision: 28881
URL: https://svn.nixos.org/websvn/nix/?rev=28881sc=1
Log:
Get libpciaccess to compile on darwin
The added patch uses the correct byte-conversion functions on Apple
systems. The library compiles on darwin but is not yet tested.
Added:
nixpkgs/trunk/pkgs/servers/x11/xorg/libpciaccess-apple.patch
Modified:
nixpkgs/trunk/pkgs/servers/x11/xorg/overrides.nix
Added: nixpkgs/trunk/pkgs/servers/x11/xorg/libpciaccess-apple.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/servers/x11/xorg/libpciaccess-apple.patch Mon Aug
29 18:58:59 2011 (r28881)
@@ -0,0 +1,26 @@
+diff -Naur libpciaccess-0.12.1-orig/src/common_interface.c
libpciaccess-0.12.1/src/common_interface.c
+--- libpciaccess-0.12.1-orig/src/common_interface.c 2010-07-12
00:32:05.0 -0400
libpciaccess-0.12.1/src/common_interface.c 2011-08-29
00:48:17.0 -0400
+@@ -67,6 +67,22 @@
+ # define HTOLE_32(x) (x)
+ #endif /* Solaris */
+
++#elif defined(__APPLE__)
++
++#include architecture/byte_order.h
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++# define LETOH_16(x) OSSwapInt16(x)
++# define HTOLE_16(x) OSSwapInt16(x)
++# define LETOH_32(x) OSSwapInt32(x)
++# define HTOLE_32(x) OSSwapInt32(x)
++#else
++# define LETOH_16(x) (x)
++# define HTOLE_16(x) (x)
++# define LETOH_32(x) (x)
++# define HTOLE_32(x) (x)
++#endif /* darwin */
++
+ #else
+
+ #include sys/endian.h
Modified: nixpkgs/trunk/pkgs/servers/x11/xorg/overrides.nix
==
--- nixpkgs/trunk/pkgs/servers/x11/xorg/overrides.nix Mon Aug 29 18:57:35
2011 (r28880)
+++ nixpkgs/trunk/pkgs/servers/x11/xorg/overrides.nix Mon Aug 29 18:58:59
2011 (r28881)
@@ -47,6 +47,10 @@
buildNativeInputs = [ args.perl ];
};
+ libpciaccess = attrs : attrs // {
+patches = [ ./libpciaccess-apple.patch ];
+ };
+
libX11 = attrs: attrs // {
preConfigure = setMalloc0ReturnsNullCrossCompiling;
postInstall =
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] new possible movement to git (?)
4e5566e6.9050...@shealevy.com 4e5b97be.5030...@tudelft.nl) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 So it would be nice if we had a more stable tree that users can update from safely. For example, we could have these Nixpkgs/NixOS trees/branches: - An unstable tree which receives developer commits. It might be in a broken state, so end users shouldn't use it. Hydra continuously builds it. Of course, complicated changes should be done in a feature tree/branch and pulled in when they're done. - A tested tree that automatically gets updated from the unstable tree when some set of Nixpkgs and NixOS tests succeed *and* the Nixpkgs channel is up to date. This tree should be fairly safe to use. - A stable tree that gets updated manually and conservatively (e.g., only security or stability updates). Does this sound reasonable? 1. Would we still need stdenv-updates, or could we just use feature branches for the individual update we care about then merge it into Of course, we will have to name stdenv-updates something new each time to keep track of what got merged where afterwards. unstable (or probably master in keeping with git lingo)? This would put rebuild work onto developers but since users should be using tested It doesn't look like we have large user-to-developer ratio.. they'll never have to manually rebuild their system (though they will have to download it). Maybe we still want these feature branches to be relatively long-running... 2. How does hydra decide which builds to add to its queue? If it only adds based on the latest commit in unstable, couldn't a steady enough flow of commits mean it never has a completely built channel for any given commit? Would there be a way to force hydra to try building the whole channel for a fixed commit if the tests pass or something like that? Currently Hydra builds some commit until it is completely built; then fetches new head. I see no reason not to keep it this way. 3. I like the idea of stable, but given the current development environment I think might go stale unless there's some sort of automated way to tell us to think about merging from testing at a particular point (e.g. it has been 6 months since the last major update on stable and commit 123456 of testing has passed a full suite of tests, so send an email to the maintainers of stable to remind them to start the process of updating stable). The problem is that hydra-built will never be in the position of passing set-theoretically more tests than last time - some packages are broken by gcc updates... Anyway, currently average release seems less stable than average trunk revision. 4. I'm not really sure which would be considered better practice, but couldn't the testing branch be accomplished with tags instead of a separate branch? From my understanding of your explanation, testing will always be a fast-forwardable subset of unstable, so it doesn't need to be its own branch. This doesn't apply to stable, since it will receive cherry-picked security updates between merges. Well, if you would like to track what happenned in some convenient manner, it looks like you would need at least Mercurial-style tags (or, even better, Monotone certs or Veracity stamps; note also that if you'd like to keep set of testing revisions easily accessible for future reference, you could also do that via a Monotone-style where all commits coincidentally also belong to another branch) This seems just to be a trade-off: if you want to use the tools git has over Mercurial for creation of history, you get less tools for organizing history. About where to host the repositories: we could do it on nixos.org, but using Github is rather nice because then I don't have to manage users or set up a web interface, and the pull request management seems rather nice. I just assumed you'd want it on nixos.org, but I'd definitely prefer github. It does all the hard work for you. Maybe nixos.org could be a read-only mirror for github or bitbucket development repository. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] new possible movement to git (?)
4e5566e6.9050...@shealevy.com 4e5b97be.5030...@tudelft.nl) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 So it would be nice if we had a more stable tree that users can update from safely. For example, we could have these Nixpkgs/NixOS trees/branches: - An unstable tree which receives developer commits. It might be in a broken state, so end users shouldn't use it. Hydra continuously builds it. Of course, complicated changes should be done in a feature tree/branch and pulled in when they're done. - A tested tree that automatically gets updated from the unstable tree when some set of Nixpkgs and NixOS tests succeed *and* the Nixpkgs channel is up to date. This tree should be fairly safe to use. - A stable tree that gets updated manually and conservatively (e.g., only security or stability updates). Does this sound reasonable? 1. Would we still need stdenv-updates, or could we just use feature branches for the individual update we care about then merge it into Of course, we will have to name stdenv-updates something new each time to keep track of what got merged where afterwards. Why would that be necessary? unstable (or probably master in keeping with git lingo)? This would put rebuild work onto developers but since users should be using tested It doesn't look like we have large user-to-developer ratio.. No, but as a developer I would have unstable checked out where I do my work, and as a user I would have testing checked out in /etc/nixos or be subscribed to testing as my channel. they'll never have to manually rebuild their system (though they will have to download it). Maybe we still want these feature branches to be relatively long-running... 2. How does hydra decide which builds to add to its queue? If it only adds based on the latest commit in unstable, couldn't a steady enough flow of commits mean it never has a completely built channel for any given commit? Would there be a way to force hydra to try building the whole channel for a fixed commit if the tests pass or something like that? Currently Hydra builds some commit until it is completely built; then fetches new head. I see no reason not to keep it this way. Ah, I wasn't aware that was how it works. So as long as it doesn't gc the results too soon, the current setup is fine. 3. I like the idea of stable, but given the current development environment I think might go stale unless there's some sort of automated way to tell us to think about merging from testing at a particular point (e.g. it has been 6 months since the last major update on stable and commit 123456 of testing has passed a full suite of tests, so send an email to the maintainers of stable to remind them to start the process of updating stable). The problem is that hydra-built will never be in the position of passing set-theoretically more tests than last time - some packages are broken by gcc updates... Anyway, currently average release seems less stable than average trunk revision. So do you think there should be no stable branch at all? In a hypothetical future where we have hundreds of users who are not all also developers, would they be using the latest nixpkgs all the time? 4. I'm not really sure which would be considered better practice, but couldn't the testing branch be accomplished with tags instead of a separate branch? From my understanding of your explanation, testing will always be a fast-forwardable subset of unstable, so it doesn't need to be its own branch. This doesn't apply to stable, since it will receive cherry-picked security updates between merges. Well, if you would like to track what happenned in some convenient manner, it looks like you would need at least Mercurial-style tags (or, even better, Monotone certs or Veracity stamps; note also that if you'd like to keep set of testing revisions easily accessible for future reference, you could also do that via a Monotone-style where all commits coincidentally also belong to another branch) This seems just to be a trade-off: if you want to use the tools git has over Mercurial for creation of history, you get less tools for organizing history. About where to host the repositories: we could do it on nixos.org, but using Github is rather nice because then I don't have to manage users or set up a web interface, and the pull request management seems rather nice. I just assumed you'd want it on nixos.org, but I'd definitely prefer github. It does all the hard work for you. Maybe nixos.org could be a read-only mirror for github or bitbucket development repository. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] new possible movement to git (?)
4e5566e6.9050...@shealevy.com 4e5b97be.5030...@tudelft.nl) 1. Would we still need stdenv-updates, or could we just use feature branches for the individual update we care about then merge it into Of course, we will have to name stdenv-updates something new each time to keep track of what got merged where afterwards. Why would that be necessary? Given that branches are mere pointers, I don't see how to find out what was stdenv-updates before after it has been merged into trunk and re-created unstable (or probably master in keeping with git lingo)? This would put rebuild work onto developers but since users should be using tested It doesn't look like we have large user-to-developer ratio.. No, but as a developer I would have unstable checked out where I do my work, and as a user I would have testing checked out in /etc/nixos or be subscribed to testing as my channel. An easy way to update to last completed Hydra build would be nice, true. I guess small development would be easier to do against testing, with subsequent merging. 3. I like the idea of stable, but given the current development environment I think might go stale unless there's some sort of automated way to tell us to think about merging from testing at a particular point (e.g. it has been 6 months since the last major update on stable and commit 123456 of testing has passed a full suite of tests, so send an email to the maintainers of stable to remind them to start the process of updating stable). The problem is that hydra-built will never be in the position of passing set-theoretically more tests than last time - some packages are broken by gcc updates... Anyway, currently average release seems less stable than average trunk revision. So do you think there should be no stable branch at all? In a hypothetical future where we have hundreds of users who are not all also developers, would they be using the latest nixpkgs all the time? Maybe we should care about that when we have some new ideas on doing it right. Or when we have enough developers to have up-to-date notion of what works, what is easy to fix and what is broken fundamentally. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] new possible movement to git (?)
4e5566e6.9050...@shealevy.com 4e5b97be.5030...@tudelft.nl) 1. Would we still need stdenv-updates, or could we just use feature branches for the individual update we care about then merge it into Of course, we will have to name stdenv-updates something new each time to keep track of what got merged where afterwards. Why would that be necessary? Given that branches are mere pointers, I don't see how to find out what was stdenv-updates before after it has been merged into trunk and re-created Ah, I see. Yeah, it would be nice if git had information in commits about which branch the commit was initially performed on. This seems like a really simple feature, not sure why it doesn't exist. unstable (or probably master in keeping with git lingo)? This would put rebuild work onto developers but since users should be using tested It doesn't look like we have large user-to-developer ratio.. No, but as a developer I would have unstable checked out where I do my work, and as a user I would have testing checked out in /etc/nixos or be subscribed to testing as my channel. An easy way to update to last completed Hydra build would be nice, true. I guess small development would be easier to do against testing, with subsequent merging. 3. I like the idea of stable, but given the current development environment I think might go stale unless there's some sort of automated way to tell us to think about merging from testing at a particular point (e.g. it has been 6 months since the last major update on stable and commit 123456 of testing has passed a full suite of tests, so send an email to the maintainers of stable to remind them to start the process of updating stable). The problem is that hydra-built will never be in the position of passing set-theoretically more tests than last time - some packages are broken by gcc updates... Anyway, currently average release seems less stable than average trunk revision. So do you think there should be no stable branch at all? In a hypothetical future where we have hundreds of users who are not all also developers, would they be using the latest nixpkgs all the time? Maybe we should care about that when we have some new ideas on doing it right. Or when we have enough developers to have up-to-date notion of what works, what is easy to fix and what is broken fundamentally. Fair enough. It's not like the creation of a stable branch will be that difficult in the future. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28882 - nixpkgs/trunk/pkgs/development/compilers/ghc
Author: simons Date: Mon Aug 29 20:09:57 2011 New Revision: 28882 URL: https://svn.nixos.org/websvn/nix/?rev=28882sc=1 Log: pkgs/development/compilers/ghc/7.0.4.nix: hard-code list of supported platforms I assumed that Hydra would arrive at that result anyway, but apparently it doesn't: no x86_64-darwin builds have occurred despite the fact that we can bootstrap on that architecture now. Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix == --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Mon Aug 29 18:58:59 2011(r28881) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Mon Aug 29 20:09:57 2011(r28882) @@ -38,7 +38,7 @@ stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; -platforms = ghc.meta.platforms; +platforms = [x86_64-linux i686-linux i686-darwin x86_64-darwin]; }; } ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28883 - nixpkgs/trunk/pkgs/tools/networking/p2p/gtk-gnutella
Author: simons
Date: Mon Aug 29 20:26:26 2011
New Revision: 28883
URL: https://svn.nixos.org/websvn/nix/?rev=28883sc=1
Log:
gtk-gnutella: updated to version 0.97
Modified:
nixpkgs/trunk/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
==
--- nixpkgs/trunk/pkgs/tools/networking/p2p/gtk-gnutella/default.nixMon Aug
29 20:09:57 2011(r28882)
+++ nixpkgs/trunk/pkgs/tools/networking/p2p/gtk-gnutella/default.nixMon Aug
29 20:26:26 2011(r28883)
@@ -1,11 +1,29 @@
-{stdenv, fetchurl, pkgconfig, glib, gtk, libxml2}:
+{stdenv, fetchurl, pkgconfig, glib, gtk, libxml2, bison, gettext, zlib}:
+let
+ name = gtk-gnutella;
+ version = 0.97;
+in
stdenv.mkDerivation {
- name = gtk-gnutella-0.96.1;
- builder = ./builder.sh;
+ name = ${name}-${version};
+
src = fetchurl {
-url = mirror://sourceforge/gtk-gnutella/gtk-gnutella-0.96.1.tar.bz2;
-md5 = 6529379cc105c1e98f501a67e8e875fd;
+url = mirror://sourceforge/${name}/${name}-${version}.tar.bz2;
+sha256 = 0l2gdzp517hjk31318djq0sww6kzckzl9rfqvhgspihn874lm9hb;
+ };
+
+ buildInputs = [pkgconfig glib gtk libxml2 bison gettext zlib];
+
+ NIX_LDFLAGS = -rpath ${zlib}/lib;
+ configureScript = ./Configure;
+ dontAddPrefix = true;
+ configureFlags = -d -e -D prefix=$out -D gtkversion=2 -D official=true;
+
+ meta = {
+homepage = http://gtk-gnutella.sourceforge.net/;;
+description = a server/client for Gnutella;
+license = stdenv.lib.licenses.gpl2;
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.simons ];
};
- buildInputs = [pkgconfig glib gtk libxml2];
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28884 - in nixpkgs/trunk/pkgs: development/libraries/haskell/aeson-native top-level
Author: simons
Date: Mon Aug 29 20:26:35 2011
New Revision: 28884
URL: https://svn.nixos.org/websvn/nix/?rev=28884sc=1
Log:
haskell-aeson-native: added version 0.3.3
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/aeson-native/
nixpkgs/trunk/pkgs/development/libraries/haskell/aeson-native/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/aeson-native/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/aeson-native/default.nix
Mon Aug 29 20:26:35 2011(r28884)
@@ -0,0 +1,23 @@
+{ cabal, attoparsec, blazeBuilder, blazeTextualNative, deepseq
+, hashable, mtl, syb, text, time, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+ pname = aeson-native;
+ version = 0.3.3;
+ sha256 = 1ckf0fqx0mdw7467kjk3q48fb4q5w6336i8fxk6j0wfk17xjfs8l;
+ buildDepends = [
+attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb
+text time unorderedContainers vector
+ ];
+ meta = {
+homepage = http://github.com/mailrank/aeson;;
+description = Fast JSON parsing and encoding;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:26:26
2011(r28883)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:26:35
2011(r28884)
@@ -362,6 +362,8 @@
aeson = callPackage ../development/libraries/haskell/aeson {};
+ aesonNative = callPackage ../development/libraries/haskell/aeson-native {};
+
ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {};
ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint
{};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28886 - in nixpkgs/trunk/pkgs: development/libraries/haskell/xss-sanitize top-level
Author: simons
Date: Mon Aug 29 20:26:45 2011
New Revision: 28886
URL: https://svn.nixos.org/websvn/nix/?rev=28886sc=1
Log:
haskell-xss-sanitize: added version 0.3.0.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/0.2.6.nix
- copied, changed from r28885,
nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/0.3.0.1.nix
- copied, changed from r28885,
nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/0.2.6.nix (from
r28885,
nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/default.nix)
==
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/0.3.0.1.nix (from
r28885,
nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/default.nix
Mon Aug 29 20:26:40 2011(r28885, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/xss-sanitize/0.3.0.1.nix
Mon Aug 29 20:26:45 2011(r28886)
@@ -1,10 +1,14 @@
-{ cabal, network, tagsoup, utf8String }:
+{ cabal, attoparsecText, cssText, network, tagsoup, text
+, utf8String
+}:
cabal.mkDerivation (self: {
pname = xss-sanitize;
- version = 0.2.6;
- sha256 = 18bkvrrkc0ga0610f8g3vghq0ib1yczn2n2zbzv7kg7m6bqgx2y5;
- buildDepends = [ network tagsoup utf8String ];
+ version = 0.3.0.1;
+ sha256 = 1rycdjl7b7bk100vgdwy6iighdqsbsyvrklp0zqbl1x45abph9pc;
+ buildDepends = [
+attoparsecText cssText network tagsoup text utf8String
+ ];
meta = {
homepage = http://github.com/gregwebs/haskell-xss-sanitize;;
description = sanitize untrusted HTML to prevent XSS attacks;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:26:40
2011(r28885)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:26:45
2011(r28886)
@@ -594,7 +594,9 @@
ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {};
- gitit = callPackage ../development/libraries/haskell/gitit {};
+ gitit = callPackage ../development/libraries/haskell/gitit {
+xssSanitize = self.xssSanitize_0_2_6;
+ };
glade = callPackage ../development/libraries/haskell/glade {
inherit (pkgs) pkgconfig glibc;
@@ -1298,7 +1300,9 @@
xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
- xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
+ xssSanitize_0_2_6 = callPackage
../development/libraries/haskell/xss-sanitize/0.2.6.nix {};
+ xssSanitize_0_3_0_1 = callPackage
../development/libraries/haskell/xss-sanitize/0.3.0.1.nix {};
+ xssSanitize = self.xssSanitize_0_3_0_1;
yap = callPackage ../development/libraries/haskell/yap {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28887 - in nixpkgs/trunk/pkgs: development/libraries/haskell/hamlet top-level
Author: simons
Date: Mon Aug 29 20:26:52 2011
New Revision: 28887
URL: https://svn.nixos.org/websvn/nix/?rev=28887sc=1
Log:
haskell-hamlet: added version 0.10.0
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix
- copied, changed from r28886,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix
- copied, changed from r28886,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix (from
r28886, nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix Mon Aug
29 20:26:45 2011(r28886, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix Mon Aug
29 20:26:52 2011(r28887)
@@ -1,12 +1,16 @@
-{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
+{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare
+, text
+}:
cabal.mkDerivation (self: {
pname = hamlet;
- version = 0.8.2.1;
- sha256 = 0798ic6qap4npw2rx42xcgmi1fcbwqvyic5x6vyyf6abvxv16925;
- buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
+ version = 0.10.0;
+ sha256 = 0xqlc03g0qnpnrw957108rpjbs88p9wwvcgmz7vc1f0k88lc0h6n;
+ buildDepends = [
+blazeBuilder blazeHtml failure parsec shakespeare text
+ ];
meta = {
-homepage = http://www.yesodweb.com/;;
+homepage = http://www.yesodweb.com/book/templates;;
description = Haml-like template files that are compile-time checked;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix (from
r28886, nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix)
==
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:26:45
2011(r28886)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:26:52
2011(r28887)
@@ -649,9 +649,13 @@
graphviz = callPackage ../development/libraries/haskell/graphviz {};
- hakyll = callPackage ../development/libraries/haskell/hakyll {};
+ hakyll = callPackage ../development/libraries/haskell/hakyll {
+hamlet = self.hamlet_0_8_2_1;
+ };
- hamlet = callPackage ../development/libraries/haskell/hamlet {};
+ 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;
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 - r28888 - in nixpkgs/trunk/pkgs: development/libraries/haskell/shakespeare development/libraries/haskell/shakespeare-css development/libraries/haskell/shakespeare-js top
Author: simons
Date: Mon Aug 29 20:27:05 2011
New Revision: 2
URL: https://svn.nixos.org/websvn/nix/?rev=2sc=1
Log:
haskell-packages.nix: added shakespeare packages
haskell-shakespeare-css: added version 0.10.0
haskell-shakespeare-js: added version 0.10.1
haskell-shakespeare: added version 0.10.0
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare/
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Mon Aug 29 20:27:05 2011(r2)
@@ -0,0 +1,18 @@
+{ cabal, parsec, shakespeare, text }:
+
+cabal.mkDerivation (self: {
+ pname = shakespeare-css;
+ version = 0.10.0;
+ sha256 = 12gdpxsh6x95m9vp0nrffri1bh8d6zhd7qqjrrkp49rvjf8fjwrk;
+ buildDepends = [ parsec shakespeare text ];
+ meta = {
+homepage = http://www.yesodweb.com/book/templates;;
+description = Stick your haskell variables into css at compile time;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
Mon Aug 29 20:27:05 2011(r2)
@@ -0,0 +1,18 @@
+{ cabal, shakespeare, text }:
+
+cabal.mkDerivation (self: {
+ pname = shakespeare-js;
+ version = 0.10.1;
+ sha256 = 0j9jzrnvarwkab9zynz8k60ilgj5kyqdm56lricpii27qlkqnmf3;
+ buildDepends = [ shakespeare text ];
+ meta = {
+homepage = http://www.yesodweb.com/book/templates;;
+description = Stick your haskell variables into javascript/coffeescript
at compile time;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare/default.nix
Mon Aug 29 20:27:05 2011(r2)
@@ -0,0 +1,18 @@
+{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
+
+cabal.mkDerivation (self: {
+ pname = shakespeare;
+ version = 0.10.0;
+ sha256 = 14q0z2q7c27pp6hnwzn50zjb4rzhy7znmahnzn8b59274jkbbzjs;
+ buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
+ meta = {
+homepage = http://www.yesodweb.com/book/templates;;
+description = A toolkit for making compile-time interpolated templates;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:26:52
2011(r28887)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:27:05
2011(r2)
@@ -1127,6 +1127,12 @@
SHA = callPackage ../development/libraries/haskell/SHA {};
+ shakespeare = callPackage ../development/libraries/haskell/shakespeare {};
+
+ shakespeareJs = callPackage ../development/libraries/haskell/shakespeare-js
{};
+
+ shakespeareCss = callPackage
../development/libraries/haskell/shakespeare-css {};
+
Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix
{};
ShellacHaskeline = callPackage
../development/libraries/haskell/Shellac/Shellac-haskeline.nix {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28892 - nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template
Author: simons
Date: Mon Aug 29 20:27:28 2011
New Revision: 28892
URL: https://svn.nixos.org/websvn/nix/?rev=28892sc=1
Log:
haskell-persistent-template: updated to version 0.6.1
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
Mon Aug 29 20:27:20 2011(r28891)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
Mon Aug 29 20:27:28 2011(r28892)
@@ -1,12 +1,12 @@
-{ cabal, monadControl, persistent, text, webRoutesQuasi }:
+{ cabal, monadControl, persistent, text }:
cabal.mkDerivation (self: {
pname = persistent-template;
- version = 0.5.1;
- sha256 = 163j36pm6fl64m4h8kgj9h19snh026ia1166p3c6rjw86qi9fk0r;
- buildDepends = [ monadControl persistent text webRoutesQuasi ];
+ version = 0.6.1;
+ sha256 = 1ggfdq1d32i5ny57cvdf8yw5pwhbw2sc31mrj1whb0ggkcwaqh9l;
+ buildDepends = [ monadControl persistent text ];
meta = {
-homepage = http://www.yesodweb.com/;;
+homepage = http://www.yesodweb.com/book/persistent;;
description = Type-safe, non-relational, multi-backend persistence;
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 - r28893 - nixpkgs/trunk/pkgs/development/libraries/haskell/persistent
Author: simons
Date: Mon Aug 29 20:27:34 2011
New Revision: 28893
URL: https://svn.nixos.org/websvn/nix/?rev=28893sc=1
Log:
haskell-persistent: updated to version 0.6.1
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
Mon Aug 29 20:27:28 2011(r28892)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Mon Aug 29 20:27:34 2011(r28893)
@@ -1,20 +1,18 @@
-{ cabal, blazeHtml, enumerator, monadControl, parsec, pool, sqlite
-, text, time, transformers
+{ cabal, blazeHtml, enumerator, monadControl, mtl, parsec
+, pathPieces, pool, sqlite, text, time, transformers
}:
cabal.mkDerivation (self: {
pname = persistent;
- version = 0.5.1;
- sha256 = 1m0558vi99z15q0w62a9rkz25n8djswggbad9m0il359jb3mrzsd;
- isLibrary = true;
- isExecutable = true;
+ version = 0.6.1;
+ sha256 = 1pb34n7rwj6jvk18c802kd99rrlhrav1hkx600rs6pp5zjic3mp7;
buildDepends = [
-blazeHtml enumerator monadControl parsec pool text time
-transformers
+blazeHtml enumerator monadControl mtl parsec pathPieces pool text
+time transformers
];
extraLibraries = [ sqlite ];
meta = {
-homepage = http://docs.yesodweb.com/book/persistent;;
+homepage = http://www.yesodweb.com/book/persistent;;
description = Type-safe, non-relational, multi-backend persistence;
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 - r28894 - nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static
Author: simons
Date: Mon Aug 29 20:27:47 2011
New Revision: 28894
URL: https://svn.nixos.org/websvn/nix/?rev=28894sc=1
Log:
haskell-wai-app-static: updated to version 0.3.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
Mon Aug 29 20:27:34 2011(r28893)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
Mon Aug 29 20:27:47 2011(r28894)
@@ -1,17 +1,18 @@
-{ cabal, blazeBuilder, blazeHtml, fileEmbed, httpTypes, text, time
-, transformers, unixCompat, wai
+{ cabal, base64Bytestring, blazeBuilder, blazeHtml, cryptohash
+, fileEmbed, httpDate, httpTypes, text, time, transformers
+, unixCompat, wai
}:
cabal.mkDerivation (self: {
pname = wai-app-static;
- version = 0.1.0;
- sha256 = 0k9pl1kanrb2pqp1bs5s1lxb7ayq2ddf2cxi5q2v9yq22s229xln;
+ version = 0.3.3;
+ sha256 = 04b4cw93agw136xjh9rssiw96vz3kxji7zh209brwfnwh13bra17;
buildDepends = [
-blazeBuilder blazeHtml fileEmbed httpTypes text time transformers
-unixCompat wai
+base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
+httpDate httpTypes text time transformers unixCompat wai
];
meta = {
-homepage = http://www.yesodweb.com/;;
+homepage = http://www.yesodweb.com/book/wai;;
description = WAI application for static serving;
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 - r28895 - nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra
Author: simons
Date: Mon Aug 29 20:28:02 2011
New Revision: 28895
URL: https://svn.nixos.org/websvn/nix/?rev=28895sc=1
Log:
haskell-wai-extra: updated to version 0.4.2
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 Aug 29 20:27:47 2011(r28894)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
Mon Aug 29 20:28:02 2011(r28895)
@@ -5,14 +5,14 @@
cabal.mkDerivation (self: {
pname = wai-extra;
- version = 0.4.0.3;
- sha256 = 1mfjn9rxzcfdwvimjw57j7vpr1y64ia7905c8nxa9968sdy0dhsy;
+ version = 0.4.2;
+ sha256 = 1k2dsjramy14rfd1j8k7zgirdfl2zybd0z0pxkvxdrgr9s2pk51y;
buildDepends = [
blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
httpTypes network text time transformers wai zlibBindings
];
meta = {
-homepage = http://github.com/snoyberg/wai-extra;;
+homepage = http://github.com/yesodweb/wai;;
description = Provides some basic WAI handlers and middleware;
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 - r28896 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth
Author: simons
Date: Mon Aug 29 20:28:06 2011
New Revision: 28896
URL: https://svn.nixos.org/websvn/nix/?rev=28896sc=1
Log:
haskell-yesod-auth: updated to version 0.7.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 Aug 29 20:28:02 2011(r28895)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Mon Aug 29 20:28:06 2011(r28896)
@@ -1,18 +1,19 @@
-{ cabal, aeson, authenticate, blazeHtml, controlMonadAttempt
+{ cabal, aesonNative, authenticate, blazeHtml, controlMonadAttempt
, hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate
-, pureMD5, random, SHA, text, transformers, wai, webRoutesQuasi
-, yesodCore, yesodForm, yesodJson, yesodPersistent
+, pureMD5, pwstoreFast, random, SHA, shakespeareCss, text
+, transformers, wai, yesodCore, yesodForm, yesodJson
+, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = yesod-auth;
- version = 0.4.0.2;
- sha256 = 1vf02kgm3pcak4igvp8009lgv8i8bir272byw0ma2mg6bl0sgyvl;
+ version = 0.7.1;
+ sha256 = 066aq7c5gwbspbib748ky3lsb84llnb954n018fk5xs7b4gbyybk;
buildDepends = [
-aeson authenticate blazeHtml controlMonadAttempt hamlet
+aesonNative authenticate blazeHtml controlMonadAttempt hamlet
httpEnumerator mimeMail persistent persistentTemplate pureMD5
-random SHA text transformers wai webRoutesQuasi yesodCore yesodForm
-yesodJson yesodPersistent
+pwstoreFast random SHA shakespeareCss text transformers wai
+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 - r28897 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core
Author: simons
Date: Mon Aug 29 20:28:10 2011
New Revision: 28897
URL: https://svn.nixos.org/websvn/nix/?rev=28897sc=1
Log:
haskell-yesod-core: updated to version 0.9.1
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 Aug 29 20:28:06 2011(r28896)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Mon Aug 29 20:28:10 2011(r28897)
@@ -1,19 +1,19 @@
{ cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal
, clientsession, cookie, enumerator, failure, hamlet, httpTypes
-, monadControl, parsec, random, text, time, transformers, wai
-, waiExtra, webRoutesQuasi
+, monadControl, parsec, pathPieces, random, shakespeare
+, shakespeareCss, shakespeareJs, strictConcurrency, text, time
+, transformers, wai, waiExtra
}:
cabal.mkDerivation (self: {
pname = yesod-core;
- version = 0.8.3.2;
- sha256 = 0k0lgd9p8mrwwcypx1nfr1z2rq5wk4gvjc1fbvla0c9nabqnbfzs;
- isLibrary = true;
- isExecutable = true;
+ version = 0.9.1;
+ sha256 = 03dbn915g6jkwk9fp5naqv5bq613nlfpc8jd7568cc1l41b95cbf;
buildDepends = [
blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie
-enumerator failure hamlet httpTypes monadControl parsec random text
-time transformers wai waiExtra webRoutesQuasi
+enumerator failure hamlet httpTypes monadControl parsec pathPieces
+random shakespeare shakespeareCss shakespeareJs strictConcurrency
+text time transformers wai waiExtra
];
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 - r28898 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form
Author: simons
Date: Mon Aug 29 20:28:14 2011
New Revision: 28898
URL: https://svn.nixos.org/websvn/nix/?rev=28898sc=1
Log:
haskell-yesod-form: updated to version 0.3.1
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 Aug 29 20:28:10 2011(r28897)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Mon Aug 29 20:28:14 2011(r28898)
@@ -1,16 +1,16 @@
{ cabal, blazeBuilder, blazeHtml, dataDefault, emailValidate
-, hamlet, network, persistent, text, time, transformers
-, webRoutesQuasi, xssSanitize, yesodCore, yesodPersistent
+, hamlet, network, persistent, shakespeareCss, shakespeareJs, text
+, time, transformers, wai, xssSanitize, yesodCore, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = yesod-form;
- version = 0.1.0.1;
- sha256 = 108652256g82xapsn0w4cbficq4ikwlsa8yis2zq7izxk48livlm;
+ version = 0.3.1;
+ sha256 = 0xa9950michbwlp90xcr8ybpig7f026zwq28lg03zavnaqisqkfj;
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
-persistent text time transformers webRoutesQuasi xssSanitize
-yesodCore yesodPersistent
+persistent shakespeareCss shakespeareJs text time transformers wai
+xssSanitize yesodCore 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 - r28899 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-json
Author: simons
Date: Mon Aug 29 20:28:19 2011
New Revision: 28899
URL: https://svn.nixos.org/websvn/nix/?rev=28899sc=1
Log:
haskell-yesod-json: updated to version 0.2.1
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 Aug 29 20:28:14 2011(r28898)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-json/default.nix
Mon Aug 29 20:28:19 2011(r28899)
@@ -1,10 +1,10 @@
-{ cabal, aeson, blazeTextual, hamlet, text, vector, yesodCore }:
+{ cabal, aesonNative, shakespeareJs, text, vector, yesodCore }:
cabal.mkDerivation (self: {
pname = yesod-json;
- version = 0.1.1.2;
- sha256 = 0d6dkhzjpxp3687x914h67swm4lgsalb1xr13gz53ddb0qj18n7j;
- buildDepends = [ aeson blazeTextual hamlet text vector yesodCore ];
+ version = 0.2.1;
+ sha256 = 1d710pqrdafyz8s0spd19vwvx5v9kwy44wb0byz3445jhi3kwn88;
+ buildDepends = [ aesonNative 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...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28900 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-persistent
Author: simons
Date: Mon Aug 29 20:28:23 2011
New Revision: 28900
URL: https://svn.nixos.org/websvn/nix/?rev=28900sc=1
Log:
haskell-yesod-persistent: updated to version 0.2.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-persistent/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-persistent/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-persistent/default.nix
Mon Aug 29 20:28:19 2011(r28899)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-persistent/default.nix
Mon Aug 29 20:28:23 2011(r28900)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = yesod-persistent;
- version = 0.1.0;
- sha256 = 1h0kk3sx0c4c3pcg3s2c5kfy0kz7gci45h4gsgrkhkcgg0pg324c;
+ version = 0.2.1;
+ sha256 = 1ka8jsxr7i5rcjxnv82ykq34yqxqzxdvk4b3ck7pbvx2a4g7bxw9;
buildDepends = [
failure persistent persistentTemplate transformers yesodCore
];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28901 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static
Author: simons
Date: Mon Aug 29 20:28:27 2011
New Revision: 28901
URL: https://svn.nixos.org/websvn/nix/?rev=28901sc=1
Log:
haskell-yesod-static: updated to version 0.3.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static/default.nix
Mon Aug 29 20:28:23 2011(r28900)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static/default.nix
Mon Aug 29 20:28:27 2011(r28901)
@@ -1,16 +1,14 @@
-{ cabal, base64Bytestring, cereal, pureMD5, text, transformers
-, waiAppStatic, yesodCore
+{ cabal, base64Bytestring, cereal, fileEmbed, httpTypes, pureMD5
+, text, transformers, unixCompat, wai, waiAppStatic, yesodCore
}:
cabal.mkDerivation (self: {
pname = yesod-static;
- version = 0.1.0.1;
- sha256 = 0icb1wp0ndvl54shjyv0apmias60j2gjbcv7i92dxnl3fzx74d3p;
- isLibrary = true;
- isExecutable = true;
+ version = 0.3.0.1;
+ sha256 = 1dvg60kawmvczwxvkxzx5k19y36i23fi0faw71ck58mlkjdczby5;
buildDepends = [
-base64Bytestring cereal pureMD5 text transformers waiAppStatic
-yesodCore
+base64Bytestring cereal fileEmbed httpTypes pureMD5 text
+transformers unixCompat wai waiAppStatic yesodCore
];
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 - r28902 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod
Author: simons
Date: Mon Aug 29 20:28:32 2011
New Revision: 28902
URL: https://svn.nixos.org/websvn/nix/?rev=28902sc=1
Log:
haskell-yesod: updated to version 0.9.1
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 Aug
29 20:28:27 2011(r28901)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Mon Aug
29 20:28:32 2011(r28902)
@@ -1,20 +1,20 @@
-{ cabal, attoparsecText, blazeBuilder, hamlet, hjsmin, httpTypes
-, mimeMail, monadControl, parsec, text, time, transformers
-, unixCompat, wai, waiExtra, warp, yesodAuth, yesodCore, yesodForm
-, yesodJson, yesodPersistent, yesodStatic
+{ cabal, attoparsecText, blazeBuilder, blazeHtml, hamlet, httpTypes
+, monadControl, parsec, shakespeareCss, shakespeareJs, text, time
+, transformers, unixCompat, wai, waiExtra, warp, yesodAuth
+, yesodCore, yesodForm, yesodJson, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = yesod;
- version = 0.8.2.1;
- sha256 = 0idpgzbzy31bl5khc83wgi9a9mzrymris0mg5dlc4kj4sd5a1ksi;
+ version = 0.9.1;
+ sha256 = 1ag3lca75lrriycbscspb5yyishacgxjx0rybc3x4z1dqnkn1r71;
isLibrary = true;
isExecutable = true;
buildDepends = [
-attoparsecText blazeBuilder hamlet hjsmin httpTypes mimeMail
-monadControl parsec text time transformers unixCompat wai waiExtra
-warp yesodAuth yesodCore yesodForm yesodJson yesodPersistent
-yesodStatic
+attoparsecText blazeBuilder blazeHtml hamlet httpTypes monadControl
+parsec shakespeareCss shakespeareJs 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 - r28903 - in nixpkgs/trunk/pkgs: development/libraries/haskell/monads-fd development/libraries/haskell/salvia development/libraries/haskell/salvia-protocol top-level
Author: simons
Date: Mon Aug 29 21:44:30 2011
New Revision: 28903
URL: https://svn.nixos.org/websvn/nix/?rev=28903sc=1
Log:
Dropped obsolete Haskell packages monads-fd, salvia, and salvia-protocol.
These packages don't build with any of our compilers.
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/monads-fd/
nixpkgs/trunk/pkgs/development/libraries/haskell/salvia/
nixpkgs/trunk/pkgs/development/libraries/haskell/salvia-protocol/
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 Mon Aug 29 20:28:32
2011(r28902)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 21:44:30
2011(r28903)
@@ -859,10 +859,6 @@
MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
- monadsFd_0_0_0_1 = callPackage
../development/libraries/haskell/monads-fd/0.0.0.1.nix {};
- monadsFd_0_2_0_0 = callPackage
../development/libraries/haskell/monads-fd/0.2.0.0.nix {};
- monadsFd = self.monadsFd_0_2_0_0;
-
mpppc = callPackage ../development/libraries/haskell/mpppc {};
mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix
{};
@@ -1064,12 +1060,6 @@
safe = callPackage ../development/libraries/haskell/safe {};
- salvia = callPackage ../development/libraries/haskell/salvia {};
-
- salviaProtocol = callPackage
../development/libraries/haskell/salvia-protocol {
-parsec = self.parsec2;
- };
-
sendfile = callPackage ../development/libraries/haskell/sendfile {};
semigroups = callPackage ../development/libraries/haskell/semigroups {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28904 - in nixpkgs/trunk/pkgs: development/libraries/haskell/MaybeT-transformers top-level
Author: simons
Date: Mon Aug 29 21:44:36 2011
New Revision: 28904
URL: https://svn.nixos.org/websvn/nix/?rev=28904sc=1
Log:
Dropped obsolete haskell-MaybeT-transformers.
The package doesn't build with any of our compilers.
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/MaybeT-transformers/
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 Mon Aug 29 21:44:30
2011(r28903)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 21:44:36
2011(r28904)
@@ -829,10 +829,6 @@
MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
- MaybeTTransformers = callPackage
../development/libraries/haskell/MaybeT-transformers {
-monadsFd = self.monadsFd_0_0_0_1;
- };
-
MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {};
mersenneRandomPure64 = callPackage
../development/libraries/haskell/mersenne-random-pure64 {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28905 - nixpkgs/trunk/pkgs/development/libraries/aspell
Author: piotr
Date: Mon Aug 29 21:45:42 2011
New Revision: 28905
URL: https://svn.nixos.org/websvn/nix/?rev=28905sc=1
Log:
added polish dictionary to the list
Modified:
nixpkgs/trunk/pkgs/development/libraries/aspell/dictionaries.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/aspell/dictionaries.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/aspell/dictionaries.nixMon Aug
29 21:44:36 2011(r28904)
+++ nixpkgs/trunk/pkgs/development/libraries/aspell/dictionaries.nixMon Aug
29 21:45:42 2011(r28905)
@@ -103,6 +103,15 @@
'';
};
+ pl = buildDict {
+shortName = pl-6.0_20061121;
+fullName = Polish;
+src = fetchurl {
+ url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2;
+ sha256 = 0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1;
+};
+ };
+
ru = buildDict {
shortName = ru-0.99f7-1;
fullName = Russian;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28906 - in nixpkgs/trunk/pkgs: development/libraries/haskell/emgm top-level
Author: simons
Date: Mon Aug 29 21:46:22 2011
New Revision: 28906
URL: https://svn.nixos.org/websvn/nix/?rev=28906sc=1
Log:
Dropped obsolete haskell-emgm.
The package doesn't build with any of our compilers.
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/emgm/
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 Mon Aug 29 21:45:42
2011(r28905)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 21:46:22
2011(r28906)
@@ -543,8 +543,6 @@
filepath = callPackage ../development/libraries/haskell/filepath {};
- emgm = callPackage ../development/libraries/haskell/emgm {};
-
extensibleExceptions_0_1_1_0 = callPackage
../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {};
extensibleExceptions_0_1_1_2 = callPackage
../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {};
extensibleExceptions_0_1_1_3 = callPackage
../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28907 - in hydra-config/gnu/trunk: gmp mpfr
Author: ludo
Date: Mon Aug 29 21:47:22 2011
New Revision: 28907
URL: https://svn.nixos.org/websvn/nix/?rev=28907sc=1
Log:
MPFR: Add `build_with_old_gmp' job.
Added:
hydra-config/gnu/trunk/gmp/4.3.2.nix
Modified:
hydra-config/gnu/trunk/mpfr/release.nix
Added: hydra-config/gnu/trunk/gmp/4.3.2.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ hydra-config/gnu/trunk/gmp/4.3.2.nixMon Aug 29 21:47:22 2011
(r28907)
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, m4, cxx ? true}:
+
+stdenv.mkDerivation rec {
+ name = gmp-4.3.2;
+
+ src = fetchurl {
+url = mirror://gnu/gmp/${name}.tar.bz2;
+sha256 = 0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck;
+ };
+
+ buildNativeInputs = [m4];
+
+ configureFlags = (if cxx then [ --enable-cxx ] else [ --disable-cxx ])
+++ (stdenv.lib.optional (stdenv.system != i686-darwin)
+ [ --enable-fat ]);
+
+ doCheck = true;
+
+ meta = {
+description = A free library for arbitrary precision arithmetic,
operating on signed integers, rational numbers, and floating point numbers;
+homepage = http://gmplib.org/;
+license = LGPL;
+ };
+}
Modified: hydra-config/gnu/trunk/mpfr/release.nix
==
--- hydra-config/gnu/trunk/mpfr/release.nix Mon Aug 29 21:46:22 2011
(r28906)
+++ hydra-config/gnu/trunk/mpfr/release.nix Mon Aug 29 21:47:22 2011
(r28907)
@@ -40,25 +40,54 @@
maintainers =
[ Paul Zimmermann paul.zimmerm...@loria.fr ];
};
-in
- import ../gnu-jobs.nix {
-name = mpfr;
-src = mpfrSrc;
-inherit nixpkgs meta;
-useLatestGnulib = false;
-enableGnuCrossBuild = true;
-
-customEnv = {
-
- tarball = pkgs: {
- buildInputs = [ gmp ]
- ++ (with pkgs; [ xz zip texinfo automake111x perl ]);
-autoconfPhase = autoreconf -vfi;
-patches = [ ./ck-version-info.patch ];
- };
- build = pkgs: { buildInputs = [ gmp ]; };
- coverage = pkgs: { buildInputs = [ gmp ]; };
- xbuild_gnu = pkgs: { buildInputs = [ gmp_xgnu ]; };
+ # The minimum required GMP version.
+ old_gmp = pkgs:
+import ../gmp/4.3.2.nix {
+ inherit (pkgs) stdenv fetchurl m4;
+};
+
+ jobs =
+import ../gnu-jobs.nix {
+ name = mpfr;
+ src = mpfrSrc;
+ inherit nixpkgs meta;
+ useLatestGnulib = false;
+ enableGnuCrossBuild = true;
+
+ customEnv = {
+
+tarball = pkgs: {
+ buildInputs = [ gmp ]
+++ (with pkgs; [ xz zip texinfo automake111x perl ]);
+ autoconfPhase = autoreconf -vfi;
+ patches = [ ./ck-version-info.patch ];
+};
+
+build = pkgs: { buildInputs = [ gmp ]; };
+coverage = pkgs: { buildInputs = [ gmp ]; };
+xbuild_gnu = pkgs: { buildInputs = [ gmp_xgnu ]; };
+ };
};
- }
+in
+ jobs
+
+ //
+
+ {
+# Extra job to build with an old GMP.
+build_with_old_gmp =
+ { system ? x86_64-linux
+ , tarball ? jobs.tarball
+ }:
+
+ let
+pkgs = import nixpkgs { inherit system; };
+build = jobs.build {};
+ in
+pkgs.releaseTools.nixBuild ({
+ src = tarball;
+ buildInputs = [ (old_gmp pkgs) ];
+ inherit (build) name meta succeedOnFailure keepBuildDirectory;
+});
+ }
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28908 - nixpkgs/trunk/pkgs/tools/networking/p2p/gtk-gnutella
Author: simons Date: Mon Aug 29 22:21:29 2011 New Revision: 28908 URL: https://svn.nixos.org/websvn/nix/?rev=28908sc=1 Log: pkgs/tools/networking/p2p/gtk-gnutella/builder.sh: dropped obsolete file Deleted: nixpkgs/trunk/pkgs/tools/networking/p2p/gtk-gnutella/builder.sh ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28909 - nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano
Author: urkud
Date: Mon Aug 29 22:43:03 2011
New Revision: 28909
URL: https://svn.nixos.org/websvn/nix/?rev=28909sc=1
Log:
Trying to fix nepomukserver startup problem
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix Mon Aug
29 22:21:29 2011(r28908)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix Mon Aug
29 22:43:03 2011(r28909)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }:
stdenv.mkDerivation rec {
name = soprano-2.7.0;
@@ -8,8 +8,14 @@
sha256 = 1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z;
};
+ patches = [ (fetchurl {
+url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
+name = soprano-virtuoso-restart.patch;
+sha256 = 0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y;
+ })];
+
# We disable the Java backend, since we do not need them and they make the
closure size much bigger
- buildInputs = [ cmake qt4 clucene_core redland libiodbc ];
+ buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ];
meta = {
homepage = http://soprano.sourceforge.net/;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28910 - in nixpkgs/trunk/pkgs: applications/office/kmymoney top-level
Author: urkud
Date: Mon Aug 29 22:43:11 2011
New Revision: 28910
URL: https://svn.nixos.org/websvn/nix/?rev=28910sc=1
Log:
Add kmymoney
Added:
nixpkgs/trunk/pkgs/applications/office/kmymoney/
nixpkgs/trunk/pkgs/applications/office/kmymoney/default.nix
nixpkgs/trunk/pkgs/applications/office/kmymoney/qgpgme.patch
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/office/kmymoney/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/office/kmymoney/default.nix Mon Aug 29
22:43:11 2011(r28910)
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext,
+ shared_mime_info, perl, boost, gpgme }:
+
+stdenv.mkDerivation rec {
+ name = kmymoney-4.5.3;
+
+ src = fetchurl {
+url = mirror://sourceforge/kmymoney2/${name}.tar.bz2;
+sha256 = 1yvgyzybfm1ajswwq3w3kdij4y2cyhfkk52xhv7dbp1wrxsp5cx9;
+ };
+
+ buildInputs = [ kdelibs kdepimlibs perl boost gpgme ];
+ buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ];
+
+ patches = [ ./qgpgme.patch ];
+
+ meta = {
+homepage = http://kmymoney2.sourceforge.net/;
+description = KDE personal money manager;
+inherit (kdelibs.meta) platforms maintainers;
+ };
+}
Added: nixpkgs/trunk/pkgs/applications/office/kmymoney/qgpgme.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/office/kmymoney/qgpgme.patchMon Aug
29 22:43:11 2011(r28910)
@@ -0,0 +1,17 @@
+KMymoney tries to find qgpgme before kdepimlibs. This is wrong because
+FindQGpgme is installed by kdepimlibs, thus can be invisible until kdepimlibs
+found.
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6d7305..88bac67 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -59,8 +59,8 @@ else (WIN32)
+ find_package(Boost 1.33.1 COMPONENTS graph)
+ endif (WIN32)
+ # needed by libkgpgfile
+-find_package(QGpgme REQUIRED)
+ find_package(KdepimLibs REQUIRED)
++find_package(QGpgme REQUIRED)
+ find_package(SharedMimeInfo REQUIRED)
+
+ add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 22:43:03
2011(r28909)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 22:43:11
2011(r28910)
@@ -7863,6 +7863,8 @@
inherit (pkgs.gtkLibs) pango;
};
+ kmymoney = callPackage ../applications/office/kmymoney { };
+
kipi_plugins = callPackage ../applications/graphics/kipi-plugins {
inherit (pkgs.gtkLibs) gdk_pixbuf;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28911 - nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies
Author: urkud
Date: Mon Aug 29 22:48:36 2011
New Revision: 28911
URL: https://svn.nixos.org/websvn/nix/?rev=28911sc=1
Log:
SDO-0.8.0
Modified:
nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix
Modified: nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix
==
--- nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix Mon Aug
29 22:43:11 2011(r28910)
+++ nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix Mon Aug
29 22:48:36 2011(r28911)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = shared-desktop-ontologies-0.7.1;
+ name = shared-desktop-ontologies-0.8.0;
src = fetchurl {
url = mirror://sourceforge/oscaf/${name}.tar.bz2;
-sha256 = 1b38amxr4b0n6cyy9l3lgzyjsky172cjphjr0iscahrlrc0h4phy;
+sha256 = 0wf4gli2akkqbl944lqjjy2hvcfagq6zzmdg7fkzr61p6vw7nk82;
};
buildInputs = [ cmake ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: new possible movement to git (?)
Hi, Given that branches are mere pointers, I don't see how to find out what was stdenv-updates before after it has been merged into trunk and re-created Yeah, it would be nice if git had information in commits about which branch the commit was initially performed on. This seems like a really simple feature, not sure why it doesn't exist. personally, I don't see why that information is relevant. Branch names are a local affair in Git. It's quite possible for two repositories to track the same content using completely different branch names. So why bother recording the name if it doesn't have any significance outside of the repository? Other DVCS make a lot of fuss about branch names, like monotone, but I don't see any gain in a distributed project. The whole notion of having a stdenv-updates branch in the first place is obsolete in Git. Instead, we would have many small topic branches for specific features. Also, I'm not quite sure why there should be an extra stable branch. As far as I am concerned, master ought to be stable. Take care, Peter ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: new possible movement to git (?)
On 30/08/11 00:51, Peter Simons wrote: Hi, Given that branches are mere pointers, I don't see how to find out what was stdenv-updates before after it has been merged into trunk and re-created Yeah, it would be nice if git had information in commits about which branch the commit was initially performed on. This seems like a really simple feature, not sure why it doesn't exist. personally, I don't see why that information is relevant. Branch names are a local affair in Git. It's quite possible for two repositories to track the same content using completely different branch names. So why bother recording the name if it doesn't have any significance outside of the repository? Other DVCS make a lot of fuss about branch names, like monotone, but I don't see any gain in a distributed project. The whole notion of having a stdenv-updates branch in the first place is obsolete in Git. Instead, we would have many small topic branches for specific features. if you want branch to show in history you would have to push that branch ti remote repo as well (using --no-ff option). but as Peter pointed, branches in git are matter of local higene. You name it however you want and make sure you merge them to remote branch. Git doesn't force to you specific branching policy localy while still playing nice with policy used on remote branch. Also, I'm not quite sure why there should be an extra stable branch. As far as I am concerned, master ought to be stable. Or master is unstable and there is stable branch. As long as its documented what is where it doesn't really matter. Maybe master being stable makes more sense since usually newcomers always look there and considered its stable they will have better first time experience (or maybe this is not wanted :P). ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Re: new possible movement to git (?)
Peter Simons sim...@cryp.to wrote: Hi, Given that branches are mere pointers, I don't see how to find out what was stdenv-updates before after it has been merged into trunk and re-created Yeah, it would be nice if git had information in commits about which branch the commit was initially performed on. This seems like a really simple feature, not sure why it doesn't exist. personally, I don't see why that information is relevant. Branch names are a local affair in Git. It's quite possible for two repositories to track the same content using completely different branch names. So why bother recording the name if it doesn't have any significance outside of the repository? Other DVCS make a lot of fuss about branch names, like monotone, but I don't see any gain in a distributed project. The whole notion of having a stdenv-updates branch in the first place is obsolete in Git. Instead, we would have many small topic branches for specific features. But stdenv-updates isn't meant as a really big topic branch. It's meant as a place for changes that will require rebuilding the system, so we can minimize the number of times we require that. How does git help with that? Also, I'm not quite sure why there should be an extra stable branch. As far as I am concerned, master ought to be stable. Some people desire the ability to expect most packages to build, some to use the latest packages. These desires are often in tension. Take care, Peter ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev -- Sent from my Android phone with K-9 Mail. Please excuse my brevity. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28912 - in nixpkgs/trunk/pkgs: applications/misc/get_iplayer top-level
Author: rob
Date: Tue Aug 30 00:14:16 2011
New Revision: 28912
URL: https://svn.nixos.org/websvn/nix/?rev=28912sc=1
Log:
add get_iplayer 2.80
Added:
nixpkgs/trunk/pkgs/applications/misc/get_iplayer/
nixpkgs/trunk/pkgs/applications/misc/get_iplayer/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/misc/get_iplayer/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/misc/get_iplayer/default.nixTue Aug
30 00:14:16 2011(r28912)
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl}:
+
+stdenv.mkDerivation {
+ name = get_iplayer-2.80;
+
+ buildInputs = [makeWrapper perl];
+
+ installPhase = ''
+ensureDir $out/bin
+cp get_iplayer $out/bin
+wrapProgram $out/bin/get_iplayer --suffix PATH
${ffmpeg}/bin:${flvstreamer}/bin
+ '';
+
+ src = fetchurl {
+url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.80.tar.gz;
+sha256 = 1hnadryyzca3bv1hfk2q3np9ihwvyxa3prwcrply6ywy4vnayjf8;
+ };
+
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 22:48:36
2011(r28911)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 30 00:14:16
2011(r28912)
@@ -6529,6 +6529,8 @@
gtksharp = gtksharp1;
};
+ get_iplayer = callPackage ../applications/misc/get_iplayer {};
+
gimp = callPackage ../applications/graphics/gimp {
inherit (gnome) gtk libart_lgpl;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: new possible movement to git (?)
1e1d23499a69570914f03bc0a196953a.squir...@webmail.shealevy.com) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 Hi, Given that branches are mere pointers, I don't see how to find out what was stdenv-updates before after it has been merged into trunk and re-created Yeah, it would be nice if git had information in commits about which branch the commit was initially performed on. This seems like a really simple feature, not sure why it doesn't exist. personally, I don't see why that information is relevant. Branch names are a local affair in Git. It's quite possible for two repositories to So large projects model persistent branches with separate repositories, and still cannot keep track of what went where in the first place. track the same content using completely different branch names. So why bother recording the name if it doesn't have any significance outside of This is sometimes reverse thinking. What you say is Git doesn't provide nice tools to work with global branches, so they are useless. In Linux, separate feature branches are global and persistent. They use separate repositories to distribute load and because Git doesn't give them anything else. In Mozilla separate branches follow a naming system and live inside one repository. We do want long-lived global feature branches - if not, why not simply have SVN as the main repo and use whatever system you prefer for tracking local changes? Because SVN does allow global bracnhes? Mercurial used to have way of dealing with branches similar to what you described; they allowed keeping more data about intentions to fix the interface. Git makes complete format stability one of its ways to ensure overall reliability of the system, so it is unlikely Git will allow to store any new kinds of information about commits in-repo. the repository? Other DVCS make a lot of fuss about branch names, like monotone, but I don't see any gain in a distributed project. Monotone promotes a consistent culture of naming branches. The basic things that come from that is that I can sensibly manage one Monotone database and make checkouts of whatever project I need when I need them. The whole notion of having a stdenv-updates branch in the first place is obsolete in Git. Instead, we would have many small topic branches for specific features. Well, we could call our stdenv-updates branches add-glibc-2.7 etc. We didn't do it as a matter of development organization, not because of some VCS matter. It is impossible to make stdenv-updates branch small if you want anything to work after the merge - even GNU TLS updates often break some networking applications; gcc updates require rechecking most other packages. Sometimes it is prefereable to update many packages and then wait for upstream fixes in some more. So this branch will not be short-lived - most probably, neither in days nor in commits. Stdenv-updates has a few meanings conveying developer intent: first, it is a branch where full-rebuild updates go; second, Hydra has a task to build stdenv-updates branch; its static name means that the task is simply switched on and off, not changed every time. That way there is less place for mistakes - and so less burden for Hydra maintenance. Also, I'm not quite sure why there should be an extra stable branch. As far as I am concerned, master ought to be stable. You either shift the problem or understand it not in a way others do. There is some code line that is build by Hydra and that is hoped to be somewhat stable. Currently it is trunk. So people simply translate it as master. It is unlikely that every revision of it allows to build every package in some checklist including Firefox and OpenOffice. Simply because mistakes do happen and there is no way to ensure that a well-tested update of some package doesn't cause some part of dependent packages to fail. Next, there is a stream of commits which were actually built by Hydra. Git doesn't allow tracking it all inside VCS, but the latest can be the head of some auto-shifted branch or bear some tag. Next, there could be some way to get the latest commits that, say, make a few NixOS feature-tests pass. The stable branch discussed in this thread consists of hand-picked commits that pass all formal tests and do not cause noticeable problems in actual use. Once can want master to be that stable branch or one may want to have a separate stable branch - but the question of hand-picking stays. There is also a question of what formal criteria to set if we want Hydra-related branches, too. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[***SPAM***] [Nix-dev] Re: new possible movement to git (?)
1e1d23499a69570914f03bc0a196953a.squir...@webmail.shealevy.com 87ei034yse@write-only.cryp.to) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 The whole notion of having a stdenv-updates branch in the first place is obsolete in Git. Instead, we would have many small topic branches for specific features. if you want branch to show in history you would have to push that branch ti remote repo as well (using --no-ff option). but as Peter pointed, branches in git are matter of local higene. You name it however you want and make sure you merge them to remote branch. Git doesn't force to you specific branching policy localy while still playing nice with policy used on remote branch. Well, remote branches are just local branches for the remote repository. So the naming questions apply to them. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28913 - nixpkgs/trunk/pkgs/games/liquidwar
Author: raskin
Date: Tue Aug 30 05:26:39 2011
New Revision: 28913
URL: https://svn.nixos.org/websvn/nix/?rev=28913sc=1
Log:
Update LiquidWar
Modified:
nixpkgs/trunk/pkgs/games/liquidwar/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/games/liquidwar/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/games/liquidwar/src-for-default.nix Tue Aug 30
00:14:16 2011(r28912)
+++ nixpkgs/trunk/pkgs/games/liquidwar/src-for-default.nix Tue Aug 30
05:26:39 2011(r28913)
@@ -1,9 +1,9 @@
rec {
- version=0.0.9beta;
- name=liquidwar-0.0.9beta;
- hash=1a4yqh79y6s3f6dv5kkwjdqzi62y3qbwrx6420fqpvdn1694ycr9;
+ version=0.0.10beta;
+ name=liquidwar-0.0.10beta;
+ hash=1fc1qfl7p3669dj6dy1wxvf85hhwgbazm3rc365ahsikdgz1c5m0;
url=http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz;;
-
advertisedUrl=http://download.savannah.gnu.org/releases/liquidwar6/0.0.9beta/liquidwar6-0.0.9beta.tar.gz;;
+
advertisedUrl=http://download.savannah.gnu.org/releases/liquidwar6/0.0.10beta/liquidwar6-0.0.10beta.tar.gz;;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
