public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,923 Commits 1 Branch 0 Tags
7f4fcbae78afda2b9d87c85b3add8c5afbf35c8d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wout Mertens 4aea876913 Merge pull request #10824 from wmertens/nofailnixshell 
Don't fail if env-vars cannot be written to
 2015-11-04 16:36:49 +01:00
Wout Mertens 774f74b875 Don't fail if env-vars cannot be written to 
env-vars is a debugging aid, see
https://github.com/NixOS/nix/commit/3e5dbb24337d8416cfe46484eb2692811546a9c1
for a rationale for this change.
 2015-11-04 16:32:59 +01:00
Wout Mertens baba136c30 Merge pull request #10262 from wmertens/nofailnixshell 
Don't fail if env-vars cannot be written to
 2015-11-04 07:21:56 +01:00
Wout Mertens b21a5013a0 Don't fail if env-vars cannot be written to 
env-vars is a debugging aid, see
https://github.com/NixOS/nix/commit/3e5dbb24337d8416cfe46484eb2692811546a9c1
for a rationale for this change.
 2015-11-04 07:19:57 +01:00
Wout Mertens 5c34563cda Merge pull request #10517 from demin-dmitriy/sublime3 
sublime3: make sublime text work with pkexec and gksudo
 2015-10-24 19:16:34 +02:00
Wout Mertens 55e8d8ea61 Merge pull request #9941 from utdemir/upgrade-nodejs-4-1 
nodejs: 0.12.7 -> 4.1.0
 2015-09-25 19:02:04 +02:00
Wout Mertens 660cafe69a Merge pull request #9407 from wmertens/apache-deflate 
Apache service module: allow compression
 2015-08-25 07:36:27 +02:00
Wout Mertens 164f6ff2a8 Apache service module: allow compression 2015-08-23 15:13:52 +02:00
Wout Mertens 0666ee4739 Merge pull request #6732 from oconnorr/master 
Use mktemp to create temporary files to hold ssh host keys and authorized keys
 2015-06-02 20:34:43 +02:00
Wout Mertens ab0ac154f9 Merge pull request #7302 from ragnard/mesos-slave-without-docker 
mesos-slave: Docker optional & IP address configurable
 2015-05-28 11:43:01 +02:00
Wout Mertens ebedf814ce Merge pull request #7847 from spwhitt/libdvdnav 
libdvdnav: 4.2.1 -> 5.0.3
 2015-05-15 13:21:35 +02:00
Wout Mertens aa3db1b19c Merge pull request #7848 from henrytill/libpsl 
libpsl: add darwin to meta.platforms
 2015-05-15 10:44:23 +02:00
Wout Mertens 1f400ea463 Merge pull request #6411 from NixOS/passAsFile 
writeTextFile: Use passAsFile if available
 2015-05-14 13:57:24 +02:00
Wout Mertens c7893e960d efibootmgr/var: upgrade 2015-05-11 14:25:17 +00:00
Wout Mertens 7d12c7cbd7 Merge pull request #7575 from k0ral/git 
git: 2.3.5 -> 2.3.6
 2015-04-26 08:33:53 +02:00
Wout Mertens 140e071664 Merge pull request #6413 from benley/posix-all-the-things 
update-channel-branches: fix to work with posix /bin/sh
 2015-02-18 11:34:35 +01:00
Wout Mertens 1a6b92bb71 Merge pull request #6421 from Havvy/patch-1 
Update Node stable to v.0.12.0
 2015-02-18 10:36:40 +01:00
Wout Mertens 5c9319ddac writeTextFile: Use passAsFile if available 2015-02-18 01:08:03 +01:00
Wout Mertens 65438da88a Merge pull request #6357 from NixOS/jobs-vs-users 
nix-daemon: Sanity check maxJobs vs nrBuildUsers
 2015-02-16 11:42:24 +01:00
Wout Mertens d41367735d nix-daemon: Sanity check maxJobs vs nrBuildUsers 2015-02-15 15:37:30 +01:00
Wout Mertens 2e4b5ba1ea Merge pull request #6346 from wmertens/rdfind 
rdfind: Add new package
 2015-02-15 08:27:29 +01:00
Wout Mertens f80ae41a7d rdfind: Add new package 
refined is a very fast duplicate file finder/remover/hardlinker.
 2015-02-14 23:19:46 +01:00
Wout Mertens 3b65c29710 Merge pull request #6266 from NixOS/stage1warn 
stage-1-init: better warnings
 2015-02-09 21:56:17 +01:00
