1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-22 22:49:47 -04:00
Commit graph

60853 commits

Author SHA1 Message Date
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
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
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
Austin Seipp 2c4a005549 nixpkgs: openresty 1.7.7.1 -> 1.7.10.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 11:35:37 -05:00
Pascal Wittmann c4b685aa81 calibre: update from 2.23.0 to 2.24.0 2015-04-12 18:14:20 +02:00
Austin Seipp a7118b5e6a nixpkgs: python34Packages.rainbowstream 1.1.6 -> 1.2.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 10:28:36 -05:00
Austin Seipp c14689c328 nixpkgs: python34Packages.arrow 0.4.4 -> 0.5.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 10:28:36 -05:00
Austin Seipp 0093d7a9ea nixpkgs: pythonPackages.obfsproxy 0.2.12 -> 0.2.13
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 10:28:36 -05:00
Bjørn Forsman 48b5ad912f python-pelican: add missing 'markupsafe' dependency
Needed to be able to run 'make serve' in a pelican directory, else this
happens:

  $ make serve
  cd /home/bfo/pelican-test/output && python -m pelican.server
  /run/current-system/sw/bin/python: No module named markupsafe
  make: *** [serve] Error 1
2015-04-12 17:18:13 +02:00
Bjørn Forsman 6e0d0636a1 mutt: use "sendmail" instead of "/usr/bin/sendmail"
That way sending mail with mutt works on NixOS too, without having to
manually change mutt's config on your system. sendmail will be found in
$PATH at runtime, and thus the setuid wrapper will be used, if
available.
2015-04-12 10:48:30 +02:00
Austin Seipp 11ff78da80 nixpkgs: update oraclejdk8 sha256s
Apparently, these changed.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 01:15:52 -05:00
William A. Kennington III 3adb47d7d3 mariadb: Remove superfluous files 2015-04-11 22:32:43 -07:00
aszlig 54f58ee991
python-mccabe: Fix build due to missing tests.
Regression introduced by 56a6f22d7f.

I'm temporarily pulling in test_mccabe.py, as suggested by someone at
flintwork/mccabe#31, which for now should fix the build (and the tests
of course as well).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-12 06:50:34 +02:00
Austin Seipp 7200556e5d nixpkgs: afl - fix llvm-mode
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-11 22:00:54 -05:00
Austin Seipp 047e77274c nixpkgs: afl 1.63b -> 1.64b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-11 20:22:43 -05:00
Arseniy Seroka 0d3be79490 Merge pull request #7323 from AndersonTorres/gxemul
Gxemul: 0.4.6 -> 0.6.0.1
2015-04-12 04:22:16 +03:00
Thomas Tuegel 9d12729580 Merge pull request #7328 from bb010g/patch-1
Fix firefoxWrapper's icon
2015-04-11 17:57:41 -05:00
Brayden 1ac6acff90 Fix firefoxWrapper's icon 2015-04-11 15:34:36 -07:00
Shea Levy 95c8a358f5 diagrams-rasterific: jailbreak 2015-04-11 18:26:29 -04:00
Shea Levy 1cbf0b7d27 diagrams-lib: build on ghc-7.10 2015-04-11 18:22:50 -04:00
Shea Levy ed892e222b ekg: jailbreak 2015-04-11 17:46:37 -04:00
Shea Levy 5b1692531e diagrams-core: Enable building on ghc 7.10 2015-04-11 17:40:04 -04:00
Shea Levy aa65eacedc statestack: Patch in ghc 7.10 support 2015-04-11 17:26:32 -04:00
Shea Levy 6d6bd65b62 monoid-extras: Build on 7.10 2015-04-11 17:20:20 -04:00
aszlig 50c4c20678
tomahawk: Update to new upstream version 0.8.3.
Upstream changes since 0.8.2:

  * Performance improvements for collection browsing.
  * Improved memory footprint.
  * Show cloud collections above your friends in the sidebar.
  * Keep looking for alternative sources even when we found a perfect match.
  * Fixed crash in network code.
  * Fixed repeat one/all icons.
  * Be more lenient about accepting JSPF and M3U playlists.
  * Improved support for compilation albums.
  * (Windows) Fixed support for Windows XP.
  * (OS X) Fixed settings dialog appearance on Yosemite.
  * (OS X) Fixed SSL errors on Yosemite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-11 23:15:31 +02:00
