JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,176 Commits 1 Branch 0 Tags 12 GiB
c671fc6dd0
Commit Graph

88176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tuomas Tynkkynen
f80508df5f xfsprogs: 4.2.0 -> 4.5.0 2016-08-08 16:46:34 +03:00
Robin Gloster
34086084fc Merge pull request #17551 from womfoo/fix/xtreemfs-openssl-build 
xtreemfs: fix build
 2016-08-08 13:24:17 +00:00
Michiel Leenaars
b49ba8a3e3 pythonPackages.sqlobject: init at 3.0.0 2016-08-08 15:14:22 +02:00
Michiel Leenaars
f6d8566cec pythonPackages.pympler: init at 0.4.3 2016-08-08 15:14:22 +02:00
Michiel Leenaars
fc71e1e178 pythonpackages.attrs: init -> 16.0.0 2016-08-08 15:14:22 +02:00
Tuomas Tynkkynen
8f098d71f0 idea.android-studio: Disable Hydra build 
http://hydra.nixos.org/build/38305379
 2016-08-08 16:12:29 +03:00
Tuomas Tynkkynen
bdc2a4a15b gsimplecal: Broken on Darwin 
Has never had a successful Darwin build.

http://hydra.nixos.org/build/38312308
 2016-08-08 16:12:29 +03:00
Tuomas Tynkkynen
0afbb63425 grive: Broken on Darwin 
Last successful build in 2014.

http://hydra.nixos.org/build/38308131
 2016-08-08 16:12:29 +03:00
Tuomas Tynkkynen
6df6b1d925 gpart: Broken on Darwin 
Never had a successful Darwin build.

http://hydra.nixos.org/build/38306346
 2016-08-08 16:12:29 +03:00
Michiel Leenaars
93a9643aed pythonPackages.pydispatcher: init -> 2.0.5 2016-08-08 14:57:08 +02:00
Michiel Leenaars
19eac13f3d pythonPackages.klein: init -> 15.3.1 2016-08-08 14:57:08 +02:00
Robin Gloster
4fb05dc8b9 Merge pull request #17592 from Profpatsch/libinput-docs 
libinput.accelProfile: improve docs & new default
 2016-08-08 12:34:40 +00:00
Profpatsch
85ed3ca9c7 libinput.accelProfile: improve docs & new default 
The link to some (of course non-existing, i.e. freedesktop) “libinput”
documentation is replaced by a piece of the API documentation.

The default is changed since the documentation suggests `adaptive`
should be it.
https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79

Also fix a missing string conversion for `scrollButton`.
 2016-08-08 14:01:07 +02:00
obadz
f242b752fe lib/sources.nix@commitIdFromGitRepo: parenthesize what should always have been 
Fixes error: cannot coerce a partially applied built-in function to a string, at lib/sources.nix:59:32

I don't understand how this used to work, but doesn't work anymore?
 2016-08-08 11:46:41 +01:00
Eelco Dolstra
2d71df18d3 Merge pull request #17588 from rnhmjoj/nss 
nss: 3.23 -> 3.24
 2016-08-08 12:11:26 +02:00
Wout Mertens
db8401f603 Merge pull request #17100 from abbradar/resume-delay 
nixos stage-1: wait for resume devices to appear
 2016-08-08 11:34:38 +02:00
Robin Gloster
f8fbb6fa5c Merge pull request #17582 from paperdigits/geeqie-13 
geeqie: 1.2.3 -> 1.3
 2016-08-08 09:06:15 +00:00
Peter Hoeg
1df8c62dcf kronometer: init at 2.1.0 2016-08-08 16:59:19 +08:00
Frederik Rietdijk
5bf77fafb7 Merge pull request #17545 from lancelotsix/add_django_guardian 
Add django guardian
 2016-08-08 10:24:35 +02:00
Frederik Rietdijk
ebda79230b Merge pull request #17576 from sternenseemann/master 
teamspeak_client: 3.0.19.3 -> 3.0.19.4
 2016-08-08 10:22:45 +02:00
Lancelot SIX
8bfbc6cc85 pythonPackages.ovh: 0.3.5 -> 0.4.5 (#17566) 2016-08-08 09:54:44 +02:00
Lancelot SIX
8280595472 pythonPackages.netcdf4: 1.2.1 -> 1.2.4 (#17581) 2016-08-08 09:51:12 +02:00
Nikolay Amiantov
1e8894f085 unity3d: use chromium-suid-sandbox 2016-08-08 10:49:00 +03:00
Nikolay Amiantov
b2413e48ae chromium-suid-sandbox module: fix description 2016-08-08 10:17:31 +03:00
Mica Semrick
43da8b14a0
gmic: 1.6.5 -> 1.7.4 2016-08-08 08:20:26 +02:00
Al Zohali
2aba1c4962 phpfpm service: restructured pool configuration 
From @fpletz: Keep poolConfigs option for backwards-compatibility.

The original commit 6b3f5b5a42 was previously
reverted by c7860cae1a but the issues were
resolved.
 2016-08-08 05:53:53 +02:00
Franz Pletz
7c9a0bf534 pythonPackages.searx: fix build 
The certifi package was upgraded but searx had a hard dependency on a
specific version. It still works with the new version.
 2016-08-08 05:51:25 +02:00