Wout Mertens 8f42f33c45 stage-1-init: better warnings 
- Suppress spurious LVM FD3 warning:
  See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432986
- Warn when device doesn't come online
 2015-02-09 21:53:51 +01:00
Wout Mertens 1d9d947c25 Merge pull request #6187 from abbradar/notes-unstable 
Add release-notes for unstable revision
 2015-02-06 14:17:25 +01:00
Wout Mertens f736843200 Merge pull request #6061 from wmertens/fortune-darwin 
fortune: fix Darwin build
 2015-01-29 19:56:03 +01:00
Wout Mertens bc6a35c92d fortune: fix Darwin build 2015-01-29 19:14:49 +01:00
Wout Mertens ef2e0ffdea stdenv: fix eval - the return 2015-01-29 10:54:07 +01:00
Wout Mertens 006769be70 stdenv: fix eval 
silly 💩
 2015-01-29 10:46:35 +01:00
Wout Mertens 0feb19b6b4 stdenv: take license parameter checks out of mkDerivation path 2015-01-29 10:38:33 +01:00
Wout Mertens 7e045d412a pstree: fix direct reference to gcc 2015-01-28 12:35:54 +01:00
Wout Mertens be799bb080 Merge pull request #5892 from matthiasbeyer/add-license_selection 
Add (optional) license white/blacklisting
 2015-01-24 20:06:32 +01:00
Wout Mertens 4b82bd683e Merge pull request #5714 from vcunat/p/stdenv-subst 
stdenv substitute: avoid using a temporary file
 2015-01-23 23:15:16 +01:00
Wout Mertens ac9c450a62 Merge pull request #5921 from matejc/fixfixnixui 
nixui: do not use pkgs.path
 2015-01-23 17:32:09 +01:00
Wout Mertens e7765fbc7d Merge branch 'matejc-fixnixui' 
closes #5917
 2015-01-23 16:00:06 +01:00
Wout Mertens 70ac34b8c0 nixui: include build files 2015-01-23 15:59:10 +01:00
Wout Mertens 4c2554ebf4 Remove nixui to fix travis failures 2015-01-23 15:49:57 +01:00
Wout Mertens 71e107acac Set nixui to broken 
See https://github.com/NixOS/nixpkgs/commit/264ed82eda55403aad810a2b32527b510c83e24a#commitcomment-9416066
 2015-01-23 15:37:54 +01:00
wmertens c5692758b5 Merge pull request #5896 from matejc/nixui 
Add NixUI package
 2015-01-22 13:23:36 +01:00
wmertens 8780caadd4 Merge pull request #5499 from wizeman/u/zfs-dont-fsck 
nixos: When generating /etc/fstab, ZFS and NFS filesystems shouldn't be checked
 2015-01-22 12:09:22 +01:00
wmertens e0ec38daa0 glibcLocales: fix cut'n'paste error 
💩
 2015-01-21 23:24:18 +01:00
wmertens fc8048df1d glibcLocales: Only supported on Linux 2015-01-21 23:12:02 +01:00
Wout Mertens 7c3fa29e30 Fix LOCALE_ARCHIVE handling 2015-01-19 14:50:52 +01:00
wmertens e5703d21a7 Fix glibclocales reference 
Environment is auto-added if supported on the platform
 2015-01-19 14:10:45 +01:00
wmertens d3383e4879 Merge pull request #4394 from wmertens/patch-6 
setup-etc.pl: Fail when symlink/rename fails
 2015-01-19 12:39:41 +01:00
wmertens fc75f738af Merge pull request #5516 from benley/fix-matchAttrs 
lib: Fix matchAttrs by importing builtins.length
 2015-01-01 09:52:07 +01:00
wmertens a8c726da56 Merge pull request #5378 from benley/mesos 
mesos-slave: add config option for slave attributes
 2014-12-19 08:10:07 +01:00
wmertens 5f7530a1d7 zfs hostId: Instructions to derive from machine-id 2014-12-18 22:52:29 +01:00
wmertens 6fa7ea0537 Merge pull request #5383 from robberer/tmp1 
php: make curl wrappers optional
 2014-12-18 17:49:10 +01:00
wmertens 0d5bd2a0f3 Merge pull request #5254 from ehmry/network-filesystems 
nixos: configure samba and rsync shares with sets
 2014-12-17 07:07:28 +01:00
