about summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge pull request #2283 from wizeman/u/sysctl-mergeMichael Raskin2014-06-30
|\ | | | | nixos: Fix sysctl option merging
| * nixos: Fix sysctl option mergingRicardo M. Correia2014-04-15
| | | | | | | | | | | | | | | | | | | | | | | | Using pkgs.lib.mkOverride in a sysctl option would throw a bogus error. Also, if you defined a sysctl multiple times in the same configuration, only one of the values would be picked up, while the others were silently discarded. This patch should fix both issues. If you define a sysctl multiple times at your highest defined priority level, you will get a proper error with detailed location information.
* | Merge pull request #2213 from thoughtpolice/kernel-configMichael Raskin2014-06-30
|\ \ | | | | | | nixos: make several kernel common-config options optional
| * | nixos: make several kernel common-config options optionalAustin Seipp2014-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Realistically, common-config is useful, but there are a lot of things in there that are non-optionally specified that aren't always useful. For example, when deploying grsecurity, I don't want the bluetooth, wireless, or input joystick/extra filesystem stack (XFS, etc), nor the staging drivers tree. The problem is that if you specify this in your own kernel config in the grsecurity module, by saying 'BT n' to turn off bluetooth, common-config turns on 'BT_HCIUART_BCSP y', which then becomes unused and errors out. This is really just an arbitrary picking at the moment, but it should be OK. Signed-off-by: Austin Seipp <aseipp@pobox.com>
* | | haskellPackages.compdata: Require GHC >= 7.8Oliver Charles2014-06-30
| | |
* | | Adding a minimal script set to serve store as a dynamical binary cacheMichael Raskin2014-06-30
| | |
* | | Fix tarball by adding the missing maintainer entry; email copied from ↵Michael Raskin2014-06-29
| | | | | | | | | | | | commit metadata
* | | ceph: default atomicops dependency to nullJohn Wiegley2014-06-28
| | | | | | | | | | | | | | | I have no such dependency on my system, so this prevent nix-env from working.
* | | Document paths-from-graph.pl somewhat.Alexander Kjeldaas2014-06-28
| | |
* | | Added the ceph filesystem.Alexander Kjeldaas2014-06-28
| | |
* | | Added lib output to xfsprogs.Alexander Kjeldaas2014-06-28
| | | | | | | | | | | | | | | This only contains static archives since xfsprogs is compiled with dynamic libraries disabled.
* | | Merge pull request #3077 from vbgl/cppoAustin Seipp2014-06-28
|\ \ \ | | | | | | | | Adds cppo
| * | | Adds cppoVincent Laporte2014-06-25
| | | |
* | | | Merge pull request #3109 from nslqqq/masterAustin Seipp2014-06-28
|\ \ \ \ | | | | | | | | | | OpenSpades: Initial 0.0.12
| * | | | openspades: Initial 0.0.12Nikita Mikhailov2014-06-28
| | | | |
* | | | | Merge pull request #3110 from bennofs/update-cabal-boundsAustin Seipp2014-06-28
|\ \ \ \ \ | | | | | | | | | | | | haskell-cabal-bounds: update Cabal version
| * | | | | haskell-cabal-bounds: GHC 7.8 has only Cabal 1.18Benno Fünfstück2014-06-28
| | | | | |
| * | | | | haskell-cabal-bounds: update Cabal versionBenno Fünfstück2014-06-28
| | | | | |
* | | | | | Merge pull request #3116 from bennofs/cabal-hackage-mirrorAustin Seipp2014-06-28
|\ \ \ \ \ \ | | | | | | | | | | | | | | cabal-builder: Use hackage mirror
| * | | | | | cabal-builder: Use hackage mirrorBenno Fünfstück2014-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It's now possible to use the mirror system for the cabal builder.
* | | | | | | Merge pull request #3117 from bennofs/haskell-deepseq-genericsAustin Seipp2014-06-28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | haskell-deepseq-generics: new expression
| * | | | | | | haskell-deepseq-generics: new expressionBenno Fünfstück2014-06-28
| |/ / / / / /
* | | | | | | Merge pull request #3121 from deepfire/haskell-sha2Austin Seipp2014-06-28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SHA2: new expression
| * | | | | | | SHA2: new expressionKosyrev Serge2014-06-29
| | | | | | | |
* | | | | | | | Merge pull request #3123 from jagajaga/add_haskell_pkgsAustin Seipp2014-06-28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | haskell-command-qq: add pkg
| * | | | | | | | haskel-command-qq: add pkgArseniy Seroka2014-06-29
| | | | | | | | |
* | | | | | | | | Merge pull request #3038 from bennofs/fetch-rev-attrJohn Wiegley2014-06-28
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | fetchbzr, fetchdarcs, fetchhg: use `rev` attr
| * | | | | | | | fetchbzr, fetchdarcs, fetchhg: use `rev` attrBenno Fünfstück2014-06-28
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it match the behaviour of fetchgit and fetchsvn, so it's easier to write scripts that support all of them.
* | | | | | | | KDE Connect 0.5.2 -> 0.7Cillian de Róiste2014-06-28
| | | | | | | |
* | | | | | | | structured-haskell-mode: 1.0.2 > 1.0.3John Wiegley2014-06-28
|/ / / / / / /
* | | | | | | name nixos tests, close #3078Florian Friesdorf2014-06-28
| | | | | | |
* | | | | | | support for nixos test namesFlorian Friesdorf2014-06-28
| | | | | | |
* | | | | | | git-remote-add: new package addedRok Garbas2014-06-28
| | | | | | |
* | | | | | | Add nix-plugins packageShea Levy2014-06-27
| | | | | | |
* | | | | | | nix: propagate boehmgcShea Levy2014-06-27
|/ / / / / /
* | | | | | gperftools: Support DarwinEelco Dolstra2014-06-27
| | | | | |
* | | | | | twelf: Fix the source URLJohn Wiegley2014-06-27
| | | | | |
* | | | | | Adding libodfgen: a library for writing ODFMichael Raskin2014-06-27
| | | | | |
* | | | | | Adding libmwaw: a library to import some old Macintosh text document formatsMichael Raskin2014-06-27
| | | | | |
* | | | | | Adding libe-book: a library for importing reflowable e-book formatsMichael Raskin2014-06-27
| | | | | |
* | | | | | Adding librevenge: a library for creating file importersMichael Raskin2014-06-27
| | | | | |
* | | | | | Adding libatomic_opsMichael Raskin2014-06-27
| | | | | |
* | | | | | Allow selection of named SF dirsMichael Raskin2014-06-27
| | | | | |
* | | | | | Merge pull request #3052 with some additional changesLuca Bruno2014-06-27
|\ \ \ \ \ \
| * | | | | | transcode: new packageJos van den Oever2014-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suite of command line utilities for transcoding video and audio codecs, and for converting beween different container formats. http://www.transcoding.org/
* | | | | | | Fix network-manager-applet startup issue 'GLib-GIO-Message: Using the ↵Moritz Maxeiner2014-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'memory' GSettings backend. Your settings will not be saved or shared with other applications.' (cherry picked from commit 51dc1ddb7c6e974e36c1a2d8701fbc7c254cbc72) Conflicts: pkgs/tools/networking/network-manager-applet/default.nix
* | | | | | | licenses: add attribute "free" to fix eval of smlnjBootstrapVladimír Čunát2014-06-27
| | | | | | |
* | | | | | | nixos/log2html: Remove schema from jQuery URLs.aszlig2014-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows viewing test logs for example when using a Hydra running with HTTPS. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | | Revert "nixos/sshd: drop mode from auth keys file".aszlig2014-06-27
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a3331eb87b25d954766af9652e1415a783dae76c. See https://github.com/NixOS/nixpkgs/issues/2559#issuecomment-47313334 for a description why this is not a good idea. I guess it's better to implement a sane way to remove all files in authorized_keys.d, especially because it is also backwards-compatible. Reopens #2559. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | nixos/tests/openssh: Test configured auth keys.aszlig2014-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far the test only uses an authorized key that is copied over to the target machine instead of being set by the target's configuration. Now, we cover both cases. Signed-off-by: aszlig <aszlig@redmoonstudios.org>