Commit Graph
100 Commits
Author SHA1 Message Date
Domen Kožar bbc1df3092 Merge branch 'staging' 2015-05-25 11:33:05 +02:00
Domen Kožar 44660d7b90 Merge pull request #7983 from ctheune/submit/syncthing-0.11.6
Update syncthing to 0.11.6
2015-05-25 11:29:35 +02:00
Domen Kožar 0f6f4004f3 Merge pull request #7936 from thinkpad20/set_arbitrary_env_variables_python
Add makeWrapperArgs argument to buildPythonPackage
2015-05-25 10:32:09 +02:00
Domen Kožar 649ce300e3 Merge pull request #7587 from dezgeg/pr-refind
refind: Fix build on i686
2015-05-24 23:43:10 +02:00
Domen Kožar 50be522a51 libvterm: set platforms 2015-05-24 18:55:53 +02:00
Domen Kožar c918903381 python: 2.7.9 -> 2.7.10 2015-05-24 18:55:53 +02:00
Domen Kožar 7ccbeb4d6f Merge pull request #7967 from thinkpad20/python_wrap_docs
adding docs to python wrap.sh
2015-05-24 12:06:32 +02:00
Domen Kožar 42d9fe8b09 gevent: 1.0.1 -> 1.0.2 2015-05-23 14:30:49 +02:00
Domen Kožar 43a150c05a zed: 1.0.0 -> 1.1.0 2015-05-21 21:13:40 +02:00
Domen Kožar 8f648b2d14 rbtools: 0.7.1 -> 0.7.2 2015-05-19 15:26:02 +02:00
Domen Kožar f26476f7d4 Merge pull request #7871 from joelmo/scipy
scipy: 0.14.0 -> 0.15.1
2015-05-17 17:59:33 +02:00
Domen Kožar 3efefb5baa greenlet: delete problematic test 2015-05-16 20:56:53 +02:00
Domen Kožar 4c67102a59 pythonPackages.greenlet: 0.4.5 -> 0.4.7 2015-05-16 20:34:40 +02:00
Domen Kožar ea2c17571d miniupnp{c,d}: bump 2015-05-16 20:34:40 +02:00
Domen Kožar 1194ebc7ef 15.05 release is now 15.06 2015-05-14 20:30:18 +02:00
Domen Kožar 3dc204f42e fix eval 2015-05-14 20:21:56 +02:00
Domen Kožar f5edc27298 Merge pull request #7844 from rushmorem/mesos-0.22-fix
Fix mesos-0.22 build and update to 0.22.1
2015-05-14 20:00:19 +02:00
Domen Kožar 38d9663367 gtkvnc: add libgpgerror as dependency 2015-05-13 19:19:08 +02:00
Domen Kožar fc276c7aab wordnet: mark as broken 2015-05-13 18:46:59 +02:00
Domen Kožar d769b52307 python: pass stdenv.glibc to crypt module to expose crypt.so 2015-05-13 18:39:50 +02:00
Domen Kožar 07338d13c9 Merge branch 'staging' 2015-05-11 10:05:33 +02:00
Domen Kožar bb4d658f64 Merge branch 'master' into staging
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
Domen Kožar b7f15c43da fix evals /cc @ttuegel 2015-05-10 13:46:32 +02:00
Domen Kožar 4f2b49744d docker: fix build 2015-05-10 13:46:32 +02:00
Domen Kožar 5c6f159cd5 subunit: split package into everything and python lib 2015-05-10 13:46:30 +02:00
Domen Kožar 4827deaf00 pythonPackages: a bunch of build fixes 2015-05-10 13:46:30 +02:00
Domen Kožar f550eb7fde docker: fix build 2015-05-10 12:41:21 +02:00
Domen Kožar 5a330ad306 Merge pull request #7724 from berdario/python-wide-builds
Enable old pythons' wide builds
2015-05-10 12:18:02 +02:00
Domen Kožar 90ee280913 subunit: split package into everything and python lib 2015-05-10 11:39:42 +02:00
Domen Kožar 7142d47991 pythonPackages: a bunch of build fixes 2015-05-10 10:11:29 +02:00
Domen Kožar 7bda733f8b Merge pull request #7782 from olcai/python-azure
python-packages: azure 0.10.0 -> 0.10.2
2015-05-10 09:18:34 +02:00
Domen Kožar 646ae5458c Merge pull request #7783 from olcai/icalendar
python-packages: icalendar 3.8.4 -> 3.9.0
2015-05-10 09:17:28 +02:00
Domen Kožar 25408d4146 Merge pull request #7753 from Lassulus/my-15.05pre61665.4c01e6d
s3fs: fix typo in name
2015-05-08 10:42:07 +02:00
Domen Kožar b5eca243de Merge pull request #7704 from codyopel/vaapi-intel
libva-intel-driver: refactor
2015-05-06 11:30:17 +02:00
Domen Kožar bc453c868e Merge pull request #7720 from Ralith/libuv
libuv: version 1.4.2
2015-05-06 11:29:52 +02:00
Domen Kožar ce688330fb Merge pull request #7725 from willtim/master
xss-lock: upstream fix: exit when X connection dies
2015-05-06 11:29:35 +02:00
Domen Kožar d13385caf3 Merge pull request #7713 from Havvy/patch-3
Docs: non-empty value -> true
2015-05-05 23:26:28 +02:00
Domen Kožar dfd4ada456 kde4: fix cantor build 2015-05-05 13:05:54 +02:00
Domen Kožar ee0ecb520e gnome3.gdm: remove a patch since X supports access control now 2015-05-05 12:40:21 +02:00
Domen Kožar 3a080a2d89 gnome3_16.geary: add missing params (gcr is still not picked up 2015-05-05 12:18:14 +02:00
Domen Kožar befacbba0d gnome3.tracker: pass correct automake 2015-05-05 11:50:58 +02:00
Domen Kožar 21a7e39b0b Merge pull request #7658 from benley/jenkins-job-builder
New package: jenkins-job-builder
2015-05-04 10:34:52 +02:00
Domen Kožar 36e2a9d3bd Merge pull request #7656 from joachifm/redundant-docutils
Delete redundant docutils expression
2015-05-03 04:36:05 +02:00
Domen Kožar f69cfbfa15 Merge pull request #7631 from KaiSforza/git-remote-hg
git-remote-hg: remove dbus, install built docs
2015-05-02 14:44:03 +02:00
Domen Kožar ea8441fe6b Merge pull request #7661 from johbo/dmd-darwin
Be able to compile dmd on darwin, update dmd
2015-05-02 14:43:31 +02:00
Domen Kožar 00ef77f426 Merge pull request #7565 from offlinehacker/nixos/confd/module
nixos: add confd module
2015-05-02 14:43:02 +02:00
Domen Kožar ff88f4bcda nixos-install: correctly detect stdin 2015-04-29 18:48:21 +02:00
Domen Kožar 8842cce864 Merge pull request #7629 from globin/vagrant-update
update vagrant to 1.7.2
2015-04-29 14:55:15 +02:00
Domen Kožar fdebf37953 Merge pull request #7610 from hbunke/goobook
pythonPackages: fixed and updated goobook
2015-04-28 13:57:44 +02:00
Domen Kožar b27699241d Merge pull request #7573 from vbgl/boost_python
boost: use ${python.interpreter} rather than ${python}/bin/python
2015-04-25 23:06:46 +02:00
Domen Kožar ff12c3274a Merge pull request #7548 from offlinehacker/etcdfix
nixos/etcd: fix enable type, so it could be enabled on multiple places
2015-04-25 22:14:55 +02:00
Domen Kožar 600d73df41 Merge pull request #7551 from offlinehacker/pkgs/node-packages/add
node-packages: updates
2015-04-25 21:55:25 +02:00
Domen Kožar 02b478e2c1 Merge pull request #7560 from offlinehacker/pkgs/docker/update
docker: update to 1.6.0
2015-04-25 21:53:43 +02:00
Domen Kožar 69777a7cb4 Merge pull request #7484 from seppeljordan/re#4505
Document about packageOverrides (re issue #4505)
2015-04-24 11:20:41 +02:00
Domen Kožar a23b6cebfb Merge pull request #7523 from cwoac/btsync
wait for filesystem before starting btsync; bump to new package version
2015-04-23 17:22:51 +02:00
Domen Kožar f39b1ead2a manual: re-add running nixos tests sections 2015-04-21 02:28:59 -04:00
Domen Kožar 0207f0ad8f Merge pull request #7206 from 4e6/xdg-utils/src-http
xdg-utils: http-based fetchgit url
2015-04-17 16:28:08 -04:00
Domen Kožar a914bd8311 django: add 1.8 2015-04-16 14:10:19 -04:00
Domen Kožar c1e716bfb9 django: don't wrap template scripts, fixes #3134 2015-04-16 14:10:19 -04:00
Domen Kožar a83f55af1c node: set interpreterName for 0.10 2015-04-16 12:43:04 -04:00
Domen Kožar 0206245aba Revert "Fix buildPythonPackage overriding."
This reverts commit 6a1de6d4a7.

It broke eval
2015-04-14 15:02:49 -04:00
Domen Kožar f25e4b1f21 Merge pull request #7381 from teh/master
Fix buildPythonPackage overriding.
2015-04-14 14:11:01 -04:00
Domen Kožar 43fdebfe07 Merge pull request #7364 from k0ral/wget
wget: 1.16 -> 1.16.3
2015-04-13 18:12:06 -04:00
Domen Kožar c6512f7df3 buildPythonPackage: propagate setuptools 2015-04-12 21:15:36 -04:00
Domen Kožar ee69867e98 Merge pull request #7320 from nslqqq/i3update
i3: fix testsuite
2015-04-11 10:18:27 -04:00
Domen Kožar a9bcb92cb3 Merge pull request #7194 from nslqqq/i3update
i3: 4.9.1 -> 4.10.1
2015-04-11 07:36:12 -04:00
Domen Kožar 87e9925d4a Merge pull request #7316 from nslqqq/fix_xephyr2
xorg: fix Xephyr
2015-04-11 07:35:51 -04:00
Domen Kožar 4dc215baed Merge pull request #7310 from rycee/fira-update
Update 'fira' from 4.004 to 4.1.
2015-04-10 15:04:38 -04:00
Domen Kožar 86998c7075 Merge pull request #6858 from NixOS/kernel/longterm
linuxPackages: point to latests longterm kernel 3.18
2015-04-10 07:36:28 -04:00
Domen Kožar dffd41334f Merge pull request #7301 from titanous/bump-makemkv
makemkv: 1.9.1 -> 1.9.2
2015-04-10 00:45:22 -04:00
Domen Kožar 7fda708ec9 Merge pull request #7255 from AndersonTorres/primecoin
Primecoin (0.8.6): New Package
2015-04-09 19:28:52 -04:00
Domen Kožar 95f9f41b84 Merge pull request #7273 from abbradar/linux-btrfs
Add patch to fix btrfs deadlocks to affected kernels
2015-04-08 20:15:52 +02:00
Domen Kožar bcc1d0339b Merge pull request #7266 from codyopel/sublime
sublimetext3: add .desktop entry & icon
2015-04-08 17:43:06 +02:00
Domen Kožar 158d444f78 Merge pull request #7262 from desiderius/colander-1.0
python-packages: update colander-1.0b to 1.0
2015-04-08 17:42:45 +02:00
Domen Kožar 59d7189b21 Merge pull request #7253 from doublec/tor
Update tor to 0.2.5.12
2015-04-08 03:02:18 +02:00
Domen Kožar 2b5fc4fd73 Merge pull request #7187 from arno01/php5439
php: Update to 5.4.39
2015-04-07 12:38:05 +02:00
Domen Kožar 42c421adc3 Merge pull request #7180 from jagajaga/fix_generator
Fixing nixos-generate-config
2015-04-07 12:24:04 +02:00
Domen Kožar 25ece970a8 Merge pull request #7209 from bjornfor/update-slic3r
slic3r: update 1.2.1 -> 1.2.6
2015-04-07 12:20:38 +02:00
Domen Kožar 13b68e727f Merge pull request #7231 from olcai/update-python-azure
python-packages: azure 0.9.0 -> 0.10.0
2015-04-07 12:19:18 +02:00
Domen Kožar 46f4e26154 Merge pull request #7233 from joachifm/apparmor-perl
apparmor: perl support
2015-04-07 11:54:49 +02:00
Domen Kožar 20e8e71c96 Merge pull request #7230 from codyopel/chromaprint
chromaprint: 1.1 -> 1.2
2015-04-07 11:31:13 +02:00
Domen Kožar 5356011eb5 Merge pull request #7216 from jagajaga/master
Cosmetic changes
2015-04-07 11:21:55 +02:00
Domen Kožar 64c0e6b7fa Merge pull request #7219 from rzetterberg/development
Removes python 2.7 block in favor of "disabled"
2015-04-07 06:44:44 +02:00
Domen Kožar ad197d89ae Merge pull request #7181 from jagajaga/teamviewer
Teamviewer
2015-04-06 14:13:07 +02:00
Domen Kožar 7c7f426b3f Merge pull request #7164 from rzetterberg/master
Fixes minetest mesa 10.* incompatibility, adds minetest server service
2015-04-06 10:46:26 +02:00
Domen Kožar 4c449b86ea Merge pull request #7173 from ryantm/fetchurlGnome
Get rid of fetchurlGnome
2015-04-05 10:03:37 +02:00
Domen Kožar b9e0e67604 ftp://xmlsoft.org -> http://xmlsoft.org 2015-04-04 16:07:31 +02:00
Domen Kožar 6e59d43725 gnome3.tracker: fix poppler/glib dependency 2015-04-03 17:38:55 +02:00
Domen Kožar 7cc31b6b49 fix eval 2015-04-02 22:30:28 +02:00
Domen Kožar c80277c509 Merge pull request #7106 from kevinmarsh/nameparser
Add nameparser python package
2015-04-02 09:52:13 +02:00
Domen Kožar 06a810659c Merge pull request #7102 from oxij/fix-fixed-notmuch
pythonPackages: notmuch: revert 6258728, move sourceRoot setting to top-level
2015-04-01 07:14:25 +02:00
Domen Kožar 9bbf60c80e Merge pull request #7109 from ctheune/submit/update-ruby-doc
Update the ruby packaging docs to show how to bundle Ruby Gem-based
2015-03-31 19:08:22 +02:00
Domen Kožar a87e2ae717 fix eval 2015-03-31 18:20:43 +02:00
Domen Kožar 146eb665d0 Revert "cups: 1.7.5 -> 2.0.2"
This reverts commit 032859faba.

Conflicts:
	pkgs/misc/cups/default.nix

Breaks nixos printing tests, see
https://github.com/NixOS/nixpkgs/commit/032859faba7174ef69f96b53bc07d544fba5e871#commitcomment-10495609
2015-03-31 16:51:07 +02:00
Domen Kožar c31f1d99a5 fix linux 3.2/3.4 builds 2015-03-29 21:41:05 +02:00
Domen Kožar d06ced99cd Merge pull request #7049 from risicle/djangoaddons
add packages django_classytags & django_reversion
2015-03-28 20:03:11 +01:00
Domen Kožar 883ee4dd72 Merge pull request #6994 from oxij/trivial-package-fixes
Trivial package fixes
2015-03-27 11:09:16 +01:00
Domen Kožar ba5134c8e0 Merge pull request #7021 from taktoa/master
Added package for willie
2015-03-27 09:39:55 +01:00
Domen Kožar d60b1f9589 Merge pull request #6999 from risicle/django17py27
django: minimum supported python version for django 1.7 is 2.7
2015-03-27 00:37:39 +01:00
Domen Kožar 636b25af67 fira: 4.002 -> 4.004 2015-03-26 11:55:39 +01:00