Arseniy Seroka e06d810452 Merge pull request #7322 from ftrvxmtrx/chuck-1.3.5.0
chuck: 1.3.4.0 -> 1.3.5.0
2015-04-12 00:12:58 +03:00
Shea Levy da2d0519d7 haskell-linear: Patch out Werror 2015-04-11 17:01:10 -04:00
Shea Levy 06089c3505 ekg-core: Jailbreak for ghc-prim 2015-04-11 16:34:09 -04:00
Shea Levy 4316ecdd81 haskell-ng.data-clist: jailbreak 2015-04-11 16:30:50 -04:00
Austin Seipp 600b7e5945 nixpkgs: afl 1.58b -> 1.63b
- Adds new LLVM-based instrumentation support via afl-clang-fast.
  - Experimental support for cgroup management via afl-cgroup, to
    mitigate OOM issues when using afl with address sanitizer.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-11 15:26:31 -05:00
Austin Seipp 627da7cb22 nixpkgs: libcgroup adopt, bump 0.38 -> 0.41
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-11 15:22:52 -05:00
Arseniy Seroka 06a24b12b2 Merge pull request #7321 from AndersonTorres/alsaUtils
AlsaUtils: 1.0.28 -> 1.0.29
2015-04-11 23:02:40 +03:00
Shea Levy 0521b74009 safecopy: Disable tests on ghc 7.10
Refs acid-state/safecopy#25 acid-state/safecopy#26
2015-04-11 15:23:53 -04:00
AndersonTorres 9ebba5fe0c Gxemul: 0.4.6 -> 0.6.0.1 2015-04-11 16:00:55 -03:00
Shea Levy afa985d4e7 arithmoi: Fix for ghc 7.10 2015-04-11 14:40:39 -04:00
Siarhei Zirukin fee413074d chuck: 1.3.4.0 -> 1.3.5.0 2015-04-11 20:27:41 +02:00
Shea Levy fe4d221a30 ffmpeg-light: libavutil is part of ffmpeg.
Refs NixOS/cabal2nix#159
2015-04-11 14:24:02 -04:00
AndersonTorres 27e46441fa AlsaUtils: 1.0.28 -> 1.0.29 2015-04-11 15:10:35 -03:00
Rok Garbas 56a6f22d7f pythonPackages: updates for many packages
* deform -> 2.0a2
* peppercorn -> 0.5
* pyramid -> 1.5.2
* pyramid_tm -> 0.10
* zope_deprecation -> 4.1.2
* venusian -> 1.0
* flake8 -> 2.3.0
* mccabe -> 0.3
* pg8000 -> 1.10.1
* turses -> 0.2.23
* urwid -> 1.3.0
* waitress -> 0.8.9
* translationstring -> 1.3
2015-04-11 17:00:07 +02:00
Domen Kožar ee69867e98 Merge pull request #7320 from nslqqq/i3update
i3: fix testsuite
2015-04-11 10:18:27 -04:00
Nikita Mikhailov 5f2c1f7397 i3: fix testsuite 2015-04-11 14:10:39 +00:00
Rok Garbas e393a8b355 varnish: update to 4.0.3 2015-04-11 15:57:28 +02:00
Rok Garbas bdcdc183a4 i3status: update to 2.9 2015-04-11 15:49:56 +02:00
Bjørn Forsman c1556f70d7 hping: set platforms = all
From http://www.hping.org/:

  "Hping works on the following unix-like systems: Linux, FreeBSD,
   NetBSD, OpenBSD, Solaris, MacOs X, Windows."
2015-04-11 15:25:11 +02:00
Arseniy Seroka 8d1f12c197 Merge pull request #7318 from 1126/bump-tor-browser
tor-browser: bump to 4.0.8
2015-04-11 16:10:17 +03:00
Arseniy Seroka 7c47ebeeed Merge pull request #7317 from k0ral/sslh
sslh: 1.16 -> 1.17
2015-04-11 16:09:54 +03:00
Bjørn Forsman 965129cdac lftp: update 4.6.0 -> 4.6.1
2014-12-29: lftp-4.6.1 released. Some bugs fixed, minor feature added.
2015-04-11 15:06:13 +02:00