Commit Graph
100 Commits
Author SHA1 Message Date
Domen Kožar b2ae0ca206 Merge pull request #8684 from MasseGuillaume/master
Following name convention for popcorntime
2015-07-07 15:32:04 +01:00
Domen Kožar 2936e01bc8 Merge pull request #8677 from MasseGuillaume/master
Build popcorntime from ci until yts movie outage is fixed
2015-07-07 13:27:15 +01:00
Domen Kožar 87697fb583 Merge pull request #8399 from anderspapitto/pr
dont test i3
2015-07-06 12:35:32 +01:00
Domen Kožar 3ff2dfb7fa Merge pull request #8423 from bobvanderlinden/popcorntime-bin
added popcorntime package
2015-06-28 10:01:45 +02:00
Domen Kožar f895960e84 Merge pull request #8256 from dezgeg/pr-i686-kconfig
kernel-config: Fix 4.0 build on 32-bit
2015-06-26 13:23:35 +02:00
Domen Kožar a6d718c319 Merge pull request #8454 from jb55/obs-studio-fix
obs-studio: fix regression
2015-06-22 08:39:27 +02:00
Domen Kožar eb6be740ec CONTRIBUTING.md: fix style 2015-06-21 14:39:46 +02:00
Domen Kožar 75f4709fe3 CONTRIBUTING.md: mostly style fixes 2015-06-21 14:38:20 +02:00
Domen Kožar 4eeb4c88aa Merge pull request #8436 from dezgeg/pr-travis-oom
travis-nox-review-pr: Try to detect if the build ran out of memory
2015-06-21 09:26:25 +02:00
Domen Kožar d99baf3d5c Merge pull request #8439 from joachifm/attic-0_16
attic: 0.15 -> 0.16
2015-06-21 09:25:58 +02:00
Domen Kožar 2959f193a9 update flash player
(cherry picked from commit 48b41f0e9524db37f45818f71aa7b55a9c462900)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-06-21 09:23:06 +02:00
Domen Kožar 6ddb6b5c24 Merge pull request #8440 from travisbhartwell/add/i3-py
i3-py: init at 0.6.4
2015-06-21 09:15:54 +02:00
Domen Kožar 7720c7d75f Merge pull request #8414 from matthiasbeyer/update-hstr
hstr: update from 1.16 to 1.17
2015-06-19 20:25:40 +02:00
Domen Kožar 2f8eadd33d Merge pull request #8412 from matthiasbeyer/update-scim
scim: update from 0.1.8 to 0.1.9
2015-06-19 20:25:19 +02:00
Domen Kožar 101cdcc11a Merge pull request #8361 from brodul/scrolls2
Update scrolls client (src hash change)
2015-06-17 15:02:31 +02:00
Domen Kožar ea77ecc2be Merge pull request #7237 from jagajaga/addition/contributing
CONTRIBUTING.md: initial
2015-06-16 14:16:52 +02:00
Domen Kožar 28a586de4d Merge pull request #8335 from andrewrk/libgroove
add libgroove package
2015-06-16 00:46:01 +02:00
Domen Kožar e0100a0f8d Merge pull request #8297 from rycee/fonts-remove-builderDefsPackage
Remove use of builderDefsPackage in font packages.
2015-06-15 11:44:36 +02:00
Domen Kožar a2deb7a2c9 Merge pull request #8322 from unaizalakain/master
The user specified in the conf should run MPD
2015-06-14 11:41:36 +02:00
Domen Kožar a06bb18ce5 Merge pull request #8274 from k0ral/lsof
lsof: 4.87 -> 4.88
2015-06-11 11:26:18 +02:00
Domen Kožar 8f28742315 Merge pull request #8251 from lancelotsix/fix_networkx
Fix pythonPackages.networkx
2015-06-11 11:24:40 +02:00
Domen Kožar fdc83edd08 Removing python-packages-generated.nix
It was an experiment by @garbas in 2014 that has been forgotten
because of other, newer experiments.

Packages also weren't updated so we shouldn't let them rot in nixpkgs.
2015-06-11 10:42:15 +02:00
Domen Kožar 4227b13af6 pypy: 2.5.1 -> 2.6.0 2015-06-11 10:42:14 +02:00
Domen Kožar 46b05f0e08 Merge pull request #8193 from lostdj/patch-1
bittorrentsync: fix storage_path.
2015-06-07 17:53:19 +02:00
Domen Kožar a96f7c9e0a Merge pull request #8197 from taku0/firefox-bin-libmozgnome
firefox-bin, thunderbird-bin: update patchelf arguments
2015-06-06 21:03:16 +02:00
Domen Kožar baa4d46d21 Merge pull request #8170 from anderspapitto/dunst-fix
make a wrapper so that dunst can find dbus-launch
2015-06-04 13:03:31 +02:00
Domen Kožar a53955eac9 Merge pull request #8167 from richardlarocque/kodi_fix_rebased
kodi: Enable RTMP support
2015-06-04 11:01:44 +02:00
Domen Kožar eb9874389b Merge pull request #8079 from adnelson/pandas_osx
supporting pandas on osx, added test suite
2015-06-04 10:29:01 +02:00
Domen Kožar 23c845f526 Merge pull request #8119 from mbbx6spp/fix-dd-agent-package
Fix dd-agent buildInputs to include pythonPackages.psutil
2015-06-03 09:11:10 +02:00
Domen Kožar d2825dbc73 Merge pull request #8108 from codyopel/sass
update Sassc and libsass
2015-06-02 12:32:26 +02:00
Domen Kožar eb2a02dd4a Merge pull request #8092 from NixOS/nixpkgs-manual-add-section-ids
doc: add section ids
2015-05-31 19:00:01 +02:00
Domen Kožar 64c9485738 Merge pull request #8076 from benley/prometheus-fixdeps
prometheus-mesos-exporter: Fix misplaced dependencies
2015-05-31 13:29:05 +02:00
Domen Kožar fc9e7c9aae Merge pull request #8074 from Ralith/capnproto
capnproto: bump to 0.5.1.2
2015-05-31 13:28:48 +02:00
Domen Kožar b1bbdf876e Merge pull request #8085 from ctheune/submit/syncthing-0.11.7
Update syncthing to 0.11.7
2015-05-31 13:12:04 +02:00
Domen Kožar 289e8716b2 xfce4-power-manager: 1.4.3 -> 1.4.4 2015-05-31 12:15:24 +02:00
Domen Kožar 7ddb84055c Merge pull request #8048 from Bsami/remotes/origin/python2.38.0
Remotes/origin/python2.38.0
2015-05-29 08:52:29 +02:00
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