| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | innerMerge: Handle empty definition lists after discharging propertiesorigin/mkMapgitlab.intr/mkMap | Shea Levy | 2014-03-05 | 1 | -13/+22 |
| * | Add mkMap property to the module system•••This allows specifying configuration that should be merged in with some
or all elements of a container option (e.g. listOf, attrsOf) without
needing to know whether those elements are actually defined elsewhere.
For example, this will default the fsType of all filesystems except
/boot to btrfs (and leaves /boot alone):
fileSystems = mkMap (name: mkIf (name != "/boot") {
fsType = mkDefault "btrfs";
});
mkMap takes a function which takes an index of an element and returns a
value to be merged in with the other definitions for that element. For
sets, the index is just the attribute name. For lists, the mkMap
function is passed two arguments: The index of the relevant definition
in the list of all definitions for that option, and the index of the
element within that definition.
| Shea Levy | 2014-03-05 | 2 | -8/+49 |
| * | Reuse merge code to merge inner values of container option types•••In particular, this allows use of properties on individual elements of a
container type. For example, fileSystems."/" = mkMerge [ a b ]; is now
legal. Also, checking the type of the inner value is now handled by the
merge code, reducing duplication.
| Shea Levy | 2014-03-05 | 2 | -29/+34 |
| * | sshfsFuse: update from 2.4 to 2.5 | Peter Simons | 2014-03-05 | 1 | -2/+2 |
| * | cppcheck: update from 1.63 to 1.64 | Peter Simons | 2014-03-05 | 1 | -2/+2 |
| * | swiProlog: update from 6.6.1 to 6.6.2 | Peter Simons | 2014-03-05 | 1 | -2/+2 |
| * | yap: update from 6.2.2 to 6.3.3 | Peter Simons | 2014-03-05 | 1 | -2/+2 |
| * | nixUnstable: Update to 1.7pre3522_f7e077a | Eelco Dolstra | 2014-03-05 | 1 | -3/+3 |
| * | Always load the "configs" kernel module•••We used to have the configuration of the kernel available in a
somewhat convenient place (/run/booted-system/kernel-modules/config)
but that has disappeared. So instead just make /proc/configs.gz
available. It only eats a few kilobytes.
| Eelco Dolstra | 2014-03-05 | 1 | -1/+1 |
| * | Remove obsolete comment | Michael Raskin | 2014-03-05 | 1 | -2/+0 |
| * | filezilla: use default gnutls instead of vulnerable gnutls2 | Vladimír Čunát | 2014-03-05 | 1 | -2/+2 |
| * | Update node packages | Shea Levy | 2014-03-05 | 1 | -423/+2097 |
| * | mercurial: Update to 2.9.1 | Eelco Dolstra | 2014-03-05 | 1 | -2/+2 |
| * | requests2: Add new package | Sander van der Burg | 2014-03-05 | 1 | -0/+15 |
| * | Fresh bitlbee builds with GNU TLS 3 | Michael Raskin | 2014-03-05 | 1 | -1/+1 |
| * | Glib-networking apparently works with GNUTLS3 now | Michael Raskin | 2014-03-05 | 1 | -2/+2 |
| * | Merge pull request #1838 from pSub/calibre-update•••calibre: upgrade from 1.23.0 to 1.25.0 | Domen Kožar | 2014-03-05 | 1 | -2/+2 |
| |\ |
|
| | * | calibre: upgrade from 1.23.0 to 1.25.0 | Pascal Wittmann | 2014-02-26 | 1 | -2/+2 |
| * | | mpd: update from 0.18.8 to 0.18.9 | Evgeny Egorochkin | 2014-03-05 | 1 | -2/+2 |
| * | | youtubeDL: update from 2014.02.28 to 2014.03.04.2 | Evgeny Egorochkin | 2014-03-05 | 1 | -2/+2 |
| * | | nginx: update from 1.4.5 to 1.4.6 | Evgeny Egorochkin | 2014-03-05 | 1 | -2/+2 |
| * | | Merge pull request #1815 from vcunat/p/doc-package-naming•••doc: document current conventions on package naming | Domen Kožar | 2014-03-04 | 1 | -14/+12 |
| |\ \ |
|
| | * | | doc: document current conventions on package naming•••Mostly: encourage using dashes instead of underscores.
| Vladimír Čunát | 2014-02-23 | 1 | -14/+12 |
| * | | | Rename misleadingly named gnutls/default.nix (it's not the default) | Eelco Dolstra | 2014-03-04 | 2 | -1/+1 |
| * | | | gnutls: Update to 3.2.12, 3.1.22•••CVE-2014-0092
Unfortunately, 3.2.12 doesn't pass the tests with Guile bindings
enabled, so I've turned them off in the default build.
| Eelco Dolstra | 2014-03-04 | 4 | -53/+38 |
| * | | | psql: Use less as the default pager•••less is more common and better than more
Fixes #1681
| Shea Levy | 2014-03-04 | 6 | -2/+20 |
| * | | | chromium: Update all channels•••stable: 33.0.1750.117 -> 33.0.1750.146
beta: 33.0.1750.117 -> 34.0.1847.14
dev: 34.0.1847.3 -> 35.0.1862.2
| Ricardo M. Correia | 2014-03-04 | 1 | -9/+9 |
| * | | | Add mysql-simple haskell package | Shea Levy | 2014-03-04 | 2 | -0/+21 |
| * | | | Add mysql haskell package | Shea Levy | 2014-03-04 | 2 | -0/+20 |
| * | | | Add interpolate haskell package | Shea Levy | 2014-03-04 | 2 | -0/+20 |
| * | | | php54: enable fpm support | Shea Levy | 2014-03-04 | 1 | -0/+5 |
| * | | | imlib2: Remove @my_libs@ from config.in. | Moritz Ulrich | 2014-03-04 | 1 | -0/+5 |
| * | | | ldm: Use meta.repositories.git.•••Improves reliability of nixpkgs-monitor.
| Moritz Ulrich | 2014-03-04 | 1 | -6/+8 |
| * | | | vm/windows: Allow to specify a different arch.•••So far, we determined this based on stdenv.is64bit, but there are cases
where you want to run/build a 32bit program on a 64 bit Windows.
This is now possible, by passing windowsImage.arch = "i686" | "x86_64"
to runInWindowsVM. Based an what was passed, the corresponding Cygwin
packages and setup.exe are bootstrapped.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| aszlig | 2014-03-04 | 2 | -10/+11 |
| * | | | grsecurity updates••• - stable: 3.0-3.2.55-201402241936 -> 3.0-3.2.55-201403022154
- testing: 3.0-3.13.5-201402241943 -> 3.0-3.13.5-201403031445
Signed-off-by: Austin Seipp <aseipp@pobox.com>
| Austin Seipp | 2014-03-04 | 1 | -4/+4 |
| * | | | upgrade bbswitch to 0.8 | Corey O'Connor | 2014-03-04 | 1 | -2/+2 |
| * | | | windows/cygwin-setup: Drop meta.platforms attr.•••This prevents cross-builds, so let's drop it for now.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| aszlig | 2014-03-04 | 1 | -1/+0 |
| * | | | vm/windows: Update SHAs for Cygwin setup.ini.•••Another very annoying part. Unfortunately, the only option we might have
here is to include it in nixpkgs or maybe make a fixed Hash on the
result of the closure fetcher.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| aszlig | 2014-03-03 | 1 | -2/+2 |
| * | | | vm/windows: Replace binary with cross cygwinSetup.•••As the official Cygwin setup binary download doesn't come in snapshots
or even versioned, the fetchurl of setup.exe will frequently fail, which
in turn will annoy us as hell (or at least me).
One warning though: The fetchurl is currently broken and the cross-build
might not work yet for example on mingw32 (mingw-w64 branch on its way),
but the upstream URL has already changed and the new version contains a
bug (not yet tracked down) which breaks our Windows bootstrap process.
So to conclude: If it's already broken, make it at least "less broken".
"Not broken" is coming soon with the merge of the mingw-w64 branch.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| aszlig | 2014-03-03 | 1 | -4/+16 |
| * | | | os-specific/windows: Add new package cygwinSetup.•••This is primarily going to be used for vmTools.runInWindowsVM, but in
theory, it could also work with Nix on CygWin which I haven't tested.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| aszlig | 2014-03-03 | 2 | -0/+49 |
| * | | | vm/windows: Remove stray "import <nixpkgs>".•••Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| aszlig | 2014-03-03 | 1 | -1/+1 |
| * | | | vm/windows: Fix typo in runInWindowsVM.•••Coincidentally, even with this typo, most tests work anyway, so I didn't
notice it in the first place.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| aszlig | 2014-03-03 | 1 | -1/+1 |
| * | | | haskell-wizards: add version 1.0.1 | Peter Simons | 2014-03-03 | 2 | -0/+15 |
| * | | | haskell-control-monad-free: add version 0.5.3 | Peter Simons | 2014-03-03 | 2 | -0/+16 |
| * | | | xmobar: drop obsolete patch files | Peter Simons | 2014-03-03 | 1 | -58/+0 |
| * | | | haskell-scientific: jailbreak to fix build with recent versions of tasty | Peter Simons | 2014-03-03 | 1 | -0/+1 |
| * | | | haskell-yesod-bin: update to version 1.2.6.1 | Peter Simons | 2014-03-03 | 1 | -16/+16 |
| * | | | haskell-yesod-auth: update to version 1.2.6 | Peter Simons | 2014-03-03 | 1 | -2/+2 |
| * | | | haskell-x509: update to version 1.4.10 | Peter Simons | 2014-03-03 | 1 | -2/+2 |
| * | | | haskell-utility-ht: update to version 0.0.10 | Peter Simons | 2014-03-03 | 1 | -2/+2 |
