Commit graph

66859 commits

Author SHA1 Message Date
ts468
25eed6bc89 Merge pull request #9131 from ts468/upstream.vpnc
vpnc: revert to default local port 500
2015-08-05 21:58:16 +02:00
Thomas Strobel
4661158164 vpnc: revert default local port to 500 2015-08-05 21:55:02 +02:00
Peter Simons
2d26a0f8aa Update haskellPackages set to GHC 7.10.2. 2015-08-05 21:36:20 +02:00
Peter Simons
099c1a4522 haskell-tar: use older version for builds with GHC < 7.6.x. 2015-08-05 21:36:20 +02:00
Peter Simons
94e1660d00 haskell-mockery: run test suite with "TRAVIS=true" set to avoid timing issues 2015-08-05 21:36:20 +02:00
Peter Simons
552fcd0b75 haskell-hsqml-datamodel-vinyl is broken because of singletons. 2015-08-05 21:36:20 +02:00
Peter Simons
ab77228749 haskell-generic-builder: improve recognition of pkgconfig dependencies 2015-08-05 21:36:20 +02:00
Peter Simons
e4d493fc54 jailbreak-cabal: link statically to avoid runtime dependency on ghc 2015-08-05 21:36:19 +02:00
Peter Simons
b03ce5d57a haskell-binary: update to version 0.7.6.1 2015-08-05 21:36:19 +02:00
Michael Alan Dorman
297ca5ff21 Update ghcjs. 2015-08-05 21:36:19 +02:00
Michael Alan Dorman
700d365d16 Update ghcjs-shims 2015-08-05 21:36:19 +02:00
Michael Alan Dorman
e0826531e1 Update ghcjs-boot 2015-08-05 21:36:19 +02:00
Peter Simons
66d8f03aa4 hackage-packages.nix: update to 88d2b472d2 with hackage2nix revision 012eb638a5db2ba7cf2c94e4375ea5cc05aefde0 2015-08-05 21:36:19 +02:00
ts468
e190a70b04 Merge pull request #9128 from ts468/upstream.vpnc
vpnc: 0.5.3 -> svn-rev-550
2015-08-05 21:30:05 +02:00
Thomas Strobel
531e93eaf4 vpnc: 0.5.3 -> svn-rev-550
also, change default local port from 500 to random to avoid
clashes with other IPSec services like, e.g., strongSwan
2015-08-05 21:16:35 +02:00
Peter Simons
ebe412e8f7 ghc: update 7.10.2 to release version 2015-08-05 21:15:46 +02:00
Maciek Starzyk
fd08657281 obnam: 1.12 -> 1.13 2015-08-05 19:33:01 +02:00
Eelco Dolstra
2cd7c1f198 Unify NixOS and Nixpkgs channel structure
This is primarily to ensure that

  -I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz

and

  -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz

and

  -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz

behave consistently.

It also allows installing packages via "nix-env -iA nixos.<pkg>"
rather than "nixos.pkgs.<pkg>". It would be even better to allow
"nixpkgs.<pkg>", but that requires a change to nix-channel.

