ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 13:19:10 +03:00
Code Issues Projects Releases Wiki Activity
89,762 Commits 96 Branches 102 Tags 4.5 GiB
e5dd89f24b
Commit Graph

89762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabriel Ebner
e5dd89f24b Merge pull request #17957 from shlevy/staging-revert-fix 
Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""
 2016-08-24 13:51:32 +02:00
Shea Levy
8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"" 
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b.
 2016-08-24 07:35:30 -04:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Robin Gloster
f3886a6fba Merge remote-tracking branch 'upstream/hardened-stdenv' into staging 2016-08-24 10:30:35 +00:00
zimbatm
4d4980d9f8 Merge pull request #17805 from avnik/update/golang-1.7 
go: add 1.7 compiler
 2016-08-24 11:28:25 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2 
Darwin misc. fixes
 2016-08-24 11:52:27 +02:00
Franz Pletz
c0fa26ef3b Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-08-24 11:01:53 +02:00
Franz Pletz
8576aea57c cc-wrapper: fix detection of unsupported linker flags 2016-08-24 10:59:52 +02:00
Nikolay Amiantov
76223aa4b2 qutebrowser: add pdfjs support 2016-08-23 23:36:18 +03:00
Markus Mueller
07c44b81c3 ldap: Add option for NSS integration 2016-08-23 21:12:51 +02:00
Markus Mueller
e04c3506eb ldap: Add option for login PAM integration 2016-08-23 21:12:51 +02:00
Franz Pletz
6303b6eb1c czmq: fix bad merge 
9db5362270 vs. 9e211203da
 2016-08-23 20:02:38 +02:00
obadz
8da8aa7ddb Merge branch 'hardened-stdenv' into staging 2016-08-23 18:50:10 +01:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Franz Pletz
415e1983ca collectd: Fix build on Glibc 2.24 2016-08-23 19:17:36 +02:00
Franz Pletz
a12b2bfb8b xen: Fix build on Glibc 2.24 2016-08-23 19:17:36 +02:00
obadz
c49f2a0854 gnome3.gnome-calculator: less hacky fix to #17912 
Closes #17912
 2016-08-23 18:16:34 +01:00
obadz
6581f53593 Revert "gnome-calculator: work around #17912, in a hacky way" 
This reverts commit c255395219.
 2016-08-23 18:16:34 +01:00
Thomas Tuegel
be1406eb79 kde5.startkde: actually check that D-Bus is running 2016-08-23 12:00:16 -05:00
Thomas Tuegel
1df7279384 kde5.startkde: update from plasma-workspace-5.7.3 
* Read the screen scale factor (for HiDPI displays) from KScreen
  correctly.
* Disable automaticy scale factor detection in Qt applications.
* Force font DPI at startup, if requested.
* Allow kded to invoke kbuildsycoca5 automatically.
 2016-08-23 12:00:16 -05:00
Franz Pletz
1ad6cff9a7 mopidy: 2.0.0 -> 2.0.1 2016-08-23 18:50:51 +02:00
Franz Pletz
23560314f4 darkice: 1.2 -> 1.3 2016-08-23 18:50:47 +02:00
Franz Pletz
17234ca073 ccl: fix hash 2016-08-23 18:28:38 +02:00
Franz Pletz
3c06e5f6f7 cc-wrapper: check ld hardening capabilities in stdenv 2016-08-23 18:13:31 +02:00
Robin Gloster
9e211203da czmq: fix build 
Uses -Werror, failing with additionally enabled warnings from hardening.
 2016-08-23 15:51:26 +00:00
Joachim Fasting
8ab400988c lsh: fix gcc5 build 
The build fails with c11 (also tested c99), but works with gnu90.
 2016-08-23 15:33:32 +00:00
Robin Gloster
7413278f9b Revert "Remove lsh, broken & unmaintained" 
This reverts commit 73f4c2bdf8.
 2016-08-23 15:32:41 +00:00
