[Nix-commits] SVN commit: nix - r30877 - in nixpkgs/trunk/pkgs: development/libraries/haskell/bson development/libraries/haskell/compact-string-fix development/libraries/haskell/data-binary-ieee754 de
Author: andres
Date: Wed Dec 14 07:57:52 2011
New Revision: 30877
URL: https://nixos.org/websvn/nix/?rev=30877&sc=1
Log:
Added haskell-mongoDB and dependencies.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/bson/
nixpkgs/trunk/pkgs/development/libraries/haskell/bson/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/compact-string-fix/
nixpkgs/trunk/pkgs/development/libraries/haskell/compact-string-fix/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/data-binary-ieee754/
nixpkgs/trunk/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/mongoDB/
nixpkgs/trunk/pkgs/development/libraries/haskell/mongoDB/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/bson/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/bson/default.nix Wed Dec
14 07:57:52 2011(r30877)
@@ -0,0 +1,23 @@
+{ cabal, binary, compactStringFix, cryptohash, dataBinaryIeee754
+, mtl, network, time
+}:
+
+cabal.mkDerivation (self: {
+ pname = "bson";
+ version = "0.1.6";
+ sha256 = "0w9dab8x6b3dwk2afy0gnmrvcvx2dshwhjvlr2k69nchid4wh823";
+ buildDepends = [
+binary compactStringFix cryptohash dataBinaryIeee754 mtl network
+time
+ ];
+ meta = {
+homepage = "http://github.com/TonyGen/bson-haskell";;
+description = "BSON documents are JSON-like objects with a standard binary
encoding";
+license = "unknown";
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/compact-string-fix/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/compact-string-fix/default.nix
Wed Dec 14 07:57:52 2011(r30877)
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "compact-string-fix";
+ version = "0.3.2";
+ sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n";
+ meta = {
+homepage = "http://twan.home.fmf.nl/compact-string/";;
+description = "Same as compact-string except with a small fix so it builds
on ghc-6.12";
+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/data-binary-ieee754/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
Wed Dec 14 07:57:52 2011(r30877)
@@ -0,0 +1,20 @@
+{ cabal, binary }:
+
+cabal.mkDerivation (self: {
+ pname = "data-binary-ieee754";
+ version = "0.4.2.1";
+ sha256 = "0i0nclq8858flpp2sl3czwz6rfaykjrlzpvlfr6vlxzf8zvah9kz";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ binary ];
+ meta = {
+homepage = "http://john-millikin.com/software/data-binary-ieee754/";;
+description = "Parser/Serialiser for IEEE-754 floating-point values";
+license = self.stdenv.lib.licenses.mit;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/mongoDB/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/mongoDB/default.nix
Wed Dec 14 07:57:52 2011(r30877)
@@ -0,0 +1,23 @@
+{ cabal, binary, bson, cryptohash, monadControl, mtl, network
+, parsec, random, randomShuffle
+}:
+
+cabal.mkDerivation (self: {
+ pname = "mongoDB";
+ version = "1.1.1";
+ sha256 = "0hy47kvswm4g85c3lb75fvdrcnrcbmjrhk15r1jjriwzqicgiimz";
+ buildDepends = [
+binary bson cryptohash monadControl mtl network parsec random
+randomShuffle
+ ];
+ meta = {
+homepage = "http://github.com/TonyGen/mongoDB-haskell";;
+description = "Driver (client) for MongoDB, a free, scalable, fast,
document DBMS";
+license = "unknown";
+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
=
[Nix-dev] nixos-rebuild switch fails
Hi Peter, nixos-rebuild switch failed for me (see below), reverting your cryptsetup upgrade (30839) "solves" it. Anything I can do to help debug? regards florian # nixos-rebuild --show-trace switch fetching list of Nix archives at `http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST.bz2'... % Total% Received % Xferd Average Speed TimeTime Time Current Dload Upload Total SpentLeft Speed 0 00 00 0 0 0 --:--:-- --:--:-- --:--:-- 0 building Nix... building the system configuration... these derivations will be built: /nix/store/9nfqbsgiy1a8wznn95gbwx4wm0acia3z-upstart-cupsd.conf.drv /nix/store/9xgkmlfz5ggsm2sb3vzb0nrszqhaf3pm-udev-rules.drv /nix/store/c7k8maw5kd6lf9807637xrzz50j4a8q9-etc.drv /nix/store/c95lhyxg8yic0n07zxq749rrjdh58i72-system-path.drv /nix/store/d0hrp2fd8pv4yghrd5wycjyfw3zivbh4-extra-utils.drv /nix/store/dpqw9dfr2ca47f39pbir86iyiifdb72f-system-crontab.drv /nix/store/dq5cklf92yss5iyssk65nxh3s6203sgk-udev-initrd.conf.drv /nix/store/k9lgzyb92qq3hjy1bqxxf1mmjqbsgxpr-initrd.drv /nix/store/kirbn9myf1xzqnm8sswcb88ddyvggx04-nixos-manpages.drv /nix/store/qwizk8nic2ygdhb8rbvgj4v9sqkb3v0r-dbus-conf.drv /nix/store/svqdc9jf8qqn89lv93pxqwgky00cylj2-stage-1-init.sh.drv /nix/store/xyjdb6yvxi32lkf0amm84i50742y6rx3-system.drv these paths will be fetched (3.97 MiB download, 12.09 MiB unpacked): /nix/store/2riqbznwk4gr57iaxz8dg7inb374vwhs-git-1.7.8 fetching path `/nix/store/2riqbznwk4gr57iaxz8dg7inb374vwhs-git-1.7.8'... building path(s) `/nix/store/cagqlrdam6k6kphvnrzk29j24c2sj085-nixos-manpages' building path(s) `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils' building /nix/store/cagqlrdam6k6kphvnrzk29j24c2sj085-nixos-manpages building /nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/ld-linux-x86-64.so.2' `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/libc.so.6' `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libpthread.so.0' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/libpthread.so.0' `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/librt.so.1' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/librt.so.1' `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libdl.so.2' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/libdl.so.2' `/nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib64/libgcc_s.so.1' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/libgcc_s.so.1' `/nix/store/wg33bxhbdnb9hl6asn6gxwrnzfjhdv3w-util-linux-ng-2.18/bin/mount' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/bin/mount' `/nix/store/wg33bxhbdnb9hl6asn6gxwrnzfjhdv3w-util-linux-ng-2.18/bin/umount' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/bin/umount' `/nix/store/wg33bxhbdnb9hl6asn6gxwrnzfjhdv3w-util-linux-ng-2.18/sbin/fsck' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/bin/fsck' `/nix/store/wg33bxhbdnb9hl6asn6gxwrnzfjhdv3w-util-linux-ng-2.18/sbin/switch_root' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/bin/switch_root' `/nix/store/wg33bxhbdnb9hl6asn6gxwrnzfjhdv3w-util-linux-ng-2.18/sbin/blkid' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/bin/blkid' `/nix/store/wg33bxhbdnb9hl6asn6gxwrnzfjhdv3w-util-linux-ng-2.18/lib/libblkid.so.1' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/libblkid.so.1' `/nix/store/wg33bxhbdnb9hl6asn6gxwrnzfjhdv3w-util-linux-ng-2.18/lib/libblkid.so.1.1.0' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/libblkid.so.1.1.0' `/nix/store/wg33bxhbdnb9hl6asn6gxwrnzfjhdv3w-util-linux-ng-2.18/lib/libuuid.so.1' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/libuuid.so.1' `/nix/store/wg33bxhbdnb9hl6asn6gxwrnzfjhdv3w-util-linux-ng-2.18/lib/libuuid.so.1.3.0' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/lib/libuuid.so.1.3.0' `/nix/store/7w8b9g33z1vffv6y2swr3dbiddsrysdl-coreutils-8.7/bin/basename' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/bin/basename' `/nix/store/7w8b9g33z1vffv6y2swr3dbiddsrysdl-coreutils-8.7/bin/mkdir' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/bin/mkdir' `/nix/store/7w8b9g33z1vffv6y2swr3dbiddsrysdl-coreutils-8.7/bin/mknod' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/bin/mknod' `/nix/store/7w8b9g33z1vffv6y2swr3dbiddsrysdl-coreutils-8.7/bin/chmod' -> `/nix/store/kqkgr9kg1hfk5bpi12q3g6ipqzxmjsh4-extra-utils/bin/chmod' `/nix/store/7w8b9g33z1vffv6y2swr3dbiddsrysdl-coreutils-8.7/bin/cat' -
[Nix-commits] SVN commit: nix - r30876 - nixpkgs/trunk/pkgs/os-specific/linux/kernel
Author: raskin
Date: Wed Dec 14 07:27:58 2011
New Revision: 30876
URL: https://nixos.org/websvn/nix/?rev=30876&sc=1
Log:
Update Linux kernel to 3.1
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Tue Dec 13
22:19:06 2011(r30875)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Wed Dec 14
07:27:58 2011(r30876)
@@ -215,7 +215,7 @@
import ./generic.nix (
rec {
-version = "3.1.4";
+version = "3.1.5";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -223,7 +223,7 @@
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
- sha256 = "0wd43q1m11d4s5ab2kwnga4jvi5racqwlg4pmcp4fqim0q8jl9g6";
+ sha256 = "0wdcpfjv56r5cc67ddhprc9vhjxj2qibhp0bl96p3hbqjjpwfpl6";
};
config = configWithPlatform stdenv.platform;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30875 - nixpkgs/trunk/pkgs/applications/version-management/fossil
Author: maggesi
Date: Tue Dec 13 22:19:06 2011
New Revision: 30875
URL: https://nixos.org/websvn/nix/?rev=30875&sc=1
Log:
Update fossil to version 1.21
Modified:
nixpkgs/trunk/pkgs/applications/version-management/fossil/default.nix
Modified: nixpkgs/trunk/pkgs/applications/version-management/fossil/default.nix
==
--- nixpkgs/trunk/pkgs/applications/version-management/fossil/default.nix
Tue Dec 13 21:00:42 2011(r30874)
+++ nixpkgs/trunk/pkgs/applications/version-management/fossil/default.nix
Tue Dec 13 22:19:06 2011(r30875)
@@ -1,16 +1,11 @@
{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}:
-let
- version = "1.20";
- filedate = "20111021125253";
-in
-
stdenv.mkDerivation {
- name = "fossil-${version}";
+ name = "fossil-1.21";
src = fetchurl {
-url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";;
-sha256 = "0m75kw77iray3kbjm1xfn8hr116fn11yv1wr7adcwy314cgj0vv3";
+url = http://www.fossil-scm.org/download/fossil-src-20111213135356.tar.gz;
+sha256 = "07g78sf26v7zr4qzcwky4h4zzaaz8apy33d35bhc5ax63z6md1f9";
};
buildInputs = [ zlib openssl readline sqlite ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] garbage collecting source (was: btrfs-progs (was: contributing to nixpkgs/nixos))
Excerpts from Florian Friesdorf's message of Tue Dec 13 22:42:47 +0100 2011: > How difficult would it be to have a flag to keep garbage collection from > removing sources? There is an option grep for those settings in nix docs or nix code: gc-keep-outputs = true gc-keep-derivations = true Can't look it up right now. But there you'll find everything which does exist right now. If nothing else works: create a new derivation depending on all sources - install than and you're done. There are various ways. Marc Weber ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] garbage collecting source (was: btrfs-progs (was: contributing to nixpkgs/nixos))
>On Tue, 13 Dec 2011 01:29:39 +0400, Michael Raskin <7c6f4...@mail.ru> wrote: >> >Does hydra keep mirrored copies of sources around for every binary it >> >serves? >> >And I guess it won't build the same package every night if no inputs >> >change, so if sources become unavailable, won't maintainers notice? >> >> Hydra keeps sources for some time, but they are not GC-pinned. > >How difficult would it be to have a flag to keep garbage collection from >removing sources? > >I like to garbage collect, but I don't like lacking sources of installed >things when being offline. It is one (documented) option of Nix + realising all dependencies of the system derivation ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] garbage collecting source (was: btrfs-progs (was: contributing to nixpkgs/nixos))
On Tue, 13 Dec 2011 01:29:39 +0400, Michael Raskin <7c6f4...@mail.ru> wrote: > >Does hydra keep mirrored copies of sources around for every binary it serves? > >And I guess it won't build the same package every night if no inputs > >change, so if sources become unavailable, won't maintainers notice? > > Hydra keeps sources for some time, but they are not GC-pinned. How difficult would it be to have a flag to keep garbage collection from removing sources? I like to garbage collect, but I don't like lacking sources of installed things when being offline. -- Florian Friesdorf GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 Jabber/XMPP: f...@chaoflow.net IRC: chaoflow on freenode,ircnet,blafasel,OFTC pgptjpgmD9MKW.pgp Description: PGP signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30874 - nixpkgs/trunk/pkgs/applications/science/misc/golly
Author: raskin
Date: Tue Dec 13 21:00:42 2011
New Revision: 30874
URL: https://nixos.org/websvn/nix/?rev=30874&sc=1
Log:
Update Golly
Deleted:
nixpkgs/trunk/pkgs/applications/science/misc/golly/make-install.make
Modified:
nixpkgs/trunk/pkgs/applications/science/misc/golly/default.nix
nixpkgs/trunk/pkgs/applications/science/misc/golly/src-for-default.nix
nixpkgs/trunk/pkgs/applications/science/misc/golly/src-info-for-default.nix
Modified: nixpkgs/trunk/pkgs/applications/science/misc/golly/default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/misc/golly/default.nix Tue Dec
13 21:00:26 2011(r30873)
+++ nixpkgs/trunk/pkgs/applications/science/misc/golly/default.nix Tue Dec
13 21:00:42 2011(r30874)
@@ -17,7 +17,7 @@
inherit buildInputs;
/* doConfigure should be removed if not needed */
- phaseNames = ["setVars" "doMake" "doDeploy"];
+ phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
setVars = a.noDepEntry ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo
"${perl}"/lib/perl5/5*/*/CORE)"
pythonLib="$(echo "${python}"/lib/libpython*.so)"
@@ -26,14 +26,6 @@
export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
echo "Flags: $NIX_LDFLAGS"
'';
- goSrcDir = ''cd */'';
- makeFlags = [
-"-f makefile-gtk"
-];
- doDeploy = a.fullDepEntry ''
-cat < ${./make-install.make} >> makefile-gtk
-make -f makefile-gtk out="$out" install
- '' ["minInit" "doMake" "defEnsureDir"];
meta = {
description = "Cellular automata simulation program";
Modified: nixpkgs/trunk/pkgs/applications/science/misc/golly/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/misc/golly/src-for-default.nix
Tue Dec 13 21:00:26 2011(r30873)
+++ nixpkgs/trunk/pkgs/applications/science/misc/golly/src-for-default.nix
Tue Dec 13 21:00:42 2011(r30874)
@@ -1,9 +1,9 @@
rec {
- version="2.1-src";
- name="golly-2.1-src";
- hash="0m9sz0b7pwsxpgvscdvab2q8qnncr337gg3anzgzw83z5zyn3rdz";
-
url="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";;
-
advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";;
+ version="2.3-src";
+ name="golly-2.3-src";
+ hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1";
+
url="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";;
+
advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";;
}
Modified:
nixpkgs/trunk/pkgs/applications/science/misc/golly/src-info-for-default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/misc/golly/src-info-for-default.nix
Tue Dec 13 21:00:26 2011(r30873)
+++ nixpkgs/trunk/pkgs/applications/science/misc/golly/src-info-for-default.nix
Tue Dec 13 21:00:42 2011(r30874)
@@ -1,4 +1,5 @@
{
- downloadPage = "http://sourceforge.net/projects/golly/files/";;
- method="fetchSF";
+ downloadPage = "http://sourceforge.net/projects/golly/files/golly";;
+ method="fetchSFdirs";
+ fileSuffix="-src.tar.gz";
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30873 - nixpkgs/trunk/pkgs/build-support/upstream-updater
Author: raskin
Date: Tue Dec 13 21:00:26 2011
New Revision: 30873
URL: https://nixos.org/websvn/nix/?rev=30873&sc=1
Log:
Dir-per-version SF layout seems to be more relevant now
Modified:
nixpkgs/trunk/pkgs/build-support/upstream-updater/update-upstream-data.sh
Modified:
nixpkgs/trunk/pkgs/build-support/upstream-updater/update-upstream-data.sh
==
--- nixpkgs/trunk/pkgs/build-support/upstream-updater/update-upstream-data.sh
Tue Dec 13 18:53:40 2011(r30872)
+++ nixpkgs/trunk/pkgs/build-support/upstream-updater/update-upstream-data.sh
Tue Dec 13 21:00:26 2011(r30873)
@@ -36,6 +36,42 @@
commonPrefetchVars=" version name hash"
prefetchClause=""
+[ fetchSFdirs = "$method" ] && {
+if [ -z "$forcedUrl" ]; then
+ freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |
+ eval "egrep '$(getAttr sourceRegexp '[-][0-9.]+/$')'" |
+ eval "egrep -v '$(getAttr blacklistRegexp '^$')'" |
+ eval "$(getAttr choiceCommand 'head -n 1')" |
+ eval "$(getAttr versionToFileCommand "sed -re
's@/([^/]*-[0-9.]+)/@/\1/\1$(getAttr fileSuffix .tar.gz)@'")"
+ )"
+
+ if ! egrep ':' <<< "$freshUrl" ; then
+ freshUrl="$(dirname "$(getAttr downloadPage).")/$freshUrl"
+ fi
+
+ echo "Found download link: $freshUrl" >&2
+else
+freshUrl="$forcedUrl"
+fi
+
+freshUrl="$(echo "$freshUrl" | sed -re "$skipRedirectSF")"
+echo "Sourceforge-corrected URL: $freshUrl" >&2
+
+version="$(echo "$freshUrl" |
+ sed -re "$(getAttr versionExtractorSedScript "$extractVersionSF")")"
+baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re
's@.*/project/([^/]+)/.*@\1@')")"
+url="$freshUrl"
+name="$baseName-$version"
+advertisedUrl="$freshUrl"
+
+if [ x"$freshUrl" = x"$(cat "$src_defs_dir"/advertisedUrl)" ]; then
+echo "Source link not changed" >&2
+exit
+fi
+hash=$(nix-prefetch-url "$freshUrl")
+
+prefetchVars="url advertisedUrl";
+}
[ fetchSF = "$method" ] && {
if [ -z "$forcedUrl" ]; then
freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] Hydra job nixpkgs:trunk:tarball build 1610259: Success
Hi, This is to let you know that Hydra build 1610259 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/1610259 A summary of the build information follows: Build ID: | 1610259 Nix name: | nixpkgs-tarball-0pre30872 Short description: | Build of a source distribution from a checkout Maintainer(s): | Nix Committers System:| x86_64-linux Derivation store path: | /nix/store/jplpf3gpn0y6whwnr5fsvflhzdf4l0qa-nixpkgs-tarball-0pre30872.drv Output store path: | /nix/store/rd8kwm8ijbarzjrmzdnmi142n3az40n8-nixpkgs-tarball-0pre30872 Time added:| 2011-12-13 20:04:59 Build started: | 2011-12-13 20:02:46 Build finished:| 2011-12-13 20:04:59 Duration: | 133s The build inputs were: Name| Type| Value +-+ nixpkgs | svn | https://nixos.org/repos/nix/nixpkgs/trunk:30872 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
Re: [Nix-dev] SVN commit: nix -r30864-nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs
<8739coibtw@write-only.cryp.to> <87ty54ict9@write-only.cryp.to> ) Mime-Version: 1.0 Content-type: text/plain; charset="UTF-8" >No, unfortunately not: > > # env -i PATH=/var/run/current-system/sw/bin nix-instantiate > /etc/nixos/nixpkgs/ -A btrfsProgs > error: undefined variable `attr' > (use `--show-trace' to show detailed location information) Oops. Found an uncommitted change. Thanks ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30872 - nixpkgs/trunk/pkgs/top-level
Author: raskin
Date: Tue Dec 13 18:53:40 2011
New Revision: 30872
URL: https://nixos.org/websvn/nix/?rev=30872&sc=1
Log:
Oops, forgot to commit
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 Tue Dec 13 18:13:45
2011(r30871)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Dec 13 18:53:40
2011(r30872)
@@ -419,7 +419,7 @@
bootchart = callPackage ../tools/system/bootchart { };
btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
-inherit libuuid zlib acl;
+inherit libuuid zlib acl attr fetchgit;
};
catdoc = callPackage ../tools/text/catdoc { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] SVN commit: nix - r30864-nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs
Hi Michael, > env -i PATH=/var/run/current-system/sw/bin nix-instantiate > /etc/nixos/nixpkgs/ -A btrfsProgs > > It succeeds on my nixpkgs SVN trunk HEAD checkout on x86_64. > > Does the exact same command work for you? No, unfortunately not: # env -i PATH=/var/run/current-system/sw/bin nix-instantiate /etc/nixos/nixpkgs/ -A btrfsProgs error: undefined variable `attr' (use `--show-trace' to show detailed location information) Hydra seems to have the same problem: http://hydra.nixos.org/build/1608747 Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] SVN commit: nix - r30864-nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs
<87ty54ict9@write-only.cryp.to> <20111213043050.c780a108c...@mx3.tudelft.nl> ) Mime-Version: 1.0 Content-type: text/plain; charset="UTF-8" > > What is your system arch and nixpkgs.config ? > >I use x86_64-linux, and nixpkgs.config is empty. > >I hope this helps, env -i PATH=/var/run/current-system/sw/bin nix-instantiate /etc/nixos/nixpkgs/ -A btrfsProgs It succeeds on my nixpkgs SVN trunk HEAD checkout on x86_64. Does the exact same command work for you? ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30871 - nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils
Author: shlevy
Date: Tue Dec 13 18:13:45 2011
New Revision: 30871
URL: https://nixos.org/websvn/nix/?rev=30871&sc=1
Log:
The GPL issue does not apply to this version of binutils
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
Tue Dec 13 16:47:29 2011(r30870)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
Tue Dec 13 18:13:45 2011(r30871)
@@ -4,22 +4,6 @@
stdenv.mkDerivation rec {
name = basename + stdenv.lib.optionalString (cross != null)
"-${cross.config}";
- # WARNING: Upstream made a mistake in packaging that may mean anyone
- # but the FSF hosting this tarball is accidentally in violation of
- # the GPL. We can't update binutils until the next stdenv-updates,
- # so we are stuck with this version. The issue is discussed in
- # this email: http://sourceware.org/ml/binutils/2011-08/msg00198.html
- # The tarball for this minor version will not be fixed, as only the
- # tarballs for the latest minor version of each major version will
- # be repackaged. The fixed sources for the closest version to this one
- # can be found at mirror://gnu/binutils/binutils-2.21.1a.tar.bz2
- # or http://ftp.gnu.org/gnu/binutils/binutils-2.21.1a.tar.bz2
- # The sources missing from this tarball come from cgen. It is unclear
- # WHICH sources should be included, but the cvs tree can be checked out
- # by:
- # cvs -z 9 -d :pserver:anon...@sourceware.org:/cvs/src login
- # {enter "anoncvs" as the password}
- # cvs -z 9 -d :pserver:anon...@sourceware.org:/cvs/src co cgen
src = fetchurl {
url = "mirror://gnu/binutils/${basename}.tar.bz2";
sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d";
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] SVN commit: nix - r30864 -nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs
Hi Michael, > What is your system arch and nixpkgs.config ? I use x86_64-linux, and nixpkgs.config is empty. I hope this helps, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] SVN commit: nix - r30864 -nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs
>Hi Michael, > > > Author: raskin > > Date: Tue Dec 13 04:30:49 2011 > > New Revision: 30864 > > URL: https://nixos.org/websvn/nix/?rev=30864&sc=1 > > > > Log: > > Update BtrFS utilities to latest Git > >it seems that this change broke nixos-rebuild on my system: Seems very strange. Works for me. What is your system arch and nixpkgs.config ? > | [root@peti:~]# nixos-rebuild dry-run --no-pull --show-trace > | building Nix... > | building the system configuration... > | error: while evaluating the builtin function `derivationStrict': > | while instantiating the derivation named `system' at > `/etc/nixos/nixos/modules/system/activation/top-level.nix:146:5': > | while evaluating the derivation attribute `buildCommand' at > `/etc/nixos/nixos/modules/system/activation/top-level.nix:147:5': > | while evaluating the builtin function `derivationStrict': > | while instantiating the derivation named `etc' at > `/etc/nixos/nixos/modules/system/etc/etc.nix:29:5': > | while evaluating the derivation attribute `sources' at > `/etc/nixos/nixos/modules/system/etc/etc.nix:34:5': > | while evaluating the builtin function `derivationStrict': > | while instantiating the derivation named `upstart-cupsd.conf' at > `/etc/nixos/nixpkgs/pkgs/build-support/trivial-builders.nix:10:14': > | while evaluating the derivation attribute `jobText' at > `/etc/nixos/nixos/modules/system/upstart/upstart.nix:113:43': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:40:28': > ... > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': > | while evaluating the builtin function `head': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:41:32': > | while evaluating the builtin function `derivationStrict': > | while instantiating the derivation named `system-path' at > `/etc/nixos/nixpkgs/pkgs/build-support/trivial-builders.nix:10:14': > | while evaluating the derivation attribute `paths' at > `/etc/nixos/nixpkgs/pkgs/build-support/buildenv/default.nix:29:12': > | while evaluating the builtin function `derivationStrict': > | while instantiating the derivation named `btrfs-progs-0.19' at > `/etc/nixos/nixpkgs/pkgs/build-support/builder-defs/builder-defs.nix:509:30': > | while evaluating the derivation attribute `buildCommand' at > `/etc/nixos/nixpkgs/pkgs/build-support/builder-defs/builder-defs.nix:510:11': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/build-support/builder-defs/builder-defs.nix:429:26': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/strings-with-deps.nix:69:35': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:33:33': > ... > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': > | while evaluating the builtin function `head': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/build-support/builder-defs/builder-defs.nix:428:20': > | while evaluating the attribute `text' at > `/etc/nixos/nixpkgs/pkgs/lib/strings-with-deps.nix:73:38': > | while evaluating the builtin function `toString': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/misc.nix:228:22': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/misc.nix:162:14': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/misc.nix:217:34': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/attrsets.nix:19:35': > | while evaluating the function at > `/etc/nixos/nixpkgs/pkgs/lib/attrsets.nix:41:16': > | while evaluating the builtin function `getAttr': > | undefined variable `attr' ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] SVN commit: nix - r30864 - nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs
Hi Michael, > Author: raskin > Date: Tue Dec 13 04:30:49 2011 > New Revision: 30864 > URL: https://nixos.org/websvn/nix/?rev=30864&sc=1 > > Log: > Update BtrFS utilities to latest Git it seems that this change broke nixos-rebuild on my system: | [root@peti:~]# nixos-rebuild dry-run --no-pull --show-trace | building Nix... | building the system configuration... | error: while evaluating the builtin function `derivationStrict': | while instantiating the derivation named `system' at `/etc/nixos/nixos/modules/system/activation/top-level.nix:146:5': | while evaluating the derivation attribute `buildCommand' at `/etc/nixos/nixos/modules/system/activation/top-level.nix:147:5': | while evaluating the builtin function `derivationStrict': | while instantiating the derivation named `etc' at `/etc/nixos/nixos/modules/system/etc/etc.nix:29:5': | while evaluating the derivation attribute `sources' at `/etc/nixos/nixos/modules/system/etc/etc.nix:34:5': | while evaluating the builtin function `derivationStrict': | while instantiating the derivation named `upstart-cupsd.conf' at `/etc/nixos/nixpkgs/pkgs/build-support/trivial-builders.nix:10:14': | while evaluating the derivation attribute `jobText' at `/etc/nixos/nixos/modules/system/upstart/upstart.nix:113:43': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:40:28': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:33:33': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the builtin function `head': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:41:32': | while evaluating the builtin function `derivationStrict': | while instantiating the derivation named `system-path' at `/etc/nixos/nixpkgs/pkgs/build-support/trivial-builders.nix:10:14': | while evaluating the derivation attribute `paths' at `/etc/nixos/nixpkgs/pkgs/build-support/buildenv/default.nix:29:12': | while evaluating the builtin function `derivationStrict': | while instantiating the derivation named `btrfs-progs-0.19' at `/etc/nixos/nixpkgs/pkgs/build-support/builder-defs/builder-defs.nix:509:30': | while evaluating the derivation attribute `buildCommand' at `/etc/nixos/nixpkgs/pkgs/build-support/builder-defs/builder-defs.nix:510:11': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/build-support/builder-defs/builder-defs.nix:429:26': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings-with-deps.nix:69:35': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:33:33': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/lists.nix:17:19': | while evaluating the function at `/etc/nixos/nixpkgs/pkgs/lib/strings.nix:14:32': | while evaluating the function at `/etc/nixos/nixpkgs/
[Nix-commits] SVN commit: nix - r30870 - nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils
Author: eelco
Date: Tue Dec 13 16:47:29 2011
New Revision: 30870
URL: https://nixos.org/websvn/nix/?rev=30870&sc=1
Log:
* Revert to binutils 2.21.1. Binutils 2.22 changes the default
handling of dynamic libraries from --copy-dt-needed-entries to
--no-copy-dt-needed-entries, which breaks stuff (e.g. GCC, see
http://hydra.nixos.org/build/1608471). So stick with 2.21.1 for
now.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
Tue Dec 13 16:11:02 2011(r30869)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
Tue Dec 13 16:47:29 2011(r30870)
@@ -1,13 +1,28 @@
{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null,
flex2535 ? null, bc ? null, dejagnu ? null }:
-let basename = "binutils-2.22"; in
-
+let basename = "binutils-2.21.1a"; in
stdenv.mkDerivation rec {
name = basename + stdenv.lib.optionalString (cross != null)
"-${cross.config}";
+ # WARNING: Upstream made a mistake in packaging that may mean anyone
+ # but the FSF hosting this tarball is accidentally in violation of
+ # the GPL. We can't update binutils until the next stdenv-updates,
+ # so we are stuck with this version. The issue is discussed in
+ # this email: http://sourceware.org/ml/binutils/2011-08/msg00198.html
+ # The tarball for this minor version will not be fixed, as only the
+ # tarballs for the latest minor version of each major version will
+ # be repackaged. The fixed sources for the closest version to this one
+ # can be found at mirror://gnu/binutils/binutils-2.21.1a.tar.bz2
+ # or http://ftp.gnu.org/gnu/binutils/binutils-2.21.1a.tar.bz2
+ # The sources missing from this tarball come from cgen. It is unclear
+ # WHICH sources should be included, but the cvs tree can be checked out
+ # by:
+ # cvs -z 9 -d :pserver:anon...@sourceware.org:/cvs/src login
+ # {enter "anoncvs" as the password}
+ # cvs -z 9 -d :pserver:anon...@sourceware.org:/cvs/src co cgen
src = fetchurl {
url = "mirror://gnu/binutils/${basename}.tar.bz2";
-sha256 = "1a9w66v5dwvbnawshjwqcgz7km6kw6ihkzp6sswv9ycc3knzhykc";
+sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d";
};
patches = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30869 - nixpkgs/trunk/maintainers/scripts/gnu
Author: ludo Date: Tue Dec 13 16:11:02 2011 New Revision: 30869 URL: https://nixos.org/websvn/nix/?rev=30869&sc=1 Log: gnupdate: Really select `stdenv' packages when asked for it. * maintainers/scripts/gnu/gnupdate (gnupdate)[selected-gnu-packages]: Really limit to `stdenv' when ask for it. Modified: nixpkgs/trunk/maintainers/scripts/gnu/gnupdate Modified: nixpkgs/trunk/maintainers/scripts/gnu/gnupdate == --- nixpkgs/trunk/maintainers/scripts/gnu/gnupdate Tue Dec 13 16:09:48 2011(r30868) +++ nixpkgs/trunk/maintainers/scripts/gnu/gnupdate Tue Dec 13 16:11:02 2011(r30869) @@ -1065,7 +1065,10 @@ (case selection ((stdenv) - gnu) + (filter (lambda (p) + (member (package-source-output-path p) + (force stdenv))) + gnu)) ((non-stdenv) (filter (lambda (p) (not (member (package-source-output-path p) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30868 - nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep
Author: ludo
Date: Tue Dec 13 16:09:48 2011
New Revision: 30868
URL: https://nixos.org/websvn/nix/?rev=30868&sc=1
Log:
GNU grep 2.10.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/default.nix Tue Dec
13 14:54:15 2011(r30867)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/default.nix Tue Dec
13 16:09:48 2011(r30868)
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pcre, libiconv ? null}:
-let version = "2.9"; in
+let version = "2.10"; in
stdenv.mkDerivation ({
name = "gnugrep-${version}";
src = fetchurl {
-url = "mirror://gnu/grep/grep-${version}.tar.gz";
-sha256 = "0w3r6m597p3qgfj6jj1nsggkwr5p38v6cxasfa8i3izcfan8w4g9";
+url = "mirror://gnu/grep/grep-${version}.tar.xz";
+sha256 = "1cvsqyfzk1p38fcaav22dn76fkd02g7bjnqna6vrpk9vy9rnfybc";
};
buildInputs = [ pcre ]
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30867 - nixpkgs/trunk/pkgs/tools/networking/wicd
Author: ludo
Date: Tue Dec 13 14:54:15 2011
New Revision: 30867
URL: https://nixos.org/websvn/nix/?rev=30867&sc=1
Log:
Wicd: Protect the password in the WPA2-TTLS template.
Modified:
nixpkgs/trunk/pkgs/tools/networking/wicd/wpa2-ttls
Modified: nixpkgs/trunk/pkgs/tools/networking/wicd/wpa2-ttls
==
--- nixpkgs/trunk/pkgs/tools/networking/wicd/wpa2-ttls Tue Dec 13 12:57:32
2011(r30866)
+++ nixpkgs/trunk/pkgs/tools/networking/wicd/wpa2-ttls Tue Dec 13 14:54:15
2011(r30867)
@@ -2,6 +2,7 @@
author = various contributors
version = 1
require identity *Identity anonymous_identity *Anonymous_identity password
*Password ca_cert *Path_to_CA_Cert
+protected password *Password
-
ctrl_interface=/var/run/wpa_supplicant
network={
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30866 - in nixpkgs/branches/stdenv-updates/pkgs: build-support/vm os-specific/linux/hal os-specific/linux/nfs-utils os-specific/linux/pmount tools/misc/parted
Author: eelco
Date: Tue Dec 13 12:57:32 2011
New Revision: 30866
URL: https://nixos.org/websvn/nix/?rev=30866&sc=1
Log:
* Forgot a few utillinuxng references.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/vm/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/hal/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pmount/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/2.3.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/build-support/vm/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/build-support/vm/default.nix Tue Dec
13 12:43:11 2011(r30865)
+++ nixpkgs/branches/stdenv-updates/pkgs/build-support/vm/default.nix Tue Dec
13 12:57:32 2011(r30866)
@@ -351,7 +351,7 @@
with pkgs; runInLinuxVM (
stdenv.mkDerivation {
name = "extract-file";
- buildInputs = [utillinuxng];
+ buildInputs = [ utillinux ];
buildCommand = ''
ln -s ${linux}/lib /lib
${module_init_tools}/sbin/modprobe loop
@@ -376,7 +376,7 @@
with pkgs; runInLinuxVM (
stdenv.mkDerivation {
name = "extract-file-mtd";
- buildInputs = [utillinuxng mtdutils];
+ buildInputs = [ utillinux mtdutils ];
buildCommand = ''
ln -s ${linux}/lib /lib
${module_init_tools}/sbin/modprobe mtd
Modified: nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/hal/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/hal/default.nix
Tue Dec 13 12:43:11 2011(r30865)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/hal/default.nix
Tue Dec 13 12:57:32 2011(r30866)
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, python, pciutils, expat
, libusb, dbus, dbus_glib, glib, libuuid, perl
, perlXMLParser, gettext, zlib, gperf, consolekit, policykit
-, libsmbios, dmidecode, udev, utillinuxng, pmutils, usbutils
+, libsmbios, dmidecode, udev, utillinux, pmutils, usbutils
, eject, upstart
}:
@@ -51,8 +51,8 @@
substituteInPlace $i \
${changeDmidecode} \
${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm"
else ""} \
---replace /bin/mount ${utillinuxng}/bin/mount \
---replace /bin/umount ${utillinuxng}/bin/umount \
+--replace /bin/mount ${utillinux}/bin/mount \
+--replace /bin/umount ${utillinux}/bin/umount \
--replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \
--replace /usr/sbin/pm ${pmutils}/sbin/pm \
--replace /sbin/shutdown ${upstart}/sbin/shutdown
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
Tue Dec 13 12:43:11 2011(r30865)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
Tue Dec 13 12:57:32 2011(r30866)
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, tcpWrapper, utillinuxng, libcap }:
+{ fetchurl, stdenv, tcpWrapper, utillinux, libcap }:
stdenv.mkDerivation rec {
name = "nfs-utils-1.2.3";
@@ -9,7 +9,7 @@
};
# Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'.
- buildInputs = [ tcpWrapper utillinuxng libcap ];
+ buildInputs = [ tcpWrapper utillinux libcap ];
# FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
configureFlags =
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pmount/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pmount/default.nix
Tue Dec 13 12:43:11 2011(r30865)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pmount/default.nix
Tue Dec 13 12:57:32 2011(r30866)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g,
utillinuxng
+{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g,
utillinux
, mediaDir ? "/media/"
, lockDir ? "/var/lock/pmount"
, whiteList ? "/etc/pmount.allow"
@@ -15,14 +15,14 @@
sha256 =
"db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036";
};
- buildInputs = [ hal intltool utillinuxng ];
+ buildInputs = [ hal intltool utillinux ];
configureFlags = ""
+ " --with-media-dir=${mediaDir}"
+ " --with-lock-dir=${lockDir}"
+ " --with-whitelist=${whiteList}"
- + " --with-mount-prog=${utillinuxng}/bin/mount"
- + " --with-umount-prog=${utillinuxng}/bin/umount"
+ + " --with-mount-prog=${utillinux}/bin/mount"
+ + " --with-umoun
[Nix-commits] SVN commit: nix - r30865 - nixpkgs/trunk/pkgs/servers/xinetd
Author: eelco
Date: Tue Dec 13 12:43:11 2011
New Revision: 30865
URL: https://nixos.org/websvn/nix/?rev=30865&sc=1
Log:
* Add xinetd to the channel.
Modified:
nixpkgs/trunk/pkgs/servers/xinetd/default.nix
Modified: nixpkgs/trunk/pkgs/servers/xinetd/default.nix
==
--- nixpkgs/trunk/pkgs/servers/xinetd/default.nix Tue Dec 13 04:30:49
2011(r30864)
+++ nixpkgs/trunk/pkgs/servers/xinetd/default.nix Tue Dec 13 12:43:11
2011(r30865)
@@ -10,6 +10,7 @@
meta = {
description = "Secure replacement for inetd";
+platforms = stdenv.lib.platforms.linux;
homepage = http://xinetd.org;
license = "free";
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Sharing the Nix store between systems
Den 2011-12-13 09:20:32 skrev Lluís Batlle i Rossell : > On Tue, Dec 13, 2011 at 12:39:40AM +0100, Rickard Nilsson wrote: >> one x86_64). Unfortunately, the database got severly corrupted when both >> machines was building things at the same time. I guess this is a feature >> of sqlite+NFS+file locks. > > Afaik, NFS 'file locks' are rarely well implemented, and often work bad. > If you > expect that they will automatically work in your setup, you may be wrong. Yes, this was what I suspected from the very start. But I will at least try with NFS4, too. >> One idea could be if slave build machines didn't build directly into the >> store used by the host itself, but instead wrote to a temporary store, >> and >> also to a temporary database (or maybe it doesn't need to write to any >> db >> at all). The master host could then pick up the build results and put >> them >> into its database and into the shared store. I think that, in theory, >> this >> scheme could work. How about in practice? > > I don't know how much remote can NIX_REMOTE be. NIX_REMOTE can actually be very remote. I have verified that it is no problem to tunnel the local Nix worker socket via TCP (with socat) to a Nix worker socket on another host. It actually works very good. However, this only solves half of my problem. You can delegate builds perfectly to one master host in this way, but if you want to mix in build slaves (which you need if you have mixed CPU architectures), then you get into the shared store/db problem. Maybe I should just settle for dedicated build slaves with local store and db. / Rickard ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Sharing the Nix store between systems
Den 2011-12-13 05:41:30 skrev Michael Raskin <7c6f4...@mail.ru>: >> One idea could be if slave build machines didn't build directly into the >> store used by the host itself, but instead wrote to a temporary store, >> and >> also to a temporary database (or maybe it doesn't need to write to any >> db >> at all). The master host could then pick up the build results and put >> them >> into its database and into the shared store. I think that, in theory, >> this >> scheme could work. How about in practice? > > I guess you would need a chroot for this scheme. The simples way for > nix-build I can imagine (my definition of simple may differ from yours) > is a unionFS mount of the original filesystem and just an empty writable > directory, chroot inside unionfs, building, exporting the built paths > with nix-store --export, importing it on host, destroying the overlay > directory. > > The "build" part of nixos-rebuild can be done in the same way. Yes, something along those lines could work. I will think about how to implement it in a not too complex fashion. / Rickard ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Sharing the Nix store between systems
On Tue, Dec 13, 2011 at 12:39:40AM +0100, Rickard Nilsson wrote: > one x86_64). Unfortunately, the database got severly corrupted when both > machines was building things at the same time. I guess this is a feature > of sqlite+NFS+file locks. Afaik, NFS 'file locks' are rarely well implemented, and often work bad. If you expect that they will automatically work in your setup, you may be wrong. > One idea could be if slave build machines didn't build directly into the > store used by the host itself, but instead wrote to a temporary store, and > also to a temporary database (or maybe it doesn't need to write to any db > at all). The master host could then pick up the build results and put them > into its database and into the shared store. I think that, in theory, this > scheme could work. How about in practice? I don't know how much remote can NIX_REMOTE be. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
