JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,931 Commits 2 Branches 0 Tags 13 GiB
fe9cabedf0
Commit Graph

86931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexey Shmalko
fe9cabedf0
etc: remove obsolete directories 
This patch adds handling of a directory becoming a symlink in
/etc. Before this patch, the directory wasn't removed and then
symlinking failed, which caused directory not being updated at all.

The idea for the patch goes to @abbradar at
https://github.com/NixOS/nixpkgs/issues/16978#issuecomment-232921903:
> A heuristic idea for this -- a function `isStatic :: Path -> Bool`:
>
> * if path `/etc/foo` is a file, return True iff it's a symlink to `/etc/static/foo`.
> * if path is a directory, return True iff for all items in it `isStatic` is True.
>
> On any conflicts, if old path is static, it's safe to replace and/or
> delete stale. Otherwise make a backup and notify the user via a
> journal entry and console output.

The only difference here -- it will not replace user configs.

This also fixes https://github.com/NixOS/nixpkgs/issues/16978.
 2016-07-25 15:50:53 +03:00
Tristan Helmich
76e4164007 emby: 3.0.5985 -> 3.0.5986 (#17007) 2016-07-17 15:55:53 +02:00
Nikolay Amiantov
193ab8be67 Revert "nixos stage-1: try to quit plymouth if started on failure" 
This reverts commit c69c76ca7e.

This patch was messed up during a rebase -- the commit title doesn't match what
it really does at all (it is actually a broken attempt to get LUKS passphrase
prompts in Plymouth).
 2016-07-17 15:03:13 +03:00
Thomas Tuegel
6dc6ae0ebe qt55.qtlocation: don't try to wrap missing module 2016-07-17 06:58:15 -05:00
Thomas Tuegel
957a0f6599 kde5.extra-cmake-modules: do not propagate for man and info pages 2016-07-17 06:58:15 -05:00
Vladimír Čunát
bf6759839a Merge #17023: bring back ncurses5 to fix GHC bootstrapping 2016-07-17 13:41:19 +02:00
Eelco Dolstra
018d674354 Merge pull request #17024 from mimadrid/update/sudo-1.8.17p1 
sudo: 1.8.16 -> 1.8.17p1
 2016-07-17 13:29:11 +02:00
Eelco Dolstra
211bed46c4 Merge pull request #17004 from rickynils/openssh_privsep_dir 
openssh: Use the default privilege separation dir (/var/empty)
 2016-07-17 13:28:44 +02:00
Frederik Rietdijk
52896c8c86 pythonPackages.rpy2: 2.5.6 -> 2.8.2 
readline issue still exists.

```
ImportError: libreadline.so.6: cannot open shared object file: No such
file or directory
```
 2016-07-17 12:16:24 +02:00
Joachim Fasting
ce103cae38
cppcheck: 1.73 -> 1.74 2016-07-17 11:52:13 +02:00
Joachim Fasting
6d35e0259c
minisign: use fetchFromGitHub and set meta.platforms 2016-07-17 11:39:01 +02:00
Joachim F
23e27413b3 Merge pull request #17029 from nathanielbaxter/dev/teamspeak_client 
teamspeak_client: 3.0.19.1 -> 3.0.19.3
 2016-07-17 11:29:01 +02:00
Joachim F
71bc880e9b Merge pull request #17028 from joachifm/teamspeak-license 
teamspeak_client: specify a custom, nonfree license
 2016-07-17 11:28:42 +02:00
aszlig
ec072cbc4c
nixos/tests/installer: Fix matching LUKS prompt 
The LUKS passphrase prompt has changed from "Enter passphrase" to "Enter
LUKS Passphrase" in c69c76ca7e, so the OCR
detection of the test fails indefinitely.

Unfortunately, this doesn't fix the test because we have a real problem
here:

Enter LUKS Passphrase:
killall: cryptsetup: no process killed
Enter LUKS Passphrase:

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
 2016-07-17 11:20:25 +02:00
Vladimír Čunát
15cd7af522 Merge #16968: fltk: darwin compatibility 2016-07-17 10:43:50 +02:00
Vladimír Čunát
33476f3303 Merge #17014: qt3: fix build with multiple outputs 2016-07-17 10:36:26 +02:00
Langston Barrett
6aa50f169b sway: 0.7 -> 0.8 (#17026) 2016-07-17 09:31:41 +02:00
Nathaniel Baxter
3c9788e1ce teamspeak_client: 3.0.19.1 -> 3.0.19.3 2016-07-17 17:06:44 +10:00
Damien Cassou
c9a3cbb122 Merge pull request #16987 from binarin/emacs-25-with-xwidgets 
emacs25pre: Add option for building with xwidgets
 2016-07-17 07:20:10 +02:00
Joachim Fasting
ec4ae7c8b6
teamspeak_client: specify a custom, nonfree license 
The licensing terms depend on use [1], but the software is clearly nonfree.
Previously, the package would happily build even with allowUnfree = false.

[1]: http://sales.teamspeakusa.com/licensing.php
 2016-07-17 04:52:22 +02:00
Joachim F
62455c7db1 Merge pull request #16852 from Jookia/RFC_dxx-nonfree 
dxx_rebirth: Mark license as nonfree.
 2016-07-17 04:30:18 +02:00
Michele Guerini Rocco
47f59a51e4 nixos/compton: add user service (#16652) 2016-07-17 02:25:38 +02:00
mimadrid
a311b06919
sudo: 1.8.16 -> 1.8.17p1 2016-07-16 23:46:42 +02:00
Tuomas Tynkkynen
8ee0e105c9 ghc: Make various binary GHCs use ncurses5 
Fixes #17008: GHC bootstrapping broken by ncurses update.
 2016-07-16 23:47:28 +03:00
Tuomas Tynkkynen
b0cc1cd729 ncurses: Add explicit 'ncurses5' and 'ncurses6' attrs 
Also reinstate the gcc5 patch to make it build on Linux.
 2016-07-16 23:47:28 +03:00
Frederik Rietdijk
b4bae44f13 pythonPackages.jupyterlab: init at 0.1.1 
Note that this is still a pre-alpha release.
 2016-07-16 22:42:37 +02:00
Thomas Tuegel
6057977ca4 kde5.kate: require makeQtWrapper 2016-07-16 15:02:19 -05:00
Thomas Tuegel
343415e02e qt55.qtbase: fix setup hook and QMake hook 2016-07-16 15:02:19 -05:00
Joachim F
5c837e952d Merge pull request #17001 from womfoo/fix/vtun 
vtun: add debian gcc5 fix
 2016-07-16 21:26:50 +02:00
Aristid Breitkreuz
a84d20a351 Merge pull request #17010 from mimadrid/update/ethtool-4.6 
ethtool: 4.5 -> 4.6
 2016-07-16 20:35:25 +02:00
Tuomas Tynkkynen
6e0ab36de0 Merge pull request #16963 from womfoo/init/cking-kernel-tools 
Init {fnotify,fork,power,smem}stat kernel tools
 2016-07-16 21:15:23 +03:00
Rok Garbas
3634e8ac3e vimPlugins: update existing plugins and added 3 more 
- github:sbdchd/neoformat
- github:elmcast/elm-vim
- github:sheerun/vim-polyglot
 2016-07-16 20:09:55 +02:00
Joachim F
5f3ca2ed82 Merge pull request #16986 from binarin/urxvt_font_size-xlsfonts-dep 
urxvt_font_size: Add missing `xlsfonts` dependency
 2016-07-16 20:09:29 +02:00
Joachim F
d9701350f9 Merge pull request #16951 from heilkn/lie 
LiE: include forgotten file INFO.a by installation
 2016-07-16 19:54:23 +02:00
Frederik Rietdijk
24fdb7ce21 Merge pull request #16889 from grahamc/sysstat 
sysstat: Create systemd service for historical sar data
 2016-07-16 19:29:13 +02:00
Frederik Rietdijk
097d75d502 Merge pull request #17005 from rzetterberg/libui 
libui: init at 3.1a
 2016-07-16 18:23:22 +02:00
Kranium Gikos Mendoza
5d8005b1ef qt3: fix build after multiple-outputs change 
also updated source tarball path
 2016-07-16 23:39:03 +08:00
Thomas Tuegel
2eb6300b87 Merge branch 'qt-min-user-env' 2016-07-16 10:15:02 -05:00
Thomas Tuegel
560c4a5927 kde5.kservice: remove unused setup hook 2016-07-16 10:14:51 -05:00
Thomas Tuegel
78e7f44488 qt5.makeQtWrapper: do not inherit Qt search paths 2016-07-16 10:14:50 -05:00
Thomas Tuegel
b2cf5aabb0 nixos/kde5: add missing Plasma packages 2016-07-16 10:14:50 -05:00
Thomas Tuegel
475ad4c7c3 kde5.startkde: update script based on plasma-workspace-5.7.1 2016-07-16 10:14:49 -05:00
Thomas Tuegel
32c1f05aed nixos/kde5: install missing frameworks 2016-07-16 10:14:48 -05:00
Thomas Tuegel
d3747a2261 kinit: use a setuid wrapper for start_kdeinit 2016-07-16 10:14:47 -05:00
Thomas Tuegel
512212db36 kde5.frameworks: unwrap all frameworks 2016-07-16 10:14:47 -05:00
Thomas Tuegel
888c66f97d nixos/kde5: disable setuid wrapper for kdeinit 
We need to pass certain environment variables through the wrapper, but I
don't know how to do that yet. The setuid-root feature serves only to
hide kdeinit from the OOM killer, so this is not critical.
 2016-07-16 10:14:46 -05:00
Thomas Tuegel
949277ed0a kde5.startkde: append extra PATH elements; set Qt search paths 2016-07-16 10:14:46 -05:00
Thomas Tuegel
1cb4aacf18 nixos/kde5: fix paths to setuid programs 2016-07-16 10:14:45 -05:00
Thomas Tuegel
766ea7c4ca qt55.qtbase: update setup hook 2016-07-16 10:14:45 -05:00
Thomas Tuegel
d19dc420d2 qt56.qtbase: don't use propagatedUserEnvPkgs 
Fixes #15498.
 2016-07-16 10:14:44 -05:00