Commit Graph

34412 Commits

Author SHA1 Message Date
Shea Levy
3c8f5c2471 Merge branch 'fasd' of https://github.com/ellis/nixpkgs
Create package for 'fasd'
2014-03-15 15:52:41 -04:00
Ellis Whitehead
44b6766f5d Create package for 'fasd' 2014-03-15 20:33:10 +01:00
Shea Levy
3c4be425db Merge branch 'master.rpm' of git://github.com/wkennington/nixpkgs
rpm: Upgrade from 4.7.2 -> 4.11.2
2014-03-15 13:25:43 -04:00
Shea Levy
dddb4f45e9 Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs
Bump wqy-zenhei font to the latest version and add wqy-microhei
2014-03-15 13:22:31 -04:00
Shea Levy
80ed0ff85f Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs
Ocaml oasis
2014-03-15 13:14:14 -04:00
Shea Levy
edb14763ad Merge branch 'ocaml-extlib' of git://github.com/maggesi/nixpkgs
Update OCaml ExtLib to version 1.6.1
2014-03-15 13:08:38 -04:00
Shea Levy
389c3951a8 Merge branch 'coq' of git://github.com/thoughtpolice/nixpkgs
coq: 8.4pl2 -> 8.4pl3
2014-03-15 13:03:10 -04:00
Ricardo M. Correia
e76c059b23 grsecurity: Fix grsec-path.patch to apply with newest patches 2014-03-15 18:01:47 +01:00
Shea Levy
7f39579931 Merge branch 'master.ccid' of git://github.com/wkennington/nixpkgs
ccid: Update from 1.4.14 -> 1.4.15
2014-03-15 12:40:46 -04:00
Bjørn Forsman
395618890b gpsd: update meta attributes
* Don't repeat package name in description
* longDescription re-copied from homepage (gpsd now supports AIS...)
* The homepage has moved
* Add platforms and maintainers
2014-03-15 17:35:55 +01:00
Bjørn Forsman
c54b9b7b60 gpsd: update 2.95 -> 3.10
Build system is changed, gpsd uses scons now.

The expressions needs some more work, TODO comments added. (xgps didn't
work before this change either.)

I added an option for the gpsd group, which is set to upstream default:
"dialout". Note that our default gpsd user is "gpsd", while upstream
uses "nobody" by default.
2014-03-15 17:35:55 +01:00
Shea Levy
da184a455f Merge branch 'vmpk' of git://github.com/iyzsong/nixpkgs
add vmpk 0.5.1, a virtual midi piano keyboard
2014-03-15 12:22:18 -04:00
Shea Levy
291b6bd7cd Merge branch 'patch-1' of git://github.com/msackman/nixpkgs
Update serfdom to 0.5.0
2014-03-15 12:13:29 -04:00
Anders Claesson
2985f31b1c Add haskell library terminal-size. 2014-03-15 16:05:02 +00:00
Vladimír Čunát
6246fad9c7 liferea: fix crash when opening file dialogs
The same schema issue as always in gtk3 dialogs.
2014-03-15 15:09:03 +01:00
Shea Levy
a330e244ad Revert "Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs"
nix-run's functionality is subsumed by nix-shell -p.