Fixes #7659.
2015-08-05 17:37:11 +02:00
Eelco Dolstra
91e71725d4 Remove some obsolete references to <nixos> 2015-08-05 17:37:08 +02:00
Eelco Dolstra
7f9b8866bf Nixpkgs channel: Remove channel-name
This file no longer does anything.
2015-08-05 17:37:05 +02:00
Tobias Geerinckx-Rice
271392a3d1 python-packages: pgcli 0.19.0 -> 0.19.1
Bugfix for issue #317 ('traceback in completion on "selt *"').
2015-08-05 17:20:11 +02:00
Pascal Wittmann
d7a6e25355 Merge pull request #8683 from aflatter/phantomjs2
Add phantomjs2
2015-08-05 15:08:30 +02:00
Pascal Wittmann
5fc44305ad Merge pull request #9074 from michaeladler/couchbase
libcouchbase: use cmake instead of automake
2015-08-05 15:05:32 +02:00
Michael Adler
3768bdf227 libcouchbase: 2.4.4 -> 2.5.2, refactor to use cmake
Building libcouchbase with automake is deprecated, thus use
cmake instead. This has the advantage that the package-config
file is installed as well.
2015-08-05 15:03:22 +02:00
Pascal Wittmann
bb04c579c3 fswatch: update from 1.4.7 to 1.5.0 2015-08-05 14:44:41 +02:00
Pascal Wittmann
454dc664a6 checkstyle: update from 6.8.1 to 6.8.2 2015-08-05 14:44:41 +02:00
Pascal Wittmann
6bacb60ca9 screenfetch: add grep to PATH, closes #9088 2015-08-05 14:44:41 +02:00
Peter Simons
7053602206 nixops: update unstable version to latest git HEAD 2015-08-05 14:37:46 +02:00
Pascal Wittmann
3dbdac801c org-mode: update from 8.2.10 to 8.3 2015-08-05 14:35:35 +02:00
Eelco Dolstra
cbecbd01f9 Module system: Fix ‘definitions’ field
Fixes https://github.com/NixOS/nixops/issues/325.
2015-08-05 14:35:00 +02:00
Eelco Dolstra
bb38d9974b Update fallback Nix store paths 2015-08-05 14:34:57 +02:00
Eelco Dolstra
fc7e7f9032 Remove broken/unused test 2015-08-05 14:34:54 +02:00
Eelco Dolstra
b3d8d750de Remove /etc/nixos/nixpkgs from $NIX_PATH
NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
2015-08-05 14:34:33 +02:00
Eelco Dolstra
699ba71b50 nixos-install: Source the profile when running inside the chroot 2015-08-05 14:33:18 +02:00
Eelco Dolstra
3f1354a3cd Add an option ‘nix.nixPath’ for specifying $NIX_PATH 2015-08-05 14:33:15 +02:00
Eelco Dolstra
525c901ce9 Make svn2git visible to nix-env 2015-08-05 14:33:12 +02:00
Eelco Dolstra
9657be0b95 svn2git-kde: Mark as broken
The source repository no longer exists.
2015-08-05 14:33:03 +02:00
Marco Maggesi
ba3a4a892e Update fossil to version 1.33 2015-08-05 14:09:33 +02:00
Arseniy Seroka
be93928280 Merge pull request #9118 from ragnard/boot-bump-version
boot: Update to 2.2.0
2015-08-05 13:57:15 +03:00
Ragnar Dahlén
25bad2be17 boot: 2.0.0 -> 2.2.0 2015-08-05 11:54:40 +01:00
Eelco Dolstra
5f923f79b7 Merge pull request #9122 from anderspapitto/master
dnsmasq restarts if /etc/hosts file is changed by nixos-rebuild
2015-08-05 12:44:40 +02:00
Anders Papitto
4f7819b89c dnsmasq restarts if /etc/hosts file is changed by nixos-rebuild 2015-08-05 03:36:19 -07:00
ts468
661e1016b1 Merge pull request #9120 from ts468/upstream.strongswan
strongswan: fix resolvconf plugin
2015-08-05 12:23:33 +02:00
Tobias Geerinckx-Rice
588412857f geolite-legacy: 2015-08-03 -> 2015-08-05 2015-08-05 12:17:12 +02:00
Thomas Strobel
9011f117f2 strongswan: fix resolvconf plugin 2015-08-05 12:12:59 +02:00
Arseniy Seroka
c81bda6d3c Merge pull request #9119 from Havvy/iojs
iojs: 2.5.0 -> 3.0.0
2015-08-05 12:32:48 +03:00
Cillian de Róiste
f63fd63eb1 yaws: update from 1.99 to 2.0 2015-08-05 10:29:47 +02:00
Cillian de Róiste
4c85902d70 samplv1: update from 0.6.3 to 0.7.0 2015-08-05 10:29:23 +02:00
Cillian de Róiste
642a7ca1d7 guitarix: update from 0.32.3 to 0.33.0 2015-08-05 10:29:00 +02:00
Cillian de Róiste
5a7f1251fe drumkv1: update from 0.6.3 to 0.7.0 2015-08-05 10:28:43 +02:00