1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 02:24:27 +00:00
Commit graph

61065 commits

Author SHA1 Message Date
Charles Strahan 5bc00cce22 make libtidy an alias for html-tidy
I accidentally introduced the libtidy attr in 7e4ca1cc7
2015-04-13 16:54:51 -04:00
Jascha Geerds 57c1e7f23f Merge pull request #6770 from kirelagin/cups-browsed-avahi
cups-browsed: build with Avahi
2015-04-13 22:54:19 +02:00
Kirill Elagin 29f431e2a4 cups-browsed: build with Avahi
Fixes 5409.
2015-04-13 23:21:44 +03:00
Kirill Elagin 82eed03bfa cups-filters: fix build on non-NixOS 2015-04-13 23:20:30 +03:00
Arseniy Seroka bf365c0da2 Merge pull request #7365 from k0ral/synergy
synergy: 1.6.2 -> 1.6.3
2015-04-13 22:08:07 +03:00
koral cf2433f749 synergy: 1.6.2 -> 1.6.3 2015-04-13 18:13:11 +00:00
Arseniy Seroka d829b2a3b0 Merge pull request #7359 from 1126/bump-pamixer
pamixer: update to 1.2.1
2015-04-13 20:15:51 +03:00
lethalman 5ce00faf1f Merge pull request #7362 from k0ral/abcde
abcde: 2.5.4 -> 2.6
2015-04-13 18:46:00 +02:00
koral 6709a38602 abcde: 2.5.4 -> 2.6 2015-04-13 16:04:24 +00:00
Eelco Dolstra 574173f0e6 Merge pull request #7027 from ecraven/apache-sslchain
apache-httpd: adding support for sslServerChain
2015-04-13 16:48:20 +02:00
Peter Feigl 3837ef82ad fixing documentation 2015-04-13 15:42:01 +02:00
Peter Feigl e5b3918f85 apache-httpd: adding support for sslServerChain 2015-04-13 15:41:10 +02:00
Eelco Dolstra 5501f5568b Merge pull request #6962 from ecraven/moodle-master
apache-httpd: adding subservice moodle
2015-04-13 15:01:04 +02:00
Jascha Geerds 04239d4af2 pycharm: Update to 4.0.6 2015-04-13 14:24:56 +02:00
Peter Simons 3e176fb2e3 Merge pull request #7358 from Fuuzetsu/dyre-nix_ghc
haskell-ng: patch dyre to check NIX_GHC
2015-04-13 13:51:58 +02:00
Peter Feigl 69b18fc4b6 fixing indentation 2015-04-13 13:46:42 +02:00
lethalman 4661e12bf7 Merge pull request #7283 from fooblahblah/dbvis
Package for dbvisualizer 9.2.5
2015-04-13 13:35:47 +02:00
_1126 b1d1397c5c pamixer: update to 1.2.1
This commit also switches from fetchgit to fetchurl.
2015-04-13 13:28:29 +02:00
Peter Feigl 44ea83b986 changed config to only include the minimum necessary 2015-04-13 13:10:04 +02:00
Peter Feigl 49eb77b26c apache-httpd: adding subservice moodle 2015-04-13 13:06:39 +02:00
aszlig df31a338dc
nixos-rebuild: Conditionally update channels.
This partially reverts commit 3a4fd0bfc6.

Addresses another concern by @edolstra that users might not want to
update *all* channels. We're now reverting to the old behaviour but
after updating the "nixos" channel, we just check whether the channel
ships with a file called ".update-on-nixos-rebuild" and if it exists, we
update that channel as well.

Other channels than these are not touched anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-13 12:54:19 +02:00
Eelco Dolstra 4466707ddf switch-to-configuration: Better error checking 2015-04-13 12:28:12 +02:00
aszlig 5075cbe696
nixos: Put root's channels to the end of NIX_PATH.
My original reason to put it at the beginning of NIX_PATH was to allow
shipping a particular version <nixpkgs> with a channel. But in order to
do that, we can still let the channel expression ship with a custom
version of nixpkgs by something like <channel/nixpkgs> and the builder
of the channel could also rewrite self-references.

