summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Add user attribute isNormalUserEelco Dolstra2014-08-15
* Unify mutableUsers = { true, false }Eelco Dolstra2014-08-15
* Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-08-15
|\
| * Don't silently ignore errors from the activation scriptEelco Dolstra2014-08-15
| * nixos-container destroy: Remove gcrootsEelco Dolstra2014-08-15
| * plan9port: fix eval (license typo)Vladimír Čunát2014-08-15
| * zotero: add check to detect xul version breakagesVladimír Čunát2014-08-15
| * merge #3462: zotero update and resurrect xulrunnerVladimír Čunát2014-08-15
| |\
| | * firefox: bring back version 30.0 for zoteroThomas Tuegel2014-08-04
| | * zotero: version bump 4.0.21.1 -> 4.0.21.2Thomas Tuegel2014-08-04
| * | Add taskserver package (close #3269)Daniel P. Wright2014-08-15
| * | plowshare: version bumpSergey Mironov2014-08-15
| * | merge #3340: bitcoin: minor updateVladimír Čunát2014-08-15
| |\ \
| | * | fixing whitespaceSam Griffin2014-07-21
| | * | updating bitcoin to 0.9.2.1Sam Griffin2014-07-21
| * | | plan9port: enableParallelBuilding, improve metaVladimír Čunát2014-08-15
| * | | licenses: add LPL-102Vladimír Čunát2014-08-15
| * | | merge #3416: plan9port: updateVladimír Čunát2014-08-15
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://github.com/vvanpo/nixpkgs into plan9portVictor van Poppelen2014-08-01
| | |\ \ \
| | * | | | plan9port: builder.sh called install script twice, meaning a redundant recomp...Victor van Poppelen2014-07-31
| | * | | | plan9port:Victor van Poppelen2014-07-31
| * | | | | merge #3428: nano: bump and add system-wide configVladimír Čunát2014-08-14
| |\ \ \ \ \
| | * | | | | nano: bump to version 2.3.6Joachim Fasting2014-08-01
| | * | | | | nano: support system-wide nanorcJoachim Fasting2014-08-01
| * | | | | | Merge pull request #3101 from cstrahan/xquartzJohn Wiegley2014-08-14
| |\ \ \ \ \ \
| | * | | | | | fix mesa_driversCharles Strahan2014-08-13
| | * | | | | | get xorg/x11 working on DarwinCharles Strahan2014-08-12
| * | | | | | | ffmpeg: maintenance updateVladimír Čunát2014-08-14
| * | | | | | | sl: fix license (close #3072)Vladimír Čunát2014-08-14
* | | | | | | | gobject-introspection: refer to shlibs with absolute paths in typelibsLuca Bruno2014-08-14
* | | | | | | | Merge branch 'master' into stagingLuca Bruno2014-08-14
|\| | | | | | |
| * | | | | | | gpaste: new packageLuca Bruno2014-08-14
| * | | | | | | gnome3: add services.xserver.desktopManager.gnome3.sessionPathLuca Bruno2014-08-14
| * | | | | | | eiskaltdcpp: set platforms.all, fix descriptionVladimír Čunát2014-08-14
| * | | | | | | Add eiskaltdcpp, a p2p client for the DC protocolFlorian Richter2014-08-14
| * | | | | | | dwb: update meta sectionPascal Wittmann2014-08-14
| * | | | | | | licenses: fixup double isc definitionVladimír Čunát2014-08-14
| * | | | | | | merge #3074: dhcp: update to the latest versionVladimír Čunát2014-08-14
| |\ \ \ \ \ \ \
| | * | | | | | | dhcp: Update meta information and add maintainershipWilliam A. Kennington III2014-08-13
| | * | | | | | | license: Add iscWilliam A. Kennington III2014-08-13
| | * | | | | | | nixos/dhcpd: Wait until network interfaces are configured to startWilliam A. Kennington III2014-08-13
| | * | | | | | | nixos/dhcpd: Convert to systemd from upstartWilliam A. Kennington III2014-08-13
| | * | | | | | | nixos/dhcpd: Use dhcp user instead of nobodyWilliam A. Kennington III2014-08-13
| | * | | | | | | nixos/dhcpd: Add the ability to drop privilegesWilliam A. Kennington III2014-08-13
| | * | | | | | | nixos/dhcp: Modernize ddns-update-styleWilliam A. Kennington III2014-08-13
| | * | | | | | | dhcpd: Update 4.1-ESV-R6 -> 4.3.0William A. Kennington III2014-08-13
| * | | | | | | | pidgin-latex-sf: bump reversion, url and hashEdward O'Callaghan2014-08-14
| * | | | | | | | clementine: version bump 1.2.1 -> 1.2.3 (close #3570)Thomas Tuegel2014-08-14
| * | | | | | | | add pythonPackages.toxDomen Kožar2014-08-14
| * | | | | | | | lyx: major update and some fixesVladimír Čunát2014-08-14