wmertens 2fb69f5277 Merge pull request #5196 from madjar/cloud-init 
cloud-init: add expression and service
 2014-12-17 06:58:54 +01:00
wmertens d3d38c38c5 Merge pull request #5326 from prikhi/refactor-psd-config 
profile-sync-daemon: refactor nixos module
 2014-12-14 19:38:31 +01:00
wmertens 9095a4bddd Merge pull request #5316 from prikhi/add-profile-sync-daemon 
Add the Profile Sync Daemon Package & NixOS Module
 2014-12-13 16:03:05 +01:00
wmertens 24924e4fdf Merge pull request #5125 from nckx/eid-mw 
Add eid-mw: authenticate & sign with Belgian eID identity cards
 2014-12-08 16:40:54 +01:00
wmertens 3cecef15d7 Revert $GIT_SSL_CAINFO removal 
Users have an older git in their user environment and it doesn't work without it. We should keep it around for a while.
 2014-12-01 23:07:50 +01:00
Wout Mertens cacf3f6c1e Merge branch 'curl-ssl-cert-file' of https://github.com/the-kenny/nixpkgs into staging 
Standardize NixOS on using only SSL_CERT_FILE for the trusted SSL certificate store.
 2014-11-27 13:29:50 +01:00
wmertens 45c1b9147f Merge pull request #5130 from wmertens/git-ssl-env 
Let git use $SSL_CERT_FILE
 2014-11-27 13:24:08 +01:00
Wout Mertens 72b81cf8bb Remove unnecessary $GIT_SSL_CAINFO from sys env 2014-11-26 00:30:07 +01:00
Wout Mertens 272f2c365c git: Support $SSL_CERT_FILE 2014-11-26 00:29:37 +01:00
wmertens 53488aa023 Merge pull request #5026 from robberer/pkgs/hdf5 
hdf5: move to a more stable URL
 2014-11-18 14:07:13 +01:00
wmertens 0b34eb1493 Allow starting a shell on stage 1 failure 
When people copy the ISO to USB it can happen that the root device isn't known. Having a shell greatly improves that situation.
 2014-11-15 00:14:26 +01:00
wmertens dda62c451c Re-enable ZFS in installer image 
Hopefully #4807 fixes http://hydra.nixos.org/build/16883184
 2014-11-13 10:31:15 +01:00
wmertens 5c19521c6e Merge pull request #4807 from wizeman/u/zfs-improvements 
ZFS improvements
 2014-11-13 10:26:30 +01:00
wmertens ded8797d0f Merge pull request #4944 from aflatter/enable-leiningen-on-darwin 
Allow leiningen to build on darwin
 2014-11-11 16:08:43 +01:00
wmertens e13f15b43a Merge pull request #4839 from cdepillabout/fcitx-with-plugins-2 
Create wrapper package for fcitx with plugins.
 2014-11-05 13:44:44 +01:00
Wout Mertens c04e492898 stdenv: Prevent issues like #4266 
Don't preserve hardlinks, and instead use reflinks if they're available.
 2014-10-31 11:13:03 +01:00
Wout Mertens 6d4b7d3af1 libpcap: Force detection on Darwin 2014-10-28 22:29:05 +01:00
wmertens 114a775254 Merge pull request #4544 from k0ral/webkitgtk 
webkitgtk: 2.4.6 -> 2.6.1
 2014-10-28 09:36:02 +01:00
wmertens e20e0470bf travis build: oops 
Evaluation is too long - shouldn't have removed /dev/nulling

I wish I had a travis test environment :sad:
 2014-10-15 18:50:28 +02:00
wmertens b084b39375 travis build: Revert silly idea 
nox-review should review against master, it's travis that should check out a hydra-available master commit to set the PR on. Perhaps we could rebase the current HEAD on the hydra-built commitish instead?
 2014-10-15 18:45:13 +02:00
wmertens 5e6b6df33e Travis build: source environment before build 
💩
 2014-10-15 11:52:23 +02:00
Wout Mertens 3de73cb77d Travis: Make it work with non-PR 2014-10-15 11:23:34 +02:00
Wout Mertens 0083284ad8 Travis: chop build in install and build phases 
This allows us to see how long install takes.
Also, build from hydra binaries as much as possible.
 2014-10-15 11:05:12 +02:00
wmertens e6d15e9d28 travis build: Silence git 
Last one I promise 😁
 2014-10-14 15:00:56 +02:00