So the inconvenience is now shifted towards the maintainer of the
channel rather than the user (which isn't nice, but better err on the
side of the developer rather than on the user), because as @edolstra
pointed out: Having the channels of root at the beginning of NIX_PATH
could have unintended side-effects if there a channel called nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-13 12:20:58 +02:00
Mateusz Kowalczyk 8f48e49d71 haskell-ng: patch dyre to check NIX_GHC
xmonad is patched in similar manner already
2015-04-13 11:08:15 +01:00
Pascal Wittmann 6fba1d8628 Merge pull request #7348 from dezgeg/bastet
bastet: new package
2015-04-13 11:49:45 +02:00
Pascal Wittmann 367b4e48a7 Merge pull request #7346 from k0ral/glances
glances: 2.1 -> 2.3
2015-04-13 11:45:19 +02:00
Pascal Wittmann 2162279b92 Merge pull request #7356 from AndersonTorres/atari800
Atari800: 2.2.1 -> 3.1.0
2015-04-13 11:44:52 +02:00
Jascha Geerds 03b87e7243 Merge pull request #7351 from Forkk/fix/cask-init
cask: fix issue with 'cask init' command
2015-04-13 11:31:36 +02:00
AndersonTorres eae83dc472 Atari800: 2.2.1 -> 3.1.0 2015-04-13 05:35:43 -03:00
Joachim Schiele 4bf8c805b1 Merge pull request #6877 from qknight/eclipse_scala
eclipse-scala: added Scala IDE
2015-04-13 10:29:07 +02:00
Joachim Schiele 85c454ab1d Merge pull request #6785 from qknight/wordpress
zef hemel's wordpress.nix adapted to extraSubservices
2015-04-13 10:27:55 +02:00
Arseniy Seroka 04f52e8cbe Merge pull request #7342 from C0DEHERO/fix/xonotic-update
Fix/xonotic update
2015-04-13 09:54:56 +03:00
Dmitry Belyaev 2a10294b74 Update rustcMaster 2015-04-13 15:55:39 +10:00
Dmitry Belyaev 871d11c176 Update cargoSnapshot to rustc-1.0.0-beta release 2015-04-13 15:55:39 +10:00
Dmitry Belyaev 7a51920367 Provide rustc-1.0.0-beta as the default for rustc
The patch injects full paths to utilities rather then expects to find then in the environment.
Also remove alphas.
2015-04-13 15:50:24 +10:00
William A. Kennington III c9cb532c8f rsyslog: 8.8.0 -> 8.9.0 2015-04-12 20:39:07 -07:00
William A. Kennington III 6044bfe3af feh: 2.12 -> 2.12.1 2015-04-12 20:34:20 -07:00
William A. Kennington III 6fa8239669 libevdev: 1.3.1 -> 1.4.1 2015-04-12 20:33:00 -07:00
Domen Kožar c6512f7df3 buildPythonPackage: propagate setuptools 2015-04-12 21:15:36 -04:00
Shea Levy 114ffa0d6c Oops, forgot to update the hash 2015-04-12 19:23:35 -04:00
Shea Levy e01c96d14c Add linux 4.0
Untested yet, my build machine is too slow
2015-04-12 19:17:53 -04:00
C0DEHERO fbf5798e82 xonotic: update 0.7.0 -> 0.8.0 2015-04-12 19:09:48 -04:00
Forkk d385fd9111 cask: fix issue with 'cask init' command
Fix an issue where 'cask init' would fail due to missing template files.
2015-04-13 00:36:49 +02:00
aszlig 3a4fd0bfc6
nixos-rebuild: Update all channels of user root.
Should make it even easier to use custom channels, because whenever the
user does a "nixos-rebuild --upgrade", it will also upgrade possibly
used ("used" as in referenced in configuration.nix) channels besides
"nixos". And if you also ship a channel tied to a particular version of
nixpkgs or even remove the "nixos" channels, you won't run into
unexpected situations where the system is not updating your custom
channels.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-13 00:09:00 +02:00
aszlig 65e569cc37
nixos: Add all of root's channels to NIX_PATH.
This is very useful if you want to distribute channels (and thus
expressions as well) in a similar fashion to Debians APT sources (or
PPAs or whatnot).

So, for example if you have a channel with some additional functions
or packages, you simply add that channel with:

sudo nix-channel --add https://example.com/my-nifty-channel foo

And you can access that channel using <foo>, for example in your
configuration.nix:

{
  imports = [ <foo/modules/shiny-little-module> ];
  environment.systemPackages = with import <foo/pkgs> {}; [ bar blah ];
  services.udev.extraRules = import <foo/lib/udev/mkrule.nix> {
    kernel = "eth*";
    attr.address = "00:1D:60:B9:6D:4F";
    name = "my_fast_network_card";
  };
}

Within nixpkgs, we shouldn't have <nixos> used anywhere anymore, so we
shouldn't get into conflicts.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-12 23:50:20 +02:00
Daniel Ehlers 057f01b11e services.x11: Add option for additional InputClass sections.
Implement support for additional InputClass sections, e.g. for non
keyboard input devices.
2015-04-12 23:49:48 +02:00
koral 94af1ba4d7 glances: 2.1 -> 2.3 2015-04-12 20:59:04 +00:00
Thomas Tuegel cebf589462 Merge pull request #7294 from ttuegel/emacs
emacs: allow choosing gtk2 or gtk3
2015-04-12 15:12:12 -05:00
Austin Seipp a4e63baf35 nixpkgs: arcanist 20150318 -> 20150412
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 12:16:30 -05:00
Shea Levy 526bf50e2e data-clist: Bump to 0.0.7.4
Refs sw17ch/data-clist#8

Not a full hackage update due to NixOS/cabal2nix#160
2015-04-12 12:45:30 -04:00