Commit graph

88145 commits

Author SHA1 Message Date
Marius Bakke
82e2e6e92d
gppcscconnectionplugin: init at 1.1.0 2016-08-11 00:11:12 +01:00
Marius Bakke
67b16f0f85
globalplatform: init at 6.0.0 2016-08-11 00:11:01 +01:00
Franz Pletz
38f322f2cf tlsdate: 0.0.12 -> 0.0.13 2016-08-10 07:12:08 +02:00
Franz Pletz
3b165fdacf dibbler: init at 1.0.1 2016-08-10 07:12:08 +02:00
Franz Pletz
bba9728cd6 jool: 3.4.2 -> 3.4.4 2016-08-10 07:12:08 +02:00
Franz Pletz
aec9abc8e1 iputils: 20121221 -> 20151218 2016-08-10 07:12:08 +02:00
Robin Gloster
b08247f1e4 ptlib: 2.10.10 -> 2.10.11, add check for SSLv3 2016-08-10 07:12:08 +02:00
Franz Pletz
347c1ed8a0 libshout: 2.3.1 -> 2.4.1 2016-08-10 07:12:08 +02:00
Franz Pletz
6c7326aedd lolcode: fix build 2016-08-10 07:12:08 +02:00
Franz Pletz
43c663975c lolcode: 0.10.5 -> 0.11.2 2016-08-10 07:12:08 +02:00
obadz
3822c56e1e chromium: minor fixups
cc @aszlig
2016-08-10 02:35:59 +01:00
Robert
88f3d043b6 wscat: init at 1.0.1 (#17618) 2016-08-09 22:59:25 +02:00
obadz
582313bafe nixos: remove rsync from base install and add explicit path in nixos-install
As per 60b3f95ad8 (commitcomment-18507812)
2016-08-09 21:39:40 +01:00
obadz
57b7c3c545 nixos-install: more robust way of sourcing fresh version of self 2016-08-09 21:39:40 +01:00
Stefan Junker
918b11e64c rkt: 1.11.0 -> 1.12.0 (#17620) 2016-08-09 22:23:05 +02:00
Dan Peebles
4c43ac2db5 jsonnet: 0.8.7 -> 0.8.9 2016-08-09 19:39:46 +00:00
Fabian Schmitthenner
b91fc3f8d0 fix typo (#17621) 2016-08-09 21:15:55 +02:00
Vladimír Čunát
6152cf32e3 texlive: drop unused lesstif parameter
Fixes #17359. /cc #16391.
2016-08-09 20:52:58 +02:00
Robin Gloster
2005711164 Merge pull request #17613 from despairblue/update/flow
flow: 0.28.0 -> 0.30.0
2016-08-09 17:57:24 +00:00
Moritz Ulrich
9626707e2b systemd-cryptsetup-generator: Add note to revert 3efadce. 2016-08-09 19:21:58 +02:00
Moritz Ulrich
3efadce03b systemd-cryptsetup-generator: Fix installPhase. 2016-08-09 19:21:25 +02:00
Robin Gloster
3cf5d5ebed nginx module: fixup events in config 2016-08-09 17:11:28 +00:00
obadz
74b3ad148d nixos/tests/installer.nix: add libxml2 & libxslt to prevent download attempts 2016-08-09 17:01:42 +01:00
aszlig
f8fad62c8e
Merge branch 'nixpkgs-git-revision-fix'
Addresses #17218 in a better way in that it doesn't create a
".git-revision" file on every nixos-rebuild, because we already have
".git" available. Even if we don't nixos-rebuild can't create the
"git-revision" file.

Tested via:

nix-build -E '(import ./nixos/tests/make-test.nix {
  name = "foo";
  machine = {};
  testScript = "startAll; $machine->execute(\"nixos-version >&2\");";
})'

Closes: #17610
Acked-by: @bennofs
2016-08-09 17:34:35 +02:00
Robin Gloster
19f398870a Merge pull request #17614 from kamilchm/vagrant-plugin-fix
vagrant: FIX #16837 vagrant plugin install
2016-08-09 15:27:39 +00:00
Kamil Chmielewski
5d5b2d3f8f vagrant: FIX #16837 vagrant plugin install 2016-08-09 17:07:43 +02:00
Danny Arnold
21102b1589 flow: 0.28.0 -> 0.30.0 2016-08-09 16:51:13 +02:00
aszlig
0b9d9eded1
nixos/version: Try to get Git revison from .git
Let's first try if we can determine the Git revision from the .git
directory and if that fails, fall back to get the info from the
".git-revision" file... and after that use something generic like
"master".

This should address #17218 in better way, because we don't need to
create another redundant file in the source checkout of nixpkgs.

I'm not going to route of falling back to using .git, because after
55d881e, we already have ".git-revision" files in people's Git
repositories, which in turn means that nixos-version will report that
old file every time even if the working tree has updated.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @bennofs, Profpatsch
Reported-by: @devhell
Fixes: #17218
2016-08-09 14:18:20 +02:00
aszlig
55d881eea3
Revert adding .git-revision unconditionally
This reverts commit 1e534e234b.

We already should have a .git directory if it is managed via Git,
otherwise there is no way to get the Git revision if neither
.git-revision or .git is present.

But having .git-revision _and_ .git present seems very much redundant to
me.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @bennofs, @Profpatsch
Issue: #17218
2016-08-09 14:15:06 +02:00
Robin Gloster
b0b0a45bb1 nginx module: fix cfg.config backwards compatibility
fixes #17604
2016-08-09 12:02:21 +00:00
Benjamin Saunders
199f5a2844 matrix-synapse: 0.16.1-r1 -> 0.17.0 (#17605) 2016-08-09 12:02:10 +02:00
Aneesh Agrawal
746b591c68 vagrant: use libarchive lib from Nix (#17597)
We currently already replace the embedded bsdtar binaries with the
corresponding ones from Nix. However, we also need to replace the
libarchive shared library to prevent version mismatches between the
embedded library and the Nix binaries.

Also expose version on the derivation and use environment variables
to make overriding the derivation easier.
2016-08-09 12:01:48 +02:00
Pascal Wittmann
cb54b19c4d Merge pull request #17608 from cmfwyp/calibre-desktop-entry
calibre: add desktop entry files
2016-08-09 08:56:46 +02:00
Daiderd Jordan
c31f05e063 Merge pull request #17577 from LnL7/darwin-ffmpeg
ffmpeg: add extra darwin framework for 3.1
2016-08-09 08:13:11 +02:00
Robin Gloster
0b8bde0b63 Merge pull request #17606 from jerith666/email-cwd
email: adopt upstream fix for "$cwd undefined in configure"
2016-08-09 06:00:08 +00:00
cmfwyp
2b28811957
calibre: add desktop entry files 2016-08-08 23:40:07 -04:00
Matt McHenry
0d69547365 email: adopt upstream fix for "$cwd undefined in configure"
update to include https://github.com/deanproxy/eMail/pull/35
2016-08-08 23:02:04 -04:00
Robin Gloster
d9c368a140 Merge pull request #17601 from cmfwyp/skypeweb-1.2.1
pidgin-skypeweb: 2015-10-02 -> 1.2.1
2016-08-08 20:35:22 +00:00
Rok Garbas
f17ff218ff nodejs: ensure that all scripts in nodejs have proper shebangs (#17594) 2016-08-08 22:14:01 +02:00
cmfwyp
071b57ba79
pidgin-skypeweb: 2015-10-02 -> 1.2.1
The source can be fetched with tags now that there are stable
releases of pidgin-skypeweb.
2016-08-08 15:48:49 -04:00
Eelco Dolstra
75896a618c Merge pull request #17600 from rexim/tzdata
tzdata: 2016e -> 2016f
2016-08-08 20:05:00 +02:00
rexim
b9a6ba4e8f tzdata: 2016e -> 2016f 2016-08-08 23:44:28 +06:00
Thomas Tuegel
e642741124 Merge pull request #17468 from peterhoeg/kronometer
kronometer: init at 2.1.0
2016-08-08 11:15:32 -05:00
Nikolay Amiantov
3fca2ce204 fix invalid antiquotations
See https://github.com/NixOS/nix/issues/1017
2016-08-08 18:08:37 +03:00
Shea Levy
2faa207701 musescore: 2.0.2 -> 2.0.3 2016-08-08 10:59:55 -04:00
Nikolay Amiantov
d609df13dd Merge pull request #17596 from ttuegel/stage-1
nixos/stage-1: use `readlink -e` in builder
2016-08-08 18:58:31 +04:00
Thomas Tuegel
68922e3f74 nixos/stage-1: use readlink -e in builder
The builder has this convoluted `while` loop which just replicates
`readlink -e`. I'm sure there was a reason at one point, because the
loop has been there since time immemorial. It kept getting copied
around, I suspect because nobody bothered to understand what it actually
did.

Incidentally, this fixes #17513, but I have no idea why.
2016-08-08 09:45:45 -05:00
Nikolay Amiantov
d7544072d7 Merge pull request #17595 from ttuegel/stage-1
nixos/stage-1: fix antiquotation
2016-08-08 18:32:55 +04:00
Thomas Tuegel
ee36bb8588 nixos/stage-1: fix antiquotation 2016-08-08 09:28:17 -05:00
Thomas Tuegel
ca5b3368ca qttools: fix CMake paths
Fixes #17585.
2016-08-08 08:52:45 -05:00