wmertens e3563e6c23 travis build: More silence 2014-10-14 14:54:14 +02:00
wmertens 9fc5cc6576 travis build: Make curl silent (but report errors) 2014-10-14 14:31:43 +02:00
wmertens 5e6b9c47a5 Merge pull request #4513 from user318/master 
new perl package App::perlbrew with deps
 2014-10-14 14:17:08 +02:00
Wout Mertens d6d8aef47b libpcap: Don't force Linux pcap type 
Fixes building on Darwin #4515
 2014-10-14 13:40:41 +02:00
wmertens 36641d9e69 setup-etc.pl: Fail when symlink/rename fails 
When atomicSymlink can't symlink or rename, it should return failure. This is then handled with `... or die` and `... or warn`
 2014-10-06 08:00:11 +02:00
wmertens 6320c4a980 kde-workspace: Use automatic version (close #4383) 
See https://github.com/NixOS/nixpkgs/pull/4265#discussion_r18430068

This should work but I didn't test it 😁
 2014-10-05 17:05:40 +02:00
Wout Mertens d2467f4fe5 Python on Darwin: Don't depend on glibc locales 2014-09-29 14:05:32 +02:00
Wout Mertens cfe7441729 Add maintainer and platforms 2014-07-12 15:44:48 +02:00
Wout Mertens ce81993a6b glmark2: Add glmark2 2014.03 2014-07-12 10:04:28 +02:00
Wout Mertens a45d48fe08 Google hangouts: Bump to 5.4.2.0 
Verified working with Firefox, however it still doesn't work with
Chromium because of the NPAPI vs PPAPI thing.

Chrome's Pepper Plugin API doesn't seem to look for
plugins in the MOZ_PLUGIN_PATH, anyway I left them there for others to
find the solution :-)
 2014-07-08 22:31:16 +02:00
Wout Mertens 8e7fded9c9 vte: store patch in repo, source offline 2014-06-30 16:10:50 +02:00
Wout Mertens ea4207f7a3 makeself: bump to 2.2.0 2014-06-30 16:10:04 +02:00
wmertens 147fd1ff12 virtualbox: Fix permissions for /dev/vboxdrvu 
See https://bugs.archlinux.org/task/38314 and https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Installer/linux/installer-common.sh?rev=47894#L28
 2014-06-25 15:52:05 +02:00
Wout Mertens f34e801dd1 kde: Make kde4_next desktop compile 2014-06-22 19:35:31 +02:00
Wout Mertens ab184b3388 kde: Allow kde_next as a desktop environment 2014-06-22 19:28:18 +02:00
Wout Mertens 8dcf70f918 kde: Some tweaks to kde-manifest.sh 
- Allow packages with different versions than $release (kde-workspace)
- Extra checks
 2014-06-19 19:50:38 +02:00
Wout Mertens 8fe3bd5aa4 kde: Copy 4.12 to 4.13 as a base 2014-06-19 15:27:00 +02:00
Wout Mertens d619f0ef6d sublime3: fix plugin_host (close #2804) 
Also move the binaries in their own package, so it doesn't pollute the
profile.
 2014-06-17 21:15:37 +02:00
Wout Mertens 84b8a9ceb0 pgadmin: bump to 1.18.1 2014-06-10 15:31:48 +02:00
wmertens 8ad1a0ceaf swig: enable on Darwin (close #2326) 
Verified on OS X 10.9.2 to build and check, dependents build fine too.

@vcunat enabled doCheck as it works for him on x86_64-linux;
also did style nitpick modification, and changed platforms to .all
according to the homepage http://www.swig.org/compat.html
 2014-05-26 21:50:27 +02:00
wmertens 7fafc6ff85 monit: bump 5.8 -> 5.8.1 (bug fixes) 2014-05-25 19:27:10 +02:00
Wout Mertens d04c84d0ac Recode: Build on OS X 2014-05-16 23:28:19 +02:00
Wout Mertens c927cee2c3 dhcpcd: Allow adding hook code 2014-05-12 15:03:42 +02:00
Wout Mertens 1e711ee42d Fix OpenSSL requirement 2014-05-09 22:47:45 +02:00
Wout Mertens 6ab576b702 Monit: Bump to 5.8 
- Use callPackage etc
- Make PAM optional
 2014-05-04 09:53:26 +02:00
Wout Mertens e017139e70 Add wmertens to maintainers 2014-05-04 09:50:58 +02:00