Commit Graph

76237 Commits

Author SHA1 Message Date
Eelco Dolstra
eeb9231009 slim: Sort sessions
This ensures that xfce and most others DMs are preferred over
xterm. Previously slim used directory order, which is undefined.

Of course, it's just lucky that xfce < xterm lexicographically, but
that also applies to the other display managers, AFAIK. We should have
a way to specify a DM order, but that can be accomodated by generating
desktop entries like "<NN>-session.desktop".

Fixes #4300. Parenthetical to #12516.
2016-01-30 10:47:55 +01:00
Daniel Peebles
1a5d3e9c17 Merge pull request #12688 from capicue/nodejs-update
nodejs: fix Darwin build
2016-01-30 00:02:51 -05:00
Stacey Touset
4356d0ccce nodejs: fix Darwin build
- Add no-xcode patch back into node v5. Reverts some of
  5cb1e43fd6
- Fix patch to apply correctly
- Remove pkg-libpath patch from v4
2016-01-29 18:09:46 -08:00
Pascal Wittmann
f272c1cbb6 Merge pull request #12679 from mstarzyk/ranger
ranger: 1.7.1 -> 1.7.2
2016-01-30 00:28:24 +01:00
Matej Cotman
de35ec7008 Merge pull request #12666 from Mayeu/patch-2
torbrowser: 5.0.7 -> 5.5
2016-01-29 23:33:45 +01:00
Pascal Wittmann
4c8aab9140 parallel: 20151222 -> 20160122 2016-01-29 23:02:09 +01:00
Pascal Wittmann
13e13c38cd mcabber: 1.0.0 -> 1.0.1 2016-01-29 22:33:47 +01:00
Peter Simons
0a13e4a2f3 Merge pull request #12674 from phile314/master
uhc: Use Stackage LTS 4.1 to build UHC
2016-01-29 20:43:03 +01:00
Maciek Starzyk
0a8d768b11 ranger: 1.7.1 -> 1.7.2 2016-01-29 20:28:10 +01:00
aszlig
6fec28e043
nixos-manual: Further simplify stripAnyPrefixes
First of all this fixes an evaluation error I introduced in ae466ba,
which wasn't triggered by any of my own tests against the change because
there are usually no NixOS options that are declared outside of the
<nixpkgs> tree. I renamed the attribute name from "fn" to "fileName"
first and later to "fullPath" but forgot one still occuring "filename".

Thanks to @vcunat for noticing this.

Another thing that he pointed out was that the "stripPrefix" function
can be factored away entirely, because it's very similar to
"removePrefix" in <nixpkgs/lib>.

Unfortunately we can't use "removePrefix" as is, because we need to
account for the final shlash.

So instead of removing it twice and/or retaining "stripPrefix", let's
append a shlash on every "prefixesToStrip" and we can use "removePrefix"
as is.

Tested with:

taalo-build nixos/release.nix -A tests.installer.simple.x86_64-linux

And:

w3m -dump "$(
  nix-build nixos/release.nix -A manual.x86_64-linux
)/share/doc/nixos/options.html"

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @vcunat
2016-01-29 20:14:11 +01:00
Philipp Hausmann
22506c7bf3
uhc: Use Stackage LTS 4.1 to build UHC 2016-01-29 19:35:13 +01:00
Rok Garbas
42f1f442e2 dmenu: adding patches to expression
is extended using patches http://tools.suckless.org/dmenu/patches/ this
argument makes it easier to extend dmenu by doing:

    dmenu.overwritte {
      patches = [
        ./dmenu-4.4-follow-focus.diff";
      ];
    };
2016-01-29 18:49:34 +01:00
Joachim Schiele
a3c6df24b9 Merge branch 'master' of github.com:NixOS/nixpkgs 2016-01-29 18:34:41 +01:00
Joachim Schiele
3c67935ec4 kgocode: added automoc4 to buildInputs 2016-01-29 18:33:50 +01:00
Rok Garbas
8c66751672 pythonPackages.py3status: 2.7 -> 2.9 2016-01-29 18:33:19 +01:00
vbgl
e89384aad0 Merge pull request #12669 from mogorman/platformio
platformio: 2.7.1 -> 2.8.1
2016-01-29 17:36:09 +01:00
aszlig
2a12e9dacc
python-packages/poezio: Fix tests
Poezio doesn't install the files required for running the tests, but
also while building with Nix we don't end up getting valid shared
objects within the temporary build directory.

