[Nix-commits] SVN commit: nix - r30770 - nixpkgs/trunk/pkgs/development/compilers/sbcl
Author: raskin
Date: Tue Dec 6 07:00:04 2011
New Revision: 30770
URL: https://nixos.org/websvn/nix/?rev=30770&sc=1
Log:
Update SBCL
Modified:
nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix Mon Dec
5 23:22:42 2011(r30769)
+++ nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix Tue Dec
6 07:00:04 2011(r30770)
@@ -1,9 +1,9 @@
rec {
- version="1.0.53";
- name="sbcl-1.0.53";
- hash="02jb2pz0jlv9fcc8hln4afklz6ic3lwrwd0sszkz09zxj7d5vha9";
-
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.53/sbcl-1.0.53-source.tar.bz2";;
-
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.53/sbcl-1.0.53-source.tar.bz2";;
+ version="1.0.54";
+ name="sbcl-1.0.54";
+ hash="1ip13hz5zsys3vy68y3x0fapxs87xk0gqi6bdp68vyznz2a0v1cd";
+
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";;
+
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";;
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Beginner question about external recipes
) Mime-Version: 1.0 Content-type: text/plain; charset="UTF-8" >I guess you could write 80% succesful converter of Debian packages into >> Nix expressions, but that would be a lot of work. >> > >More or less, I was thinking of Nix expressions to control some external >packaging mechanism (apt, makechrootpkg/pacman, rpmbuild/rpm) rather than >trying to convert the recipies themselves to Nix expressions. I've been >pondering this specific topic (and Nix in general) over the weekend. I've >read some of the early papers on Nix, but I still may be struggling with >some of the concepts...particularly those related to functional >programming. Point out errors or insanity. > >For context, my near term interest is to control an ArchLinux environment >for: > >1] rollback capability >2] better closure determination for "point upgrades" (individual packages). >3] Automatic rebuilds of "customized" packages. > >Note I'm not thinking to augment ArchLinux. I'm thinking to place instances >of ArchLinux under the control of something which understands closures and >their manipulation. This should generalize to other distributions as well. >Certain key assumptions need to be met, of course: I cannot understand what you want to do. Should Arch build scripts run unmodified? In this case, how do you untangle the effects of various packages registering their mime-types in /usr/share? If you want to parse the recipes, you will have to fix some underspecification of expressions anyway. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30769 - nixpkgs/trunk/pkgs/development/compilers/mit-scheme
Author: ludo
Date: Mon Dec 5 23:22:42 2011
New Revision: 30769
URL: https://nixos.org/websvn/nix/?rev=30769&sc=1
Log:
MIT/GNU Scheme: Fix hashes.
Modified:
nixpkgs/trunk/pkgs/development/compilers/mit-scheme/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/mit-scheme/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/mit-scheme/default.nix Mon Dec
5 21:04:20 2011(r30768)
+++ nixpkgs/trunk/pkgs/development/compilers/mit-scheme/default.nix Mon Dec
5 23:22:42 2011(r30769)
@@ -15,14 +15,14 @@
if stdenv.isi686
then fetchurl {
url =
"mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
- sha256 = "1bigzzk0k08lggyzqp4rmyvbqhhs3ld4c7drfp22d5qnkbvvzh4g";
+ sha256 = "0vi760fy550d9db538m0vzbq1mpdncvw9g8bk4lswk0kcdira55z";
} else if stdenv.isx86_64
then fetchurl {
url =
"mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
- sha256 = "1l4zxqm5r1alc6y1cky62rn8h6i40qyiba081n6phwypwxr5sd0g";
+ sha256 = "1wcxm9hyfc53myvlcn93fyqrnnn4scwkknl9hkbp1cphc6mp291x";
} else fetchurl {
url =
"mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
- sha256 = "1661cybycfvjjyq92gb3n1cygxfmfjdhnh3d2ha3vy6xxk9d7za9";
+ sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j";
};
buildPhase =
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Beginner question about external recipes
I guess you could write 80% succesful converter of Debian packages into > Nix expressions, but that would be a lot of work. > More or less, I was thinking of Nix expressions to control some external packaging mechanism (apt, makechrootpkg/pacman, rpmbuild/rpm) rather than trying to convert the recipies themselves to Nix expressions. I've been pondering this specific topic (and Nix in general) over the weekend. I've read some of the early papers on Nix, but I still may be struggling with some of the concepts...particularly those related to functional programming. Point out errors or insanity. For context, my near term interest is to control an ArchLinux environment for: 1] rollback capability 2] better closure determination for "point upgrades" (individual packages). 3] Automatic rebuilds of "customized" packages. Note I'm not thinking to augment ArchLinux. I'm thinking to place instances of ArchLinux under the control of something which understands closures and their manipulation. This should generalize to other distributions as well. Certain key assumptions need to be met, of course: 1] Analogies between the Nix deployment model and the external system need to be made (recipe file, instantiation, derivation, retained dependencies). 2] The set of external recipe files should build within a controlled environment which enforces package purity. 3] The external deployment scheme must produce the same result when deploying the same closure of packages from scratch...even when this closure is only a "subclosure" of all that is being deployed. 4] The external system must rely on its package management system (and the metadata embodied therein) to deploy new systems (indicating a workable level of purity). 5] A Nix managed system does not interfere with the managed external system, and the union of the two filesystem images is the same whether the host is NixOS or the host is the external system. (this is not strictly necessary to manage a completely external system, but it does allow for a hybrid filesystem hosting both Nixpkgs and external pkgs.) Given these assumptions, it would seem to me to be possible to construct an "external environment" for a packageset similar to how Nix currently constructs user profiles...or how NixOS rebuilds itself from a configuration file. Whether this environment is isolated as a VM image or is maintained as a place to chroot to seems like an arbitrary distinction. However, if it is a chroot, it makes it possible for Nix to assume control of the external build process. Nix only has to understand the closure relations, how to prep a build chroot, and how to actually execute a build operation in that chroot. There is value in maintaining a "pure" NixOS host filesystem mounted on "/". The merged filesystems would occupy a chroot environment. That takes care of objectives #1 and #3. Objective #2 falls out from assumption #1: that a Nix analogy can be drawn between the artifacts and metadata in an external package repository. If Nix understands the closure expression which describes the current state of the system, and it understands the closure relation for the current state of the repository, it should be able to calculate an upgrade action which resolves any dangling references (e.g., nix-env --upgrade --eq : attempt to recompile any packages which depend on something which is getting overwritten). For archlinux, I've got a set of analogies in mind (Assumption #1). I believe assumption #2 is covered by makechrootpkg. I know that pacman is used to cover #4...I'm assuming #3 without proof. Number 5 is supported by what I've observed about Nix/NixOS so far (I think.) I'm thinking there's at least the potential for wider use if this is pans out. For instance, one shell could be chrooted into NixOS/ArchLinux and another could be chrooted into NixOS/CentOS (actually, any other gnu/linux distribution with a compatible kernel). NixOS could be the one distro in existance with the capability to leverage packaged software from multiple distros. You'll have more packages than you know what to do with, and an enormous community maintaining those package descriptions to keep up with the upstream. Does this sound plausible to anyone else? Are there showstoppers? Bryce ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30768 - nix/trunk/src/libstore
Author: eelco
Date: Mon Dec 5 21:04:20 2011
New Revision: 30768
URL: https://nixos.org/websvn/nix/?rev=30768&sc=1
Log:
* Remove unnecessary quotes. showPaths() already adds quotes.
Modified:
nix/trunk/src/libstore/local-store.cc
Modified: nix/trunk/src/libstore/local-store.cc
==
--- nix/trunk/src/libstore/local-store.cc Mon Dec 5 19:58:19 2011
(r30767)
+++ nix/trunk/src/libstore/local-store.cc Mon Dec 5 21:04:20 2011
(r30768)
@@ -1347,7 +1347,7 @@
PathSet referrers; queryReferrers(path, referrers);
referrers.erase(path); /* ignore self-references */
if (!referrers.empty())
-throw PathInUse(format("cannot delete path `%1%' because
it is in use by `%2%'")
+throw PathInUse(format("cannot delete path `%1%' because
it is in use by %2%")
% path % showPaths(referrers));
invalidatePath(path);
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] remove manifest on nixos
Hi Lluís, Thanks again. It's building 2011/12/5 Lluís Batlle i Rossell : > On Mon, Dec 05, 2011 at 09:49:26PM +0100, Mathijs Kwik wrote: >> I noticed the package "okular" can't open pdf files. >> I found that the binary isn't linked to poppler/poppler-qt (the .nix >> expression looks ok and uses popplerQt4 as input). >> >> Not sure if that's the problem, but as a first test, I would like to >> recompile it and look at warnings in the output. >> However, okular is already in the manifest, so reinstalling it will >> just get this same binary version again. >> nix-env does have a "prebuilt-only" flag, but I couldn't find "no-prebuilt". > > Hello Mathijs, > > Change the okular expression, even a little change. For example, add > installPhase = "exit 1"; > > Then it will build. Build it with "-K", and as it will fail you'll be able to > check the output in the resulting directory reported by the builder > > Regards, > Lluís. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] remove manifest on nixos
On Mon, Dec 05, 2011 at 09:49:26PM +0100, Mathijs Kwik wrote: > I noticed the package "okular" can't open pdf files. > I found that the binary isn't linked to poppler/poppler-qt (the .nix > expression looks ok and uses popplerQt4 as input). > > Not sure if that's the problem, but as a first test, I would like to > recompile it and look at warnings in the output. > However, okular is already in the manifest, so reinstalling it will > just get this same binary version again. > nix-env does have a "prebuilt-only" flag, but I couldn't find "no-prebuilt". Hello Mathijs, Change the okular expression, even a little change. For example, add installPhase = "exit 1"; Then it will build. Build it with "-K", and as it will fail you'll be able to check the output in the resulting directory reported by the builder Regards, Lluís. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] remove manifest on nixos
Hi all, I noticed the package "okular" can't open pdf files. I found that the binary isn't linked to poppler/poppler-qt (the .nix expression looks ok and uses popplerQt4 as input). Not sure if that's the problem, but as a first test, I would like to recompile it and look at warnings in the output. However, okular is already in the manifest, so reinstalling it will just get this same binary version again. nix-env does have a "prebuilt-only" flag, but I couldn't find "no-prebuilt". "nix-channel --list" doesn't list any channels, so probably channels are built-in in nixos. so nix-channel --remove won't help me. How should I proceed? Thanks, Mathijs ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30767 - nixpkgs/trunk/pkgs/applications/misc/gv
Author: simons
Date: Mon Dec 5 19:58:19 2011
New Revision: 30767
URL: https://nixos.org/websvn/nix/?rev=30767&sc=1
Log:
gv: updated to version 3.7.3
Modified:
nixpkgs/trunk/pkgs/applications/misc/gv/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/gv/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/gv/default.nix Mon Dec 5 19:27:50
2011(r30766)
+++ nixpkgs/trunk/pkgs/applications/misc/gv/default.nix Mon Dec 5 19:58:19
2011(r30767)
@@ -1,11 +1,14 @@
{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:
-stdenv.mkDerivation rec {
- name = "gv-3.7.2";
+let
+ name = "gv-3.7.3";
+in
+stdenv.mkDerivation {
+ inherit name;
src = fetchurl {
url = "mirror://gnu/gv/${name}.tar.gz";
-sha256 = "1cj03rb7xs0l3krax4z2llwnldh876p1h3p5vql4gygcxki8vhk2";
+sha256 =
"ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b";
};
buildInputs = [ Xaw3d ghostscriptX perl ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30766 - nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control
Author: simons Date: Mon Dec 5 19:27:50 2011 New Revision: 30766 URL: https://nixos.org/websvn/nix/?rev=30766&sc=1 Log: monad-control 0.2.0.3: added missing maintainer section Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix == --- nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix Mon Dec 5 19:27:47 2011(r30765) +++ nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix Mon Dec 5 19:27:50 2011(r30766) @@ -10,5 +10,9 @@ description = "Lift control operations, like exception catching, through monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; +maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons +]; }; }) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30765 - nixpkgs/trunk/pkgs/development/tools/haskell/uuagc
Author: simons
Date: Mon Dec 5 19:27:47 2011
New Revision: 30765
URL: https://nixos.org/websvn/nix/?rev=30765&sc=1
Log:
haskell-uuagc: updated to version 0.9.39.3
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/default.nix Mon Dec
5 17:32:45 2011(r30764)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/default.nix Mon Dec
5 19:27:47 2011(r30765)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uuagc";
- version = "0.9.39.1";
- sha256 = "0zqhwpafq51czy97z0f93cbxd8k6hllnmb24a6yzr4y6kzzv65hd";
+ version = "0.9.39.3";
+ sha256 = "15wm7r7p9bzhad9nshv0r11h7if581dvlkyagx2whldk40clnk48";
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] [PATCH] Weaken an overzealous sanity check on udev rules...
Shea Levy writes: > Hi Petr, > > On 12/4/11 8:52 PM, Petr Rockai wrote: >> Hi, >> >> the below patch is needed to build a configuration that includes recent >> SANE (scanner drivers) udev rules which mention RUN+="/path/to/script" >> in a comment (which breaks the check). >> >> Yours, >> Petr > > Can you give an example udev rule that is currently rejected but shouldn't be? # bla bla RUN+="/path/to/script" bla bla (I.e., the file is rejected based on a comment, not an actual rule.) Petr -- id' Ash = Ash; id' Dust = Dust; id' _ = undefined ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] [PATCH] Scanning with SANE as unprivileged user
Hi Petr, On 12/4/11 9:30 PM, Petr Rockai wrote: > Hi, > > the expressions in sane-backends imply that there was an intent to ship > the udev rules that flag sane-recognized scanner devices for udev-acl, > so that ordinary users logged in at the console can scan. However, the > way this udev rule file is provided by sane-backends upstream has > changed: the file is not distributed verbatim, but a tool is built to > print the rules. I have updated the sane package to that effect. > > I have also added a "snapshot" build of sane-backends, since my canon > lide 210 is substantially faster with the git snapshot than it is in the > latest release. Might be useful for others too. > > Finally, to make use of the udev rules, I have added a module to nixos/, > so that folks can just say hardware.sane.enable = true instead of > learning about how to enable the udev rules manually. > > Petr > Thanks for the patches, committed. ~Shea ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30764 - nixos/trunk/modules nixos/trunk/modules/services/hardware nixpkgs/trunk/pkgs/misc/sane-backends nixpkgs/trunk/pkgs/top-level
Author: shlevy
Date: Mon Dec 5 17:32:45 2011
New Revision: 30764
URL: https://nixos.org/websvn/nix/?rev=30764&sc=1
Log:
Apply mornfall's SANE patches
Fix sane-backends to generate udev rules, add a snapshot of sane-backends's
unstable repo, and add a SANE nixos module
Added:
nixos/trunk/modules/services/hardware/sane.nix
nixpkgs/trunk/pkgs/misc/sane-backends/snapshot.nix
- copied, changed from r30763,
nixpkgs/trunk/pkgs/misc/sane-backends/default.nix
Modified:
nixos/trunk/modules/module-list.nix
nixpkgs/trunk/pkgs/misc/sane-backends/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixos/trunk/modules/module-list.nix
==
--- nixos/trunk/modules/module-list.nix Mon Dec 5 16:53:58 2011(r30763)
+++ nixos/trunk/modules/module-list.nix Mon Dec 5 17:32:45 2011(r30764)
@@ -68,6 +68,7 @@
./services/hardware/bluetooth.nix
./services/hardware/hal.nix
./services/hardware/pcscd.nix
+ ./services/hardware/sane.nix
./services/hardware/udev.nix
./services/hardware/udisks.nix
./services/hardware/upower.nix
Added: nixos/trunk/modules/services/hardware/sane.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/services/hardware/sane.nix Mon Dec 5 17:32:45
2011(r30764)
@@ -0,0 +1,34 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+ ## interface
+
+ options = {
+
+hardware.sane.enable = mkOption {
+ default = false;
+ description = "Enable support for SANE scanners.";
+};
+
+hardware.sane.snapshot = mkOption {
+ default = false;
+ description = "Use a development snapshot of SANE scanner drivers.";
+};
+
+ };
+
+
+ ## implementation
+
+config = let pkg = if config.hardware.sane.snapshot
+ then pkgs.saneBackendsSnapshot
+ else pkgs.saneBackends;
+ in mkIf config.hardware.sane.enable {
+ environment.systemPackages = [ pkg ];
+ services.udev.packages = [ pkg ];
+ };
+
+}
Modified: nixpkgs/trunk/pkgs/misc/sane-backends/default.nix
==
--- nixpkgs/trunk/pkgs/misc/sane-backends/default.nix Mon Dec 5 16:53:58
2011(r30763)
+++ nixpkgs/trunk/pkgs/misc/sane-backends/default.nix Mon Dec 5 17:32:45
2011(r30764)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
, gt68xxFirmware ? null }:
let
firmware = gt68xxFirmware {inherit fetchurl;};
@@ -20,6 +20,7 @@
postInstall = ''
if test "$udevSupport" = "1"; then
ensureDir $out/etc/udev/rules.d/
+ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
fi
'';
Copied and modified: nixpkgs/trunk/pkgs/misc/sane-backends/snapshot.nix (from
r30763, nixpkgs/trunk/pkgs/misc/sane-backends/default.nix)
==
--- nixpkgs/trunk/pkgs/misc/sane-backends/default.nix Mon Dec 5 16:53:58
2011(r30763, copy source)
+++ nixpkgs/trunk/pkgs/misc/sane-backends/snapshot.nix Mon Dec 5 17:32:45
2011(r30764)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
, gt68xxFirmware ? null }:
let
firmware = gt68xxFirmware {inherit fetchurl;};
@@ -6,11 +6,11 @@
assert hotplugSupport -> stdenv.system == "i686-linux";
stdenv.mkDerivation {
- name = "sane-backends-1.0.21";
+ name = "sane-backends-1.0.22.git20204";
src = fetchurl {
-url =
ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.21/sane-backends-1.0.21.tar.gz;
-sha256 = "12wl4a86hxwlrx46lm5z6lw4id3j8wi82yv3khxcz5sqjai2ykp4";
+url =
http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz;
+sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47";
};
udevSupport = hotplugSupport;
@@ -20,6 +20,7 @@
postInstall = ''
if test "$udevSupport" = "1"; then
ensureDir $out/etc/udev/rules.d/
+ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
fi
'';
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Dec 5 16:53:58
2011(r30763)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Dec 5 17:32:45
2011(r30764)
@@ -8486,6 +8486,10 @@
gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
};
+ saneBackendsSnapshot =
Re: [Nix-dev] [PATCH] Weaken an overzealous sanity check on udev rules...
On 12/5/11 11:49 AM, Petr Rockai wrote: > # bla bla RUN+="/path/to/script" bla bla (I.e., the file is rejected > based on a comment, not an actual rule.) Petr Ah, I see. Thanks, I've committed your patch. ~Shea ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30763 - nixos/trunk/modules/services/hardware
Author: shlevy
Date: Mon Dec 5 16:53:58 2011
New Revision: 30763
URL: https://nixos.org/websvn/nix/?rev=30763&sc=1
Log:
udev: Ignore commented lines when populating run_progs.
Patch by mornfall
Modified:
nixos/trunk/modules/services/hardware/udev.nix
Modified: nixos/trunk/modules/services/hardware/udev.nix
==
--- nixos/trunk/modules/services/hardware/udev.nix Mon Dec 5 16:23:05
2011(r30762)
+++ nixos/trunk/modules/services/hardware/udev.nix Mon Dec 5 16:53:58
2011(r30763)
@@ -68,7 +68,7 @@
echo -n "Checking that all programs called by relative paths in udev
rules exist in ${udev}/lib/udev ... "
import_progs=$(grep 'IMPORT{program}="[^/$]' $out/* |
sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
- run_progs=$(grep 'RUN+="[^/$]' $out/* |
+ run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="[^/$]' |
sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
for i in $import_progs $run_progs; do
if [[ ! -x ${pkgs.udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then
@@ -82,7 +82,7 @@
echo -n "Checking that all programs call by absolute paths in udev rules
exist ... "
import_progs=$(grep 'IMPORT{program}="/' $out/* |
sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
- run_progs=$(grep 'RUN+="/' $out/* |
+ run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="/' |
sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
for i in $import_progs $run_progs; do
if [[ ! -x $i ]]; then
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30762 - nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex
Author: simons
Date: Mon Dec 5 16:23:05 2011
New Revision: 30762
URL: https://nixos.org/websvn/nix/?rev=30762&sc=1
Log:
git-annex: updated to version 3.20111203
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Mon Dec 5 16:23:02 2011(r30761)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Mon Dec 5 16:23:05 2011(r30762)
@@ -4,14 +4,14 @@
}:
let
- version = "3.2022";
+ version = "3.20111203";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url =
"http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";;
-sha256 =
"b63fdd1fb890a388b9da8cc1037cefcb58e38ab4c7e3f27a7aec169ecbde6d2c";
+sha256 =
"236a8fa537be1738a16afcab8a7438dc567dce75a6b71b62780d31048428f74b";
};
buildInputs = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30761 - in nixpkgs/trunk/pkgs: applications/version-management/git-and-tools development/libraries/haskell/monad-control top-level
Author: simons
Date: Mon Dec 5 16:23:02 2011
New Revision: 30761
URL: https://nixos.org/websvn/nix/?rev=30761&sc=1
Log:
Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes
out that supports the current version.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Mon Dec 5 16:22:59 2011(r30760)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Mon Dec 5 16:23:02 2011(r30761)
@@ -48,8 +48,9 @@
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki
which;
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
- HTTP testpack monadControl hS3 mtl network hslogger hxt json;
+ HTTP testpack hS3 mtl network hslogger hxt json;
QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
+monadControl = haskellPackages.monadControl_OBSOLETE;
};
qgit = import ./qgit {
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
Mon Dec 5 16:23:02 2011(r30761)
@@ -0,0 +1,14 @@
+{ cabal, baseUnicodeSymbols, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "monad-control";
+ version = "0.2.0.3";
+ sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh";
+ buildDepends = [ baseUnicodeSymbols transformers ];
+ meta = {
+homepage = "https://github.com/basvandijk/monad-control/";;
+description = "Lift control operations, like exception catching, through
monad transformers";
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Dec 5 16:22:59
2011(r30760)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Dec 5 16:23:02
2011(r30761)
@@ -862,6 +862,7 @@
MonadCatchIOTransformers = callPackage
../development/libraries/haskell/MonadCatchIO-transformers {};
+ monadControl_OBSOLETE = callPackage
../development/libraries/haskell/monad-control/0.2.0.3.nix {};
monadControl = callPackage ../development/libraries/haskell/monad-control {};
monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30760 - nixpkgs/trunk/pkgs/development/tools/haskell/uuagc
Author: simons
Date: Mon Dec 5 16:22:59 2011
New Revision: 30760
URL: https://nixos.org/websvn/nix/?rev=30760&sc=1
Log:
haskell-uuagc-cabal: updated to version 1.0.0.10
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/cabal.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/cabal.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/cabal.nixMon Dec
5 16:22:56 2011(r30759)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/cabal.nixMon Dec
5 16:22:59 2011(r30760)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uuagc-cabal";
- version = "1.0.0.9";
- sha256 = "1iifzy58w50162bwj20xmldsyq0xaq0g849zgwxai26881a1jlfg";
+ version = "1.0.0.10";
+ sha256 = "0dqj5nqq8qpylbxyv8cpy3rrnna9yqb4dnxxk7sgyhw6yvz48l56";
buildDepends = [ mtl uulib ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30759 - nixpkgs/trunk/pkgs/development/tools/haskell/uuagc
Author: simons
Date: Mon Dec 5 16:22:56 2011
New Revision: 30759
URL: https://nixos.org/websvn/nix/?rev=30759&sc=1
Log:
haskell-uuagc-bootstrap: updated to version 0.9.39.3.0
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/bootstrap.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/bootstrap.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/bootstrap.nixMon Dec
5 16:22:54 2011(r30758)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/bootstrap.nixMon Dec
5 16:22:56 2011(r30759)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uuagc-bootstrap";
- version = "0.9.39.1.0";
- sha256 = "06w330j0nds5piv1rr3m6m1idnf0c5swfk9qwdqzi0pmpws6lpkj";
+ version = "0.9.39.3.0";
+ sha256 = "0y1ipxkh9rl4mvw9a83dx0slr0ry1yw670z3w3dlb716xyzqyg5z";
isLibrary = true;
isExecutable = true;
buildDepends = [ haskellSrcExts mtl uulib ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30758 - nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix
Author: simons
Date: Mon Dec 5 16:22:54 2011
New Revision: 30758
URL: https://nixos.org/websvn/nix/?rev=30758&sc=1
Log:
haskell-cabal2nix: updated to version 1.20
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix Mon Dec
5 16:00:16 2011(r30757)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix Mon Dec
5 16:22:54 2011(r30758)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
- version = "1.19";
- sha256 = "0fvd8h9dymz6l4fw2955ir6w4fcz7kdpl38kbd5ddk99q886035i";
+ version = "1.20";
+ sha256 = "14xbv7mqr9m9vhjd6xcxdb4m189p30bwbjrjjf20bq12w4h2v1xa";
isLibrary = false;
isExecutable = true;
buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/hydra] b1da85: Fix sysbuild input type handling
Branch: refs/heads/master Home: https://github.com/NixOS/hydra Commit: b1da85140d74d28e1a74db4c7b048e71bfa3d1f3 https://github.com/NixOS/hydra/commit/b1da85140d74d28e1a74db4c7b048e71bfa3d1f3 Author: Eelco Dolstra Date: 2011-12-05 (Mon, 05 Dec 2011) Changed paths: M src/lib/Hydra/Helper/AddBuilds.pm M src/script/hydra-evaluator Log Message: --- Fix sysbuild input type handling ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30756 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod
Author: simons
Date: Mon Dec 5 16:00:13 2011
New Revision: 30756
URL: https://nixos.org/websvn/nix/?rev=30756&sc=1
Log:
haskell-yesod: updated to version 0.9.3.4
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 Dec
5 16:00:10 2011(r30755)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Mon Dec
5 16:00:13 2011(r30756)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
- version = "0.9.3.3";
- sha256 = "11xjj9madb9dxk06z3izzbv3cish748hkf57k37mjsvlidbxd104";
+ version = "0.9.3.4";
+ sha256 = "1iw6qf1dywss8w4ig3dr04cyi01jq9frvmkbqgj5jq8v11y55x6v";
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30755 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core
Author: simons
Date: Mon Dec 5 16:00:10 2011
New Revision: 30755
URL: https://nixos.org/websvn/nix/?rev=30755&sc=1
Log:
haskell-yesod-core: updated to version 0.9.3.5
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 Dec 5 16:00:06 2011(r30754)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Mon Dec 5 16:00:10 2011(r30755)
@@ -2,20 +2,20 @@
, clientsession, cookie, dataObject, dataObjectYaml, enumerator
, failure, hamlet, httpTypes, monadControl, parsec, pathPieces
, random, shakespeare, shakespeareCss, shakespeareJs
-, strictConcurrency, text, time, transformers, vector, wai
-, waiExtra
+, strictConcurrency, text, time, transformers, transformersBase
+, vector, wai, waiExtra
}:
cabal.mkDerivation (self: {
pname = "yesod-core";
- version = "0.9.3.4";
- sha256 = "1hnzmbspdj15480n0r4r1gayapwwz3d5r3hzj5k4qd9975lyxcw1";
+ version = "0.9.3.5";
+ sha256 = "0gnn0lm52qk0lmjh51kvwf645icfdrvy0ck5kg9dpznk5i3n2g13";
buildDepends = [
aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
cookie dataObject dataObjectYaml enumerator failure hamlet
httpTypes monadControl parsec pathPieces random shakespeare
shakespeareCss shakespeareJs strictConcurrency text time
-transformers vector wai waiExtra
+transformers transformersBase vector wai waiExtra
];
meta = {
homepage = "http://www.yesodweb.com/";;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30757 - nixpkgs/trunk/pkgs/development/libraries/haskell/aeson
Author: simons
Date: Mon Dec 5 16:00:16 2011
New Revision: 30757
URL: https://nixos.org/websvn/nix/?rev=30757&sc=1
Log:
haskell-aeson: re-generated with the latest version of cabal2nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/aeson/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/aeson/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/aeson/default.nix Mon Dec
5 16:00:13 2011(r30756)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/aeson/default.nix Mon Dec
5 16:00:16 2011(r30757)
@@ -1,5 +1,5 @@
-{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, hashable
-, mtl, syb, text, time, unorderedContainers, vector
+{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, dlist
+, hashable, mtl, syb, text, time, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
@@ -7,8 +7,8 @@
version = "0.4.0.0";
sha256 = "1j0m7hh82ab7lg757wq75k28llfd1igawmg4g2qdia5gimm652pa";
buildDepends = [
-attoparsec blazeBuilder blazeTextual deepseq hashable mtl syb text
-time unorderedContainers vector
+attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb
+text time unorderedContainers vector
];
meta = {
homepage = "https://github.com/bos/aeson";;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30753 - nixpkgs/trunk/pkgs/development/libraries/haskell/warp
Author: simons
Date: Mon Dec 5 16:00:03 2011
New Revision: 30753
URL: https://nixos.org/websvn/nix/?rev=30753&sc=1
Log:
haskell-warp: updated to version 0.4.6.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/warp/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/warp/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/warp/default.nix Mon Dec
5 16:00:01 2011(r30752)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/warp/default.nix Mon Dec
5 16:00:03 2011(r30753)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
- version = "0.4.6.1";
- sha256 = "0gybcxfg619nws0j3ybimd8qg2knb1byk8cpcsdligp4yifp4qwd";
+ version = "0.4.6.2";
+ sha256 = "1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94";
buildDepends = [
blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
httpTypes network simpleSendfile transformers unixCompat wai
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30754 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth
Author: simons
Date: Mon Dec 5 16:00:06 2011
New Revision: 30754
URL: https://nixos.org/websvn/nix/?rev=30754&sc=1
Log:
haskell-yesod-auth: updated to version 0.7.7
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 Dec 5 16:00:03 2011(r30753)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Mon Dec 5 16:00:06 2011(r30754)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
- version = "0.7.6.2";
- sha256 = "1g865k5p7i4x78kj00ybb757xbl6vck6d7qdq9n15xg6dbfm0i23";
+ version = "0.7.7";
+ sha256 = "0c5icrhi7an7c500y7ply9p1k22gzm5p9rw33szgc78h5p3jwwcg";
buildDepends = [
aeson authenticate blazeHtml controlMonadAttempt hamlet
httpEnumerator mimeMail persistent persistentTemplate pureMD5
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30751 - nixpkgs/trunk/pkgs/development/libraries/haskell/pool
Author: simons
Date: Mon Dec 5 15:59:58 2011
New Revision: 30751
URL: https://nixos.org/websvn/nix/?rev=30751&sc=1
Log:
haskell-pool: updated to version 0.1.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/pool/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pool/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pool/default.nix Mon Dec
5 15:59:56 2011(r30750)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pool/default.nix Mon Dec
5 15:59:58 2011(r30751)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "pool";
- version = "0.1.1";
- sha256 = "0h498pi7048m4cida10s28dp9f8c2ig3m4s9chwrfw3yiyai926l";
+ version = "0.1.2";
+ sha256 = "05lrinyk9gxdf67vwdav93ral2y8qsb33i9y5k91vlcjfp7w516q";
buildDepends = [ monadControl transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30752 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css
Author: simons
Date: Mon Dec 5 16:00:01 2011
New Revision: 30752
URL: https://nixos.org/websvn/nix/?rev=30752&sc=1
Log:
haskell-shakespeare-css: updated to version 0.10.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Mon Dec 5 15:59:58 2011(r30751)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Mon Dec 5 16:00:01 2011(r30752)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-css";
- version = "0.10.3";
- sha256 = "1r0m1pqgg43dmc1gb1aj99hyk1jw0ciln9k7q3mq8vwc602kfd5r";
+ version = "0.10.4";
+ sha256 = "006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz";
buildDepends = [ parsec shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30750 - nixpkgs/trunk/pkgs/development/libraries/haskell/persistent
Author: simons
Date: Mon Dec 5 15:59:56 2011
New Revision: 30750
URL: https://nixos.org/websvn/nix/?rev=30750&sc=1
Log:
haskell-persistent: updated to version 0.6.4.3
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 Dec 5 15:59:53 2011(r30749)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Mon Dec 5 15:59:56 2011(r30750)
@@ -1,14 +1,15 @@
{ cabal, blazeHtml, dataObject, enumerator, monadControl, mtl
, pathPieces, pool, sqlite, text, time, transformers
+, transformersBase
}:
cabal.mkDerivation (self: {
pname = "persistent";
- version = "0.6.4.1";
- sha256 = "06l04yb49iiw4lyyy1vk138v3g2jh8xwd4bzpcagkh62jrvq559a";
+ version = "0.6.4.3";
+ sha256 = "0j4agwm8hcphrmzmc7d7al57cwp3i5iy7d8yhqw9m8pcx61sqkg4";
buildDepends = [
blazeHtml dataObject enumerator monadControl mtl pathPieces pool
-text time transformers
+text time transformers transformersBase
];
extraLibraries = [ sqlite ];
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30749 - nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template
Author: simons
Date: Mon Dec 5 15:59:53 2011
New Revision: 30749
URL: https://nixos.org/websvn/nix/?rev=30749&sc=1
Log:
haskell-persistent-template: updated to version 0.6.3.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 Dec 5 15:59:51 2011(r30748)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
Mon Dec 5 15:59:53 2011(r30749)
@@ -1,10 +1,10 @@
-{ cabal, monadControl, persistent, text }:
+{ cabal, monadControl, persistent, text, transformers }:
cabal.mkDerivation (self: {
pname = "persistent-template";
- version = "0.6.3";
- sha256 = "1vcjvfjxmv9c0wg7pbx0lw73128f5y0r4sfdsyq3jrkkiq1bgsxa";
- buildDepends = [ monadControl persistent text ];
+ version = "0.6.3.1";
+ sha256 = "0hppxd80q7bnxz9vm08i278d9k95w6z139y73dy53ncqkp72ahrg";
+ buildDepends = [ monadControl persistent text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";;
description = "Type-safe, non-relational, multi-backend persistence";
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30748 - nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control
Author: simons
Date: Mon Dec 5 15:59:51 2011
New Revision: 30748
URL: https://nixos.org/websvn/nix/?rev=30748&sc=1
Log:
haskell-monad-control: updated to version 0.3.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/default.nix
Mon Dec 5 15:59:48 2011(r30747)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/default.nix
Mon Dec 5 15:59:51 2011(r30748)
@@ -1,12 +1,14 @@
-{ cabal, baseUnicodeSymbols, transformers }:
+{ cabal, baseUnicodeSymbols, transformers, transformersBase }:
cabal.mkDerivation (self: {
pname = "monad-control";
- version = "0.2.0.3";
- sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh";
- buildDepends = [ baseUnicodeSymbols transformers ];
+ version = "0.3.0.1";
+ sha256 = "0aa73cw82yssias0a9y237h9r4v4abvs0lv2lmhxaa4a4mdrj3ms";
+ buildDepends = [
+baseUnicodeSymbols transformers transformersBase
+ ];
meta = {
-homepage = "https://github.com/basvandijk/monad-control/";;
+homepage = "https://github.com/basvandijk/monad-control";;
description = "Lift control operations, like exception catching, through
monad transformers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30747 - nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator
Author: simons
Date: Mon Dec 5 15:59:48 2011
New Revision: 30747
URL: https://nixos.org/websvn/nix/?rev=30747&sc=1
Log:
haskell-http-enumerator: updated to version 0.7.1.8
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Mon Dec 5 15:59:46 2011(r30746)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Mon Dec 5 15:59:48 2011(r30747)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "http-enumerator";
- version = "0.7.1.7";
- sha256 = "0w6sz37miyl6jxwl6zq9440bx4avrr56alq26cbm0qxa824nnpih";
+ version = "0.7.1.8";
+ sha256 = "1bydj4qfmz03qpgk0aixrhf96bl4zx1ak5x0cq8ppp9c2vsig0i4";
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30746 - nixpkgs/trunk/pkgs/development/libraries/haskell/hashtables
Author: simons
Date: Mon Dec 5 15:59:46 2011
New Revision: 30746
URL: https://nixos.org/websvn/nix/?rev=30746&sc=1
Log:
haskell-hashtables: updated to version 1.0.1.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hashtables/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hashtables/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hashtables/default.nix
Mon Dec 5 15:59:43 2011(r30745)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hashtables/default.nix
Mon Dec 5 15:59:46 2011(r30746)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hashtables";
- version = "1.0.1.0";
- sha256 = "0a2cfm649smryxfkv61yd8vjl1wyly468xa1l4jb50jxzyyw42z5";
+ version = "1.0.1.1";
+ sha256 = "1s5p2gsi7wv6xmf6ax3s9mqmbvcispn2y9miksay3p4acc6b3lpa";
buildDepends = [ hashable primitive vector ];
meta = {
homepage = "http://github.com/gregorycollins/hashtables";;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30745 - nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml
Author: simons
Date: Mon Dec 5 15:59:43 2011
New Revision: 30745
URL: https://nixos.org/websvn/nix/?rev=30745&sc=1
Log:
haskell-data-object-yaml: updated to version 0.3.3.6
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml/default.nix
Mon Dec 5 15:59:41 2011(r30744)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml/default.nix
Mon Dec 5 15:59:43 2011(r30745)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "data-object-yaml";
- version = "0.3.3.5";
- sha256 = "0ag0rac9j4ipfg9haa63s73sn7zckrpwybcfk2nbg84ix56nv36w";
+ version = "0.3.3.6";
+ sha256 = "0hha52nrxb539bvdz6ksn9sxmksfwmjhh7h8mp223s340vxrlpk3";
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30744 - nixpkgs/trunk/pkgs/development/libraries/haskell/convertible-text
Author: simons
Date: Mon Dec 5 15:59:41 2011
New Revision: 30744
URL: https://nixos.org/websvn/nix/?rev=30744&sc=1
Log:
haskell-convertible-text: updated to version 0.4.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/convertible-text/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/convertible-text/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/convertible-text/default.nix
Mon Dec 5 15:59:38 2011(r30743)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/convertible-text/default.nix
Mon Dec 5 15:59:41 2011(r30744)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "convertible-text";
- version = "0.3.0.10";
- sha256 = "1hi7rqijay37b5msyzqqgvkvrsdpj9p96ajxmyk4vm7nnk5dfhbp";
+ version = "0.4.0.1";
+ sha256 = "0m252ml2zgw0jxfs678m1wp9ivy6gvi9w50qw7zi9ycxnzj9j6r2";
isLibrary = true;
isExecutable = true;
buildDepends = [ attempt text time ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30743 - nixpkgs/trunk/pkgs/development/libraries/haskell/X11
Author: simons
Date: Mon Dec 5 15:59:38 2011
New Revision: 30743
URL: https://nixos.org/websvn/nix/?rev=30743&sc=1
Log:
haskell-X11: updated to version 1.5.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nixMon Dec
5 14:16:30 2011(r30742)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nixMon Dec
5 15:59:38 2011(r30743)
@@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "X11";
- version = "1.5.0.0";
- sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f";
+ version = "1.5.0.1";
+ sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19";
buildDepends = [ syb ];
extraLibraries = [ libX11 libXext libXinerama ];
meta = {
-homepage = "http://code.haskell.org/X11";;
+homepage = "https://github.com/haskell-pkg-janitors/X11";;
description = "A binding to the X11 graphics library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/hydra] 1d96b0: Use a nicer version string
Branch: refs/heads/master Home: https://github.com/NixOS/hydra Commit: 1d96b0ba672783219ef15f0b5b3b6063a8925502 https://github.com/NixOS/hydra/commit/1d96b0ba672783219ef15f0b5b3b6063a8925502 Author: Eelco Dolstra Date: 2011-12-05 (Mon, 05 Dec 2011) Changed paths: M release.nix Log Message: --- Use a nicer version string ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/hydra] e9c887: Pass additional attributes for Git inputs
Branch: refs/heads/master Home: https://github.com/NixOS/hydra Commit: e9c88783cee0d30b411d10224db6fb7caf82d6c0 https://github.com/NixOS/hydra/commit/e9c88783cee0d30b411d10224db6fb7caf82d6c0 Author: Eelco Dolstra Date: 2011-12-05 (Mon, 05 Dec 2011) Changed paths: M src/lib/Hydra/Helper/AddBuilds.pm Log Message: --- Pass additional attributes for Git inputs The ‘revCount’ attribute is the number of commits in the history of the revision. This is useful if you need a monotonically increasing version number. The ‘gitTag’ attribute is the output of ‘git describe’, e.g. ‘v1.0.4-14-g2414721’ to indicate that the current revision is 14 commits after the tag ‘v1.0.4’. Commit: 09e26a301174ba38b7972e16953ba856dc949145 https://github.com/NixOS/hydra/commit/09e26a301174ba38b7972e16953ba856dc949145 Author: Eelco Dolstra Date: 2011-12-05 (Mon, 05 Dec 2011) Changed paths: M tests/query-all-tables.pl Log Message: --- Fix broken test Compare: https://github.com/NixOS/hydra/compare/9032c55...09e26a3 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] [PATCH] Weaken an overzealous sanity check on udev rules...
Hi Petr, On 12/4/11 8:52 PM, Petr Rockai wrote: > Hi, > > the below patch is needed to build a configuration that includes recent > SANE (scanner drivers) udev rules which mention RUN+="/path/to/script" > in a comment (which breaks the check). > > Yours, > Petr Can you give an example udev rule that is currently rejected but shouldn't be? Thanks, Shea ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30742 - nixpkgs/trunk/pkgs/build-support/release
Author: eelco
Date: Mon Dec 5 14:16:30 2011
New Revision: 30742
URL: https://nixos.org/websvn/nix/?rev=30742&sc=1
Log:
* Allow versionSuffix to be overriden.
Modified:
nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix
Modified: nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix
==
--- nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix Mon Dec 5
13:31:31 2011(r30741)
+++ nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix Mon Dec 5
14:16:30 2011(r30742)
@@ -6,16 +6,15 @@
, buildInputs ? []
, name ? "source-tarball"
, version ? "0"
+, versionSuffix ?
+if officialRelease
+then ""
+else if src ? rev then "pre${toString src.rev}" else ""
, src, stdenv, autoconf, automake, libtool
, ... } @ args:
let
- versionSuffix =
-if officialRelease
-then ""
-else if src ? rev then "pre${toString src.rev}" else "";
-
# By default, provide all the GNU Build System as input.
bootstrapBuildInputs =
if (args ? bootstrapBuildInputs)
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30741 - nixpkgs/trunk/pkgs/top-level
Author: eelco
Date: Mon Dec 5 13:31:31 2011
New Revision: 30741
URL: https://nixos.org/websvn/nix/?rev=30741&sc=1
Log:
* Updated DBIx::Class and DBIx::Class::Schema::Loader.
Modified:
nixpkgs/trunk/pkgs/top-level/perl-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/perl-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/perl-packages.nix Mon Dec 5 12:12:20
2011(r30740)
+++ nixpkgs/trunk/pkgs/top-level/perl-packages.nix Mon Dec 5 13:31:31
2011(r30741)
@@ -1120,17 +1120,17 @@
};
DBIxClass = buildPerlPackage rec {
-name = "DBIx-Class-0.08195";
+name = "DBIx-Class-0.08196";
src = fetchurl {
- url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz";
- sha256 = "197q2pkkk6dpq1r76jcnzamk5dqac5k9n3wgq8dd5ak8sw6cj7p6";
+ url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz";
+ sha256 = "15k1kgbrsnkwr0ib6cyr114zk904lisy4k09gfiynag9wjhv47lm";
};
buildInputs = [ DBDSQLite TestException TestWarn ];
propagatedBuildInputs =
[ PackageStash ClassAccessorGrouped ClassC3Componentised
ClassInspector ConfigAny ContextPreserve DBI DataCompare
DataDumperConcise DataPage HashMerge MROCompat ModuleFind
-PathClass SQLAbstract ScopeGuard SubName TryTiny VariableMagic
+PathClass SQLAbstract ScopeGuard SubName TryTiny
NamespaceClean
];
};
@@ -1155,17 +1155,18 @@
};
DBIxClassSchemaLoader = buildPerlPackage rec {
-name = "DBIx-Class-Schema-Loader-0.07010";
+name = "DBIx-Class-Schema-Loader-0.07014";
src = fetchurl {
url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz";
- sha256 = "08yy5lsrb7h1xzp7d1bqsgnjpa2d8ik14qhsq2d7v7r3f5fk5q3g";
+ sha256 = "0qrsh6i8p4mpx5bapn40cpsbvnvzivli71gymbiqjd0mjflbsjf6";
};
buildInputs = [ TestException TestMore TestWarn DBDSQLite ];
propagatedBuildInputs =
- [ DataDump LinguaENInflectNumber LinguaENInflectPhrase ClassAccessor
-ClassAccessorGrouped ClassC3Componentised MROCompat CarpClan
-DBIxClass ClassLoad ClassUnload FileSlurp ListMoreUtils
-NamespaceClean ScopeGuard TryTiny
+ [ DataDump LinguaENInflectNumber LinguaENInflectPhrase
+ClassAccessor ClassAccessorGrouped ClassC3Componentised
+MROCompat CarpClan DBIxClass ClassLoad ClassUnload
+ListMoreUtils NamespaceClean ScopeGuard TryTiny TaskWeaken
+StringCamelCase StringToIdentifierEN
];
};
@@ -2073,10 +2074,10 @@
};
LinguaENInflectPhrase = buildPerlPackage rec {
-name = "Lingua-EN-Inflect-Phrase-0.04";
+name = "Lingua-EN-Inflect-Phrase-0.10";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz";
- sha256 = "12a74zkc1rybsvxwg8fxdjs6frfq7naky2ks4idcwd48lya3nw90";
+ sha256 = "1l7sjnibnvgb7a73cjhysmrg4j2bfcn0x5yrqmh0v23laj9fsbbm";
};
buildInputs = [ TestMore ];
propagatedBuildInputs =
@@ -3053,6 +3054,14 @@
propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ];
};
+ StringCamelCase = buildPerlPackage rec {
+name = "String-CamelCase-0.02";
+src = fetchurl {
+ url = "mirror://cpan/modules/by-module/String/${name}.tar.gz";
+ sha256 = "17kh8nap2z5g5rqcvw0m7mvbai7wr7h0al39w8l827zhqad8ss42";
+};
+ };
+
StringFormat = buildPerlPackage rec {
name = "String-Format-1.16";
src = fetchurl {
@@ -3077,6 +3086,16 @@
};
};
+ StringToIdentifierEN = buildPerlPackage rec {
+name = "String-ToIdentifier-EN-0.06";
+src = fetchurl {
+ url = "mirror://cpan/modules/by-module/String/${name}.tar.gz";
+ sha256 = "1rmldr7jf4jvkhzlv8hgp48lrmybvinmhv8kcnrpa8las0ijm4vm";
+};
+propagatedBuildInputs =
+ [ LinguaENInflectPhrase TextUnidecode NamespaceClean ];
+ };
+
SubExporter = buildPerlPackage rec {
name = "Sub-Exporter-0.982";
src = fetchurl {
@@ -3578,6 +3597,14 @@
propagatedBuildInputs = [TextAligner];
};
+ TextUnidecode = buildPerlPackage rec {
+name = "Text-Unidecode-0.04";
+src = fetchurl {
+ url = "mirror://cpan/modules/by-module/Text/${name}.tar.gz";
+ sha256 = "01kbw5xshs906ikg0rgf51y9m6m26a4msv7ghcqwx7w2shgs0ga7";
+};
+ };
+
Throwable = buildPerlPackage rec {
name = "Throwable-0.102080";
src = fetchurl {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/hydra] 9032c5: Keep track of the database schema version
Branch: refs/heads/master Home: https://github.com/NixOS/hydra Commit: 9032c55aa6eb7c6cd42060db9fa6dd024f0d5bec https://github.com/NixOS/hydra/commit/9032c55aa6eb7c6cd42060db9fa6dd024f0d5bec Author: Eelco Dolstra Date: 2011-12-05 (Mon, 05 Dec 2011) Changed paths: M src/lib/Hydra/Schema.pm M src/lib/Hydra/Schema/BuildInputs.pm M src/lib/Hydra/Schema/BuildMachineSystemTypes.pm M src/lib/Hydra/Schema/BuildMachines.pm M src/lib/Hydra/Schema/BuildProducts.pm M src/lib/Hydra/Schema/BuildResultInfo.pm M src/lib/Hydra/Schema/BuildSchedulingInfo.pm M src/lib/Hydra/Schema/BuildSteps.pm M src/lib/Hydra/Schema/Builds.pm M src/lib/Hydra/Schema/CachedBazaarInputs.pm M src/lib/Hydra/Schema/CachedCVSInputs.pm M src/lib/Hydra/Schema/CachedGitInputs.pm M src/lib/Hydra/Schema/CachedHgInputs.pm M src/lib/Hydra/Schema/CachedPathInputs.pm M src/lib/Hydra/Schema/CachedSubversionInputs.pm M src/lib/Hydra/Schema/Jobs.pm M src/lib/Hydra/Schema/JobsetEvalMembers.pm M src/lib/Hydra/Schema/JobsetEvals.pm M src/lib/Hydra/Schema/JobsetInputAlts.pm M src/lib/Hydra/Schema/JobsetInputs.pm M src/lib/Hydra/Schema/Jobsets.pm M src/lib/Hydra/Schema/NewsItems.pm M src/lib/Hydra/Schema/ProjectMembers.pm M src/lib/Hydra/Schema/Projects.pm M src/lib/Hydra/Schema/ReleaseMembers.pm M src/lib/Hydra/Schema/Releases.pm A src/lib/Hydra/Schema/SchemaVersion.pm M src/lib/Hydra/Schema/SystemTypes.pm M src/lib/Hydra/Schema/UriRevMapper.pm M src/lib/Hydra/Schema/UserRoles.pm M src/lib/Hydra/Schema/Users.pm M src/lib/Hydra/Schema/ViewJobs.pm M src/lib/Hydra/Schema/Views.pm M src/sql/Makefile.am M src/sql/hydra.sql Log Message: --- Keep track of the database schema version The singleton table SchemaVersion contains the current version of the Hydra database schema. This can be used to upgrade the schema on the fly. Also reran the DBIx::Class schema loader. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30740 - nixpkgs/trunk/pkgs/tools/package-management/nix
Author: eelco
Date: Mon Dec 5 12:12:20 2011
New Revision: 30740
URL: https://nixos.org/websvn/nix/?rev=30740&sc=1
Log:
* Bump.
Modified:
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
==
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixMon Dec
5 11:28:55 2011(r30739)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixMon Dec
5 12:12:20 2011(r30740)
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-1.0pre30626";
+ name = "nix-1.0pre30706";
src = fetchurl {
-url = "http://hydra.nixos.org/build/1575015/download/4/${name}.tar.bz2";;
-sha256 =
"a0ab32125224fa544d0e1979bbb4d1a1ef35b0a6047396e66629f4a8f8187b77";
+url = "http://hydra.nixos.org/build/1580753/download/4/${name}.tar.bz2";;
+sha256 =
"2658a4fea95799d8719685a808ab354f0b5a3ce38af92117e1a15c394c261c5b";
};
buildNativeInputs = [ perl pkgconfig ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/hydra] 3b9a62: Pass inputs to release expressions using -I
Branch: refs/heads/master
Home: https://github.com/NixOS/hydra
Commit: 3b9a62c964013b100c4787bdae5e20652672923c
https://github.com/NixOS/hydra/commit/3b9a62c964013b100c4787bdae5e20652672923c
Author: Eelco Dolstra
Date: 2011-12-05 (Mon, 05 Dec 2011)
Changed paths:
M src/c/hydra-eval-jobs.cc
M src/lib/Hydra/Helper/AddBuilds.pm
M src/script/hydra-evaluator
Log Message:
---
Pass inputs to release expressions using -I
This means that you can now write (for instance)
with { ... };
in release.nix, rather than
{ nixpkgs } :
with nixpkgs { ... };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30739 - patchelf/trunk
Author: eelco
Date: Mon Dec 5 11:28:55 2011
New Revision: 30739
URL: https://nixos.org/websvn/nix/?rev=30739&sc=1
Log:
* Use <...> syntax.
Modified:
patchelf/trunk/release.nix
Modified: patchelf/trunk/release.nix
==
--- patchelf/trunk/release.nix Mon Dec 5 10:44:53 2011(r30738)
+++ patchelf/trunk/release.nix Mon Dec 5 11:28:55 2011(r30739)
@@ -1,11 +1,10 @@
-{ nixpkgs ? ../nixpkgs
-, patchelfSrc ? {outPath = ./.; rev = 1234;}
+{ patchelfSrc ? {outPath = ./.; rev = 1234;}
, officialRelease ? false
}:
let
- pkgs = import nixpkgs {};
+ pkgs = import {};
jobs = {
@@ -35,7 +34,7 @@
build =
{ system ? "i686-linux" }:
- with import nixpkgs {inherit system;};
+ with import {inherit system;};
releaseTools.nixBuild {
name = "patchelf";
@@ -91,7 +90,7 @@
makeRPM =
system: diskImageFun: prio:
-with import nixpkgs {inherit system;};
+with import {inherit system;};
releaseTools.rpmBuild rec {
name = "patchelf-rpm";
@@ -107,7 +106,7 @@
makeDeb =
system: diskImageFun: prio:
-with import nixpkgs {inherit system;};
+with import {inherit system;};
releaseTools.debBuild {
name = "patchelf-deb";
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30738 - nixpkgs/trunk/pkgs/applications/science/electronics/gtkwave
Author: viric
Date: Mon Dec 5 10:44:53 2011
New Revision: 30738
URL: https://nixos.org/websvn/nix/?rev=30738&sc=1
Log:
Updating gtkwave
Modified:
nixpkgs/trunk/pkgs/applications/science/electronics/gtkwave/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/science/electronics/gtkwave/default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/electronics/gtkwave/default.nix
Mon Dec 5 09:38:59 2011(r30737)
+++ nixpkgs/trunk/pkgs/applications/science/electronics/gtkwave/default.nix
Mon Dec 5 10:44:53 2011(r30738)
@@ -1,10 +1,10 @@
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} :
stdenv.mkDerivation rec {
- name = "gtkwave-3.3.20";
+ name = "gtkwave-3.3.28";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-sha256 = "0r2yh8a5rrxjzvykdmqlb098wws5c9k255saf2bsdchnigs8il3n";
+sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0";
};
buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30737 - nixpkgs/trunk/pkgs/development/interpreters/pure
Author: kkallio
Date: Mon Dec 5 09:38:59 2011
New Revision: 30737
URL: https://nixos.org/websvn/nix/?rev=30737&sc=1
Log:
pure 0.49 (compiles again with latest llvm)
Modified:
nixpkgs/trunk/pkgs/development/interpreters/pure/default.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/pure/default.nix
==
--- nixpkgs/trunk/pkgs/development/interpreters/pure/default.nixMon Dec
5 09:30:33 2011(r30736)
+++ nixpkgs/trunk/pkgs/development/interpreters/pure/default.nixMon Dec
5 09:38:59 2011(r30737)
@@ -12,11 +12,11 @@
sourceInfo = rec {
baseName="pure";
project="pure-lang";
-version="0.47";
+version="0.49";
name="${baseName}-${version}";
extension="tar.gz";
url="http://${project}.googlecode.com/files/${name}.${extension}";;
-hash="16j0k639kw2am4fc2h7q5sk7kx5z7nca896dakhphlb9zn9h0gbv";
+hash="0kkrcmmqks82g3qlkvs3cd23v6b5948rw3xsdadd1jidh74jg33x";
};
in
rec {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30736 - nixpkgs/trunk/pkgs/top-level
Author: kkallio
Date: Mon Dec 5 09:30:33 2011
New Revision: 30736
URL: https://nixos.org/websvn/nix/?rev=30736&sc=1
Log:
fix error: undefined variable 'llvmSVN'
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 Dec 5 05:03:18
2011(r30735)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Dec 5 09:30:33
2011(r30736)
@@ -1677,10 +1677,6 @@
#Use this instead of stdenv to build with clang
clangStdenv = stdenvAdapters.overrideGCC stdenv clang;
- clangSVN = llvmSVN.override {
-buildClang = true;
- };
-
clean = callPackage ../development/compilers/clean { };
cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] [PATCH] Scanning with SANE as unprivileged user
Hi,
the expressions in sane-backends imply that there was an intent to ship
the udev rules that flag sane-recognized scanner devices for udev-acl,
so that ordinary users logged in at the console can scan. However, the
way this udev rule file is provided by sane-backends upstream has
changed: the file is not distributed verbatim, but a tool is built to
print the rules. I have updated the sane package to that effect.
I have also added a "snapshot" build of sane-backends, since my canon
lide 210 is substantially faster with the git snapshot than it is in the
latest release. Might be useful for others too.
Finally, to make use of the udev rules, I have added a module to nixos/,
so that folks can just say hardware.sane.enable = true instead of
learning about how to enable the udev rules manually.
Petr
Index: pkgs/misc/sane-backends/default.nix
===
--- pkgs/misc/sane-backends/default.nix (revision 30731)
+++ pkgs/misc/sane-backends/default.nix (working copy)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
, gt68xxFirmware ? null }:
let
firmware = gt68xxFirmware {inherit fetchurl;};
@@ -20,6 +20,7 @@
postInstall = ''
if test "$udevSupport" = "1"; then
ensureDir $out/etc/udev/rules.d/
+ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
fi
'';
Index: pkgs/misc/sane-backends/snapshot.nix
===
--- pkgs/misc/sane-backends/snapshot.nix (revision 0)
+++ pkgs/misc/sane-backends/snapshot.nix (working copy)
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
+, gt68xxFirmware ? null }:
+let
+ firmware = gt68xxFirmware {inherit fetchurl;};
+in
+assert hotplugSupport -> stdenv.system == "i686-linux";
+
+stdenv.mkDerivation rec {
+ name = "sane-backends-1.0.22.git20204";
+
+ src = fetchurl {
+url = http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz;
+sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47";
+ };
+
+ udevSupport = hotplugSupport;
+
+ buildInputs = if libusb != null then [libusb] else [];
+
+ postInstall = ''
+if test "$udevSupport" = "1"; then
+ ensureDir $out/etc/udev/rules.d/
+ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
+ cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
+fi
+ '';
+
+ preInstall =
+if gt68xxFirmware != null then
+ "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
+ " \${out}/share/sane/gt68xx/" + firmware.name
+else "";
+}
Index: pkgs/top-level/all-packages.nix
===
--- pkgs/top-level/all-packages.nix (revision 30731)
+++ pkgs/top-level/all-packages.nix (working copy)
@@ -8493,6 +8495,10 @@
gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
};
+ saneBackendsSnapshot = callPackage ../misc/sane-backends/snapshot.nix {
+gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
+ };
+
saneFrontends = callPackage ../misc/sane-front { };
slock = callPackage ../misc/screensavers/slock { };
Index: modules/module-list.nix
===
--- modules/module-list.nix (revision 30731)
+++ modules/module-list.nix (working copy)
@@ -68,6 +68,7 @@
./services/hardware/bluetooth.nix
./services/hardware/hal.nix
./services/hardware/pcscd.nix
+ ./services/hardware/sane.nix
./services/hardware/udev.nix
./services/hardware/udisks.nix
./services/hardware/upower.nix
Index: modules/services/hardware/sane.nix
===
--- modules/services/hardware/sane.nix (revision 0)
+++ modules/services/hardware/sane.nix (working copy)
@@ -0,0 +1,34 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+ ## interface
+
+ options = {
+
+hardware.sane.enable = mkOption {
+ default = false;
+ description = "Enable support for SANE scanners.";
+};
+
+hardware.sane.snapshot = mkOption {
+ default = false;
+ description = "Use a development snapshot of SANE scanner drivers.";
+};
+
+ };
+
+
+ ## implementation
+
+config = let pkg = if config.hardware.sane.snapshot
+ then pkgs.saneBackendsSnapshot
+ else pkgs.saneBackends;
+ in mkIf config.hardware.sane.enable {
+ environment.systemPackages = [ pkg ];
+ services.udev.packages = [ pkg ];
+ };
+
+}
--
id' Ash = Ash; id' Dust = Dust; id' _ = undefined
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] [PATCH] Weaken an overzealous sanity check on udev rules...
Hi,
the below patch is needed to build a configuration that includes recent
SANE (scanner drivers) udev rules which mention RUN+="/path/to/script"
in a comment (which breaks the check).
Yours,
Petr
Index: modules/services/hardware/udev.nix
===
--- modules/services/hardware/udev.nix (revision 30729)
+++ modules/services/hardware/udev.nix (working copy)
@@ -68,7 +68,7 @@
echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev ... "
import_progs=$(grep 'IMPORT{program}="[^/$]' $out/* |
sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
- run_progs=$(grep 'RUN+="[^/$]' $out/* |
+ run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="[^/$]' |
sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
for i in $import_progs $run_progs; do
if [[ ! -x ${pkgs.udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then
@@ -82,7 +82,7 @@
echo -n "Checking that all programs call by absolute paths in udev rules exist ... "
import_progs=$(grep 'IMPORT{program}="/' $out/* |
sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
- run_progs=$(grep 'RUN+="/' $out/* |
+ run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="/' |
sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
for i in $import_progs $run_progs; do
if [[ ! -x $i ]]; then
--
id' Ash = Ash; id' Dust = Dust; id' _ = undefined
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
