1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

48646 commits

Author SHA1 Message Date
Justin Bedo 28af151e1a Added missing curl dependency to RCurl package 2014-09-03 15:48:33 +10:00
William A. Kennington III c369c4afbd grub2: Fix zfs support 2014-09-02 19:38:52 -07:00
William A. Kennington III ccc758f414 nixos/install-grub: Fix typo 2014-09-02 18:56:53 -07:00
lethalman 9f37c14974 Merge pull request #3941 from manveru/diod
diod: add systemd service and config
2014-09-03 03:25:16 +02:00
Michael Fellinger e805c78ed3 diod: remove redundant default doc 2014-09-03 02:55:00 +02:00
Michael Fellinger 0bf05a02f4 diod: add systemd service and config 2014-09-03 02:30:04 +02:00
William A. Kennington III 9659d0f4fb nixos/dnsmasq: Fix regressions during the systemd update 2014-09-02 17:23:55 -07:00
Michael Raskin e39b1f4ec8 Add a few meta-attribute descriptions; rewrite the meta-attribure list description to mean that it is expected that all used meta-attributes are described in the manual. 2014-09-03 02:10:00 +04:00
Aristid Breitkreuz 3a33731e54 Merge pull request #3903 from wkennington/master.grub
Bring back grub update with fixes
2014-09-02 20:59:27 +02:00
Sander van der Burg 7b7fd5044f androidsdk: remove obsolete workaround 2014-09-02 19:19:03 +02:00
Sander van der Burg 800beea5f9 androidsdk: Bump to version 23.02 and update all its plugins and conversion scripts 2014-09-02 19:18:30 +02:00
Cray Elliott 02f5f25b2d merge in ewemoa's zipalign fix with my updated build-tools
now passes Android tests found at https://github.com/svanderburg/nix-androidenvtests !
2014-09-02 19:17:47 +02:00
Michael Raskin 0ede64bfcb Override postFixup for urlwatch so it works somehwo 2014-09-02 21:17:52 +04:00
Michael Raskin 76f4eb5f93 Revert "python-wrapper: fix wrapped argv[0] w/o sed, maybe"
This reverts commit a6dd9bd0cb.
2014-09-02 20:45:41 +04:00
Michael Raskin af4c369d0a Revert "Create wrapper directory outside of /bin/ for FHS chroots to be closer to FHS"
This reverts commit 9deb7f8aae.
2014-09-02 20:17:55 +04:00
William A. Kennington III d13423c74f tinc_pre: Experimental Patches 2014-09-02 09:16:15 -07:00
William A. Kennington III ac502d28ff tinc_pre: Add derivation
The tinc developer has made significant developments to the next version
of tinc including many protocol security fixes. This patch adds the
prerelease of the next major tinc release.
2014-09-02 09:16:15 -07:00
William A. Kennington III 961e9867b3 nixos/generate-config: Only add store search path when kernels are not copied 2014-09-02 09:16:13 -07:00
William A. Kennington III 9467937639 nixos/install-grub: Only check for /nix to be the mountPoint for the store 2014-09-02 09:16:13 -07:00
William A. Kennington III 61908bdd80 nixos/install-grub: Always copy kernels for different devices 2014-09-02 09:16:13 -07:00
William A. Kennington III 4eff4afa3c nixos/installer-test: Use nested subvolumes for root to test detection 2014-09-02 09:16:13 -07:00
William A. Kennington III 87b6232f3a nixos/generate-config: Don't interpret btrfs subvols as bind mounts 2014-09-02 09:16:13 -07:00
William A. Kennington III 3944239362 nixos/tests-installer: Add a test for btrfs default volumes and bind mounts 2014-09-02 09:16:13 -07:00
William A. Kennington III 01ab1d57a3 nixos/install-grub: Detect nested btrfs subvolumes 2014-09-02 09:16:13 -07:00
William A. Kennington III 7fae423522 nixos/generate-config: Support detecting nested subvolumes 2014-09-02 09:16:13 -07:00
William A. Kennington III 0b66483c9a nixos/install-grub: Store path should be /nix/store not /nix 2014-09-02 09:16:13 -07:00
William A. Kennington III 36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub""
This reverts commit 94205f5f21.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
2014-09-02 09:16:13 -07:00
Pascal Wittmann d812281674 zile: update from 2.4.9 to 2.4.11, adpot it and set platforms to linux 2014-09-02 17:57:09 +02:00
Peter Simons 7847276598 Merge pull request #3927 from ts468/haste
Update: Haste-Compiler: 0.4.1 -> 0.4.2
2014-09-02 17:27:44 +02:00
Michel Kuhlmann 6a0b39b0af haskell-hindent: initial expression 2014-09-02 16:02:00 +01:00
Jaka Hudoklin 217cda9c54 pythonPackages: add websocket_client, fix pythonPackages.docker 2014-09-02 16:37:13 +02:00
Sander van der Burg ef8220d1bf Expose Android NDK in the top level expression 2014-09-02 14:11:09 +02:00
Cray Elliott c8871e0b65 ewemoa : add the Android Support repository 2014-09-02 14:09:01 +02:00
Sander van der Burg 3b0c725255 Add attributes for all relevant Android SDK API levels and their capabilities 2014-09-02 14:05:09 +02:00
Vincent Laporte 7d3706c788 Merge remote-tracking branch 'upstream/master' into ocaml-sqlite3EZ
Conflicts:
	pkgs/top-level/all-packages.nix