This reverts commit 3cc2b243c7, reversing
changes made to 4d5d6aed29.
2014-03-15 08:15:22 -04:00
Matthew Sackman
89f0c9a8b6 Update serfdom to 0.5.0. 2014-03-15 10:57:27 +00:00
Vladimír Čunát
ec0116f99d xfce4-power-manager: put patch into nixpkgs
It's generated by cgit, which adds cgit version to the end,
and I see no way to avoid that silly behavior.
2014-03-15 11:48:49 +01:00
Peter Simons
f1a30454f6 Merge pull request #1942 from thoughtpolice/fixups
Trivial fixes for my packages
2014-03-15 09:35:35 +01:00
Peter Simons
189fe46ab1 haskell-snowball: re-generate with cabal2nix 2014-03-15 09:15:52 +01:00
Peter Simons
728f3872a3 haskell-wai-middleware-static: re-generate with cabal2nix 2014-03-15 09:15:41 +01:00
Thomas Bereknyei
9dd6e2adef happstack-fastcgi: add version 0.1.5 2014-03-15 09:13:15 +01:00
Peter Simons
4d03052c9c ghc: update HEAD snapshot to 7.9.20140313 2014-03-15 09:11:47 +01:00
宋文武
9ce62a1ae6 add vmpk 0.5.1, a virtual midi piano keyboard 2014-03-15 13:13:25 +08:00
William A. Kennington III
9d42f2e5fc ccid: Update from 1.4.14 -> 1.4.15 2014-03-14 23:45:48 -05:00
Ricardo M. Correia
ceec014020 grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403122114 -> 3.0-3.2.55-201403142107
test:   3.0-3.13.6-201403122116 -> 3.0-3.13.6-201403142112
2014-03-15 04:15:28 +01:00
Ricardo M. Correia
3c97fdc7a8 spl, zfs: Add myself as a maintainer 2014-03-15 02:01:57 +01:00
Shea Levy
5f0f47994a Merge branch 'pyserial' of git://github.com/ambrop72/nixpkgs
Update pyserial to 2.7
2014-03-14 20:20:07 -04:00
Shea Levy
d1e88c4625 Unconditionally compile itk with shared libs 2014-03-14 20:18:17 -04:00
ambrop7@gmail.com
0f7efa31d5 Update pyserial to 2.7. 2014-03-15 01:14:43 +01:00
Shea Levy
645d54c35d Merge branch 'itk-shared' of git://github.com/jacobhinkle/nixpkgs
Added sharedLibs option to ITK
2014-03-14 20:11:33 -04:00
Shea Levy
f2930e661a Merge branch 'haskell-scrypt' of git://github.com/hrdinka/nixpkgs
haskell-scrypt: add version 0.5.0
2014-03-14 20:10:25 -04:00
Shea Levy
e742265234 Merge branch 'haskell-snowball' of git://github.com/hrdinka/nixpkgs
haskell-snowball: add version 1.0.0.1
2014-03-14 20:08:58 -04:00
Shea Levy
ad3d9755a9 Merge branch 'master' of git://github.com/hrdinka/nixpkgs
haskell-wai-websockets: add version 2.1.0

and

haskell-leveldb-haskell: add version 0.3.0
2014-03-14 20:05:46 -04:00
Shea Levy
7939ca1e99 Merge branch 'update-java7' of git://github.com/bennofs/nixpkgs
oraclejdk7: add missing dependencies
2014-03-14 20:04:22 -04:00
Shea Levy
04fe6405e4 Merge branch 'ocaml-updates' of git://github.com/maggesi/nixpkgs
Make OCaml 4.01.0 the default version of OCaml
2014-03-14 19:58:02 -04:00
Shea Levy
6da2d89016 Merge branch 'postgresql93-ossp-uuid-clean' of git://github.com/basvandijk/nixpkgs
Configure postgresql-9.3 with support for the ossp-uuid module

Conflicts:
	pkgs/servers/sql/postgresql/9.3.x.nix
2014-03-14 19:52:43 -04:00
Shea Levy
5a38bfdb9c Merge branch 'darcsum' of git://github.com/falsifian/nixpkgs
Added darcsum, "a pcl-cvs like interface for managing darcs patches".
2014-03-14 19:42:27 -04:00
Shea Levy
602cf8d78c Merge branch 'u/zfs-import' of git://github.com/wizeman/nixpkgs
zfs: Misc fixes
2014-03-14 19:40:34 -04:00
Shea Levy
0c12dd3ded Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs
systemd: python support & journal http gateway

Conflicts:
	nixos/modules/misc/ids.nix
2014-03-14 19:16:59 -04:00
Christoph Hrdinka
b89bfdf2c2 haskell-scrypt: add version 0.5.0 2014-03-15 00:10:06 +01:00
Christoph Hrdinka
eeecf8f6ca haskell-snowball: add version 1.0.0.1 2014-03-15 00:07:18 +01:00
Christoph Hrdinka
fa9335e441 haskell-leveldb-haskell: add version 0.3.0 2014-03-14 23:59:58 +01:00
Christoph Hrdinka
65bb4ce47b haskell-wai-websockets: add version 2.1.0 2014-03-14 23:56:42 +01:00
Shea Levy
3cc2b243c7 Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs
Add nix-run and myEnvRun
2014-03-14 18:52:50 -04:00
Shea Levy
4d5d6aed29 Merge branch 'vimPlugins.YouCompleteMe/update' of git://github.com/offlinehacker/nixpkgs
vimPlugins.YouCompleteMe: update to ee12530df0

Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-03-14 18:50:21 -04:00
Shea Levy
da17e151d8 Merge branch 'pkgs/openvpn/openvpn_learnaddress' of git://github.com/offlinehacker/nixpkgs
add openvpn_learnaddress script
2014-03-14 18:39:28 -04:00
Jacob Hinkle
f5edf3244f Added sharedLibs option to ITK 2014-03-14 16:29:24 -06:00
Bjørn Forsman
562f937d21 openscad: bump 2013.06 -> 2014.03
openscad now depends on glib, and it needs pkgconfig to find glib.
2014-03-14 22:21:15 +01:00
Ricardo M. Correia
17b473449b Add myself as maintainer of pkgs I wish to keep up-to-date 2014-03-14 21:22:09 +01:00