Robin Gloster
3a18f06eab Revert "lsh: remove last references" 
This reverts commit 8329066d5e.
 2016-08-23 15:31:33 +00:00
Robin Gloster
07604ad631 add-hardening.sh: fix quotation 2016-08-23 15:27:51 +00:00
Robin Gloster
335d0097cf cc-wrapper: add-{flags,hardening} -> add-{flags,hardening}.sh 2016-08-23 15:27:51 +00:00
Nikolay Amiantov
13c04c837d wrapPython: fix replace of env invokations 2016-08-23 17:55:12 +03:00
Zero King
04d7056514 mosh: 1.2.5 -> 1.2.6 (#17939) 2016-08-23 14:49:57 +00:00
Joachim F
dba09fa471 Merge pull request #17930 from ebzzry/emem-0.2.27 
emem: 0.2.26 -> 0.2.27
 2016-08-23 16:22:45 +02:00
Joachim F
56bfc0240e Merge pull request #17766 from NeQuissimus/gradle30 
gradle: 2.14.1 -> 3.0, keep 2.14.1
 2016-08-23 16:22:05 +02:00
Nikolay Amiantov
1df4dd6bf5 initrd-ssh service: ensure that keys got copied into initrd 
Fixes #17927.
 2016-08-23 16:20:26 +03:00
obadz
ab08440f9c Revert "Temporarily disable chromium test" 
This reverts commit 9e6eec201b.

Verified locally that cd063d7 fixes the problem.
cc @edolstra @aszlig
 2016-08-23 14:16:58 +01:00
Nikolay Amiantov
192d7a4cba mjpegtools: remove SDL input when build is minimal 2016-08-23 15:36:31 +03:00
Nikolay Amiantov
7b2106c32d mjpegtools: fix build 2016-08-23 15:33:29 +03:00
Moritz Ulrich
594eb327aa Merge pull request #17934 from DamienCassou/emacs-25.1-rc2 
emacs25pre: rc1 -> rc2
 2016-08-23 13:56:40 +02:00
Joachim Fasting
f3ef4383c6
nix-daemon service: fix unbalanced parens in description 2016-08-23 13:06:25 +02:00
Eelco Dolstra
3fe93d2f75 Fix virtualbox test evaluation 2016-08-23 13:05:14 +02:00
Eelco Dolstra
9e6eec201b Temporarily disable chromium test 
It's hanging and blocking the unstable channel.

http://hydra.nixos.org/build/38984676

@aszlig
 2016-08-23 13:01:34 +02:00
obadz
cd063d774e chromium: fix "Aw, snap!" after glibc 2.24 upgrade 
See https://bugzilla.redhat.com/show_bug.cgi?id=1361157#c8
cc @domenkozar @aszlig
 2016-08-23 11:56:11 +01:00
Moritz Ulrich
08933f8a07 leiningen: Simplify build. 2016-08-23 12:38:24 +02:00
zimbatm
320367c273 wrk: 4.0.0 -> 4.0.2 2016-08-23 10:40:03 +01:00
Kranium Gikos Mendoza
e130fa5958 openpts: fix build 2016-08-23 12:37:01 +03:00
Kranium Gikos Mendoza
5a4b3e3ece xpilot-ng: fix build 2016-08-23 12:37:01 +03:00
Kranium Gikos Mendoza
eecc63bad9 fcitx-engines.table-other: fix build 2016-08-23 12:37:01 +03:00
Eelco Dolstra
1100490362 Merge pull request #17932 from puffnfresh/package/hipchat 
hipchat: 4.0.1641 -> 4.26.0.1655
 2016-08-23 11:27:21 +02:00
Eelco Dolstra
f2e496a9d8 Merge pull request #17935 from DamienCassou/offlineimap-7.0.6 
offlineimap: 7.0.5 -> 7.0.6
 2016-08-23 11:26:54 +02:00