2014-09-02 13:32:43 +02:00
Luca Bruno 268a5618f4 Merge branch 'gnome3' 2014-09-02 12:59:47 +02:00
Luca Bruno 8a4a0a5aa0 json-glib: update from 1.0.0 to 1.0.2 2014-09-02 12:58:06 +02:00
Luca Bruno 17e96cd1a3 vte: update from 0.36.2 to 0.36.3 2014-09-02 12:57:10 +02:00
Luca Bruno 12018a0df9 gnome3_12.tracker: update from 1.0.1 to 1.0.3, potentially fixes CVE-2012-2671, CVE-2012-6109 2014-09-02 12:56:07 +02:00
Luca Bruno f02ab3f9c4 gnome3_12.totem: update from 3.12.1 to 3.12.2 2014-09-02 12:56:01 +02:00
Luca Bruno 70991e666e gnome3_12.gtksourceview: update from 3.12.2 to 3.12.3 2014-09-02 12:55:54 +02:00
Luca Bruno 7cb6d4cd87 gnome3_12.grilo-plugins: update from 0.2.12 to 0.2.13 2014-09-02 12:55:46 +02:00
Luca Bruno 4426b5aca7 grilo: update from 0.2.10 to 0.2.11 2014-09-02 12:55:33 +02:00
Luca Bruno b00b560dba gnome3_12.gnome-user-docs: update from 3.12.1 to 3.12.2 2014-09-02 12:54:38 +02:00
Luca Bruno ac7f0a8cf2 gnome3_12.gnome-music: update from 3.12.2 to 3.12.2.1 2014-09-02 12:54:30 +02:00
Luca Bruno 95dffc12e8 gnome3_12.gnome-calculator: update from 3.12.1 to 3.12.3 2014-09-02 12:54:22 +02:00
Luca Bruno f08c327ab2 gnome3_12.gedit: update from 3.12.1 to 3.12.2 2014-09-02 12:54:14 +02:00
Luca Bruno f3bc1dc263 gnome3_12.geary: update from 0.6.0 to 0.6.2 2014-09-02 12:54:08 +02:00
Luca Bruno de51a490f5 gnome3_12.folks: update from 0.9.6 to 0.9.8 2014-09-02 12:54:01 +02:00
Luca Bruno 64746e1f24 gnome3_12.evolution: update from 3.12.2 to 3.12.5 2014-09-02 12:53:49 +02:00