So we now running "make test" (which does "py.test -v test/") with a
PYTHONPATH that adds the /poezio directory of the path in site-packages
to make sure that the test runner is able to import the shared objects.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lancelotsix
2016-01-29 17:29:59 +01:00
Michiel Leenaars
313b88621b synfigstudio: 1.0.1 -> 1.0.2 (close #12308)
vcunat cleaned autoreconf-related stuff and indentation.
2016-01-29 17:20:43 +01:00
aszlig
ae466ba15c
nixos-manual: Simplify stripping prefixes
Let's use a simple (unflipped) fold and break out the actual core
stripPrefix function from stripAnyPrefixes (I personally love
point-less^H^H^H^Hfree style but if I'd be anal I'd even go further and
factor away the "fn:").

Also, let's use path as a better name for "fn" (filename), because
that's what it is and also cannot be confused with "fn" meaning
"function".

We now toString all of the prefixes, so there shouldn't be any need to
implicily toString the extraSources anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-29 16:33:19 +01:00
aszlig
a581f72f22
nixos-manual: Fix stripping declaration prefixes
Regression introduced by e6cd147ae7.

This broke all of the installer tests, because they needed to rebuild
the manual within the test machine, while it only has a closure of the
already pre-built system in place.

The problem here was just that the order of the arguments got mixed up
in stripAnyPrefixes, so it was actually trying to strip the path off the
prefix, not the other way around.

So in the end no prefix was stripped at all, so we ended up having full
store paths in the manual, which in turn caused the build within the VM
to fail, because the prefixes differed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-29 16:33:19 +01:00
Arseniy Seroka
718f316f6e Merge pull request #12667 from mayflower/upstream-android-studio
android-studio: 1.5.0.4 -> 1.5.1.0
2016-01-29 17:43:37 +03:00
Matthew O'Gorman
afb8b091a2
platformio: 2.7.1 -> 2.8.1 2016-01-29 09:43:00 -05:00
Arseniy Seroka
fbd70d7823 Merge pull request #12636 from Beauhurst/kombu_amqp_update
Kombu & amqp version bumps
2016-01-29 17:43:00 +03:00
Sander van der Burg
e2cefce69a titaniumenv: fix path to the IPA file in the hydra-build-products 2016-01-29 14:08:03 +00:00
Moritz Ulrich
4ee173e011 rr: 4.0.0 -> 4.0.3 2016-01-29 12:28:08 +01:00
Robert Scott
0e61e2a35f kombu 3.0.30 -> 3.0.33 2016-01-29 11:23:33 +00:00
Robert Scott
a1566be54c amqp 1.4.7 -> 1.4.9 2016-01-29 11:23:33 +00:00
Christian Albrecht
7884c3b95d android-studio: 1.5.0.4 -> 1.5.1.0 2016-01-29 11:51:29 +01:00
Mayeu (Cast)
41204b1dd1 torbrowser: 5.0.7 -> 5.5
Hash found with nix-prefetch-url
2016-01-29 11:14:44 +01:00
Domen Kožar
c06cdea547 Merge pull request #12664 from gebner/tptp-6.3.0
tptp: 6.1.0 -> 6.3.0, and get rid of builderDefsPackage
2016-01-29 10:59:22 +01:00
Gabriel Ebner
73468cf4d4 tptp: replace use of builderDefsPackage 2016-01-29 10:33:35 +01:00
Vincent Laporte
4f8f5732fc smtube: 15.11.0 -> 16.1.0 2016-01-29 10:08:29 +01:00
Vincent Laporte
ef8f074604 smplayer: 15.11.0 -> 16.1.0 2016-01-29 10:08:29 +01:00
Gabriel Ebner
462958b3b7 tptp: 6.1.0 -> 6.3.0 2016-01-29 09:37:11 +01:00
Robin Gloster
edad608f56 libressl_2_3: 2.3.1 -> 2.3.2 2016-01-29 03:42:14 +00:00
Robin Gloster
46c31fa675 libressl: 2.2.5 -> 2.2.6 2016-01-29 03:42:14 +00:00
Dan Peebles
5da15c6b76 botocore/awscli: upgrade to 1.3.23/1.10.1
I'm upgrading both at once because they need to be upgraded in tandem
2016-01-28 21:26:32 -05:00
Eelco Dolstra
bfebc7342e Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt 2016-01-29 02:32:05 +01:00
Arseniy Seroka
7d2eb0c4ab Merge pull request #12657 from romildo/new-eclipse-plugin-cup
eclipse-plugin-cup: init at 1.0.0.201412081321
2016-01-29 00:51:50 +03:00
Vladimír Čunát
a92c2cb994 openssl_1_0_2: high-severity security update e -> f
Fixes CVE-2016-0701 and CVE-2015-3197.
2016-01-28 20:35:00 +01:00
José Romildo Malaquias
a654e783c6 eclipse-plugin-cup: init at 1.0.0.201412081321 2016-01-28 17:21:29 -02:00
Charles Strahan
5583ecf361 mongodb: 3.0.7 -> 3.2.1
Fixes #12639
2016-01-28 14:15:59 -05:00
Thomas Tuegel
9e743fd151 qt54.qtbase: fix path typo in resolv patch 2016-01-28 11:15:58 -06:00
Thomas Tuegel
9695e139ec qt55.qtbase: fix path typo in resolv patch 2016-01-28 11:15:14 -06:00
Charles Strahan
7b8cd1dce9 watchman: 4.1.0 -> 4.3.0
* improved handling of case insensitive filenames
* improved reliability of symlink change detection on osx
2016-01-28 11:58:33 -05:00
Robin Gloster
a83920c32d Merge pull request #12652 from mayflower/upstream-vagrant
vagrant: 1.8.0 -> 1.8.1
2016-01-28 17:24:31 +01:00
Sander van der Burg
a1cd11aff4 titaniumenv: remove obsolete android configuration steps 2016-01-28 16:19:18 +00:00
Arseniy Seroka
6dcfd1a849 Merge pull request #12654 from mayflower/upstream-nodejs5
nodejs-5_x: 5.4.1 -> 5.5.0
2016-01-28 19:12:07 +03:00
Michael Alan Dorman
a9b0bfe3bb ghc-imported-from: builds again 2016-01-28 16:47:22 +01:00
Peter Simons
81c8babb38 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: 34e1e2890f
  - Hackage: 152c587fd1
  - LTS Haskell: 9b9c0dc0e3
  - Stackage Nightly: 486fdffc71
2016-01-28 16:45:46 +01:00