Lluís Batlle i Rossell
14cd1be498
freecad: update to stable from February, 0.13.1830
2013-05-30 09:56:30 +02:00
Marc Weber
67d41e4424
gpl fix
2013-05-30 01:30:48 +02:00
Vladimír Čunát
a5a7c8ad78
Merge branch 'master' into x-updates
2013-05-29 23:32:05 +02:00
Vladimír Čunát
40d61bfe36
Revert "networkmanager: clean some attrs missing in nixpkgs x-updates"
...
This reverts commit a649bbea4e .
2013-05-29 23:31:47 +02:00
Vladimír Čunát
4a4c9c239e
poppler: minor update
...
Includes some thread safety fixes.
2013-05-29 23:29:57 +02:00
Vladimír Čunát
25471803e4
Merge master into x-updates
2013-05-29 23:25:26 +02:00
Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0 .
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell
a17b45686b
Fixing firefox reference
2013-05-29 23:20:57 +02:00
Bjørn Forsman
8a1409432e
sourcery-codebench: fix installation of manpages
...
Sourcery CodeBench manpages are installed under
share/doc/<target-triplet>/man/. Add symlinks so that the manpages
become available to "man".
NOTE: I use symlinks instead of moving the manpages, because I think
it is best to do as little as possible to prebuilt packages.
2013-05-29 21:58:29 +02:00
Lluís Batlle i Rossell
971337a119
firefox update to 21.0
2013-05-29 21:50:02 +02:00
Lluís Batlle i Rossell
8442c7d122
libgphoto2: adding a 2.4 version, for kde 4.7 and 4.8.
2013-05-29 21:50:02 +02:00
Lluís Batlle i Rossell
4d682cc112
digikam: enable parallel building
2013-05-29 21:50:02 +02:00
Lluís Batlle i Rossell
f54c4c99e3
tcpdmup/libpcap udpate
2013-05-29 19:23:40 +02:00
Lluís Batlle i Rossell
21cb347f20
Adding babeld.
2013-05-29 19:16:02 +02:00
Lluís Batlle i Rossell
08f8371a50
Adding ahcpd.
2013-05-29 19:16:01 +02:00
Shea Levy
d749196f68
buildNodePackage: Utilize the node setup hook
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-29 11:53:36 -04:00
Shea Levy
2f024a2ea9
Update nodePackages
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-29 11:25:34 -04:00
Shea Levy
8e724713c6
Make the function to import npm2nix-generated packages accessible outside of node-packages.nix
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-29 11:22:23 -04:00
Sander van der Burg
2b1eff8e17
Override the KitchenSink's appName
2013-05-29 15:17:37 +02:00
Sander van der Burg
c30eed4b44
Allow one to override the app's name through the appName parameter
2013-05-29 15:16:21 +02:00
Sander van der Burg
a2b8fb3776
It's impossible to guess the name so we add an extra optional parameter to override it
2013-05-29 15:01:55 +02:00
Sander van der Burg
a7895de1fc
Use double quotes to expand wildcards
2013-05-29 14:50:24 +02:00
Sander van der Burg
cf512cf5c2
Use wildcard for the appname
2013-05-29 14:18:35 +02:00
Sander van der Burg
dde4a92c5c
Generate unique derivation names so that we can easily install them from a Nix channel
2013-05-29 13:50:53 +02:00
Peter Simons
317fcd3b86
Merge pull request #559 from bjornfor/mentor-codebench
...
Add Sourcery CodeBench Lite toolchain(s)
2013-05-29 02:17:46 -07:00
Peter Simons
93d7adcba3
Merge pull request #561 from offlinehacker/st
...
st: Update to 0.4.1 and add support for custom config
2013-05-29 02:16:56 -07:00
Peter Simons
b1781a1876
Merge pull request #571 from vcunat/p/hs
...
haskell: add pop3-client and smtp-mail (by cabal2nix)
2013-05-29 02:16:20 -07:00
Evgeny Egorochkin
421fb9d585
Merge pull request #173 from wizeman/apparmor-service
...
Apparmor service fixes
2013-05-28 16:46:30 -07:00
Evgeny Egorochkin
a518e09ec3
Merge pull request #172 from wizeman/apparmor-ping
...
apparmor: Fix broken iputils/ping profile
2013-05-28 16:37:11 -07:00
Domen Kozar
53390a2da9
add networkmanager_openvpn to systemPackages
2013-05-29 00:38:50 +02:00
Shea Levy
5ddae35596
Get node.js building on darwin
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-28 18:38:22 -04:00
Shea Levy
9e01205659
Set library path properly for v8 on darwin
2013-05-28 18:38:22 -04:00
Shea Levy
47cbc4cead
Missed some darwin cflags in gyp
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-28 18:38:22 -04:00
Shea Levy
2794d74506
Fix http_parser build on darwin
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-28 18:38:22 -04:00
Shea Levy
c982e84df4
gyp: Fix on darwin
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-28 18:38:22 -04:00
Shea Levy
fe009bcbc4
cyrus-sasl: Fix build on darwin
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-28 18:38:22 -04:00
Domen Kozar
6cbadc4e23
waitress: 0.8.1 -> 0.8.5
2013-05-29 00:05:31 +02:00
Domen Kozar
637fa11b20
add pdf2htmlex and upgrade poppler
2013-05-29 00:02:26 +02:00
Lluís Batlle i Rossell
e1cb325f82
Adding batctl, control for batman
2013-05-28 23:02:22 +02:00
Lluís Batlle i Rossell
bf0d1f58dc
Adding batman-adv.
2013-05-28 22:58:25 +02:00
Lluís Batlle i Rossell
55eccc68bb
Adding oslrd.
2013-05-28 22:37:59 +02:00
Ricardo M. Correia
0a0beadecd
transmission: Add apparmor service dependency
2013-05-28 18:00:21 +00:00
Ricardo M. Correia
531b581636
apparmor: Fix service stop
...
When stopping the apparmor service, the profile removal failed with
parsing errors due to not including the
${pkgs.apparmor}/etc/apparmor.d directory.
2013-05-28 17:49:52 +00:00
Ricardo M. Correia
84c0af80d7
apparmor: Fix loading multiple profiles
...
apparmor's systemd service wasn't working when multiple profiles were
defined, due to the ExecStart commands in the service file being
broken into multiple lines, instead of being separated by ';'.
2013-05-28 17:21:22 +00:00
Shea Levy
d5b33eec68
npm2nix now supports simple strings in the JSON file if no range is specified
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-28 13:19:44 -04:00
Ricardo M. Correia
2e61811284
transmission: Add apparmor profile
2013-05-28 17:19:15 +00:00
Shea Levy
4fe2e7c152
Add ansi-remover npm package
...
Signed-off-by: Shea Levy <shea@shealevy.com >
2013-05-28 13:02:13 -04:00
Marc Weber
f7ef08e5cd
experimental/cmake-improvement
...
set CMAKE_LIBRARY_PATH, CMAKE_INCLUDE_PATH based on NIX_CFLAGS_COMPILE and
NIX_LDFLAGS so that cmake's find_library like functions find all the libraries
gcc knows about thanks to the gcc wrapper
This is particular useful with myEnvFun which then also sets those CMAKE_* env
variables.`
Because setup.sh has to change this causes many rebuilds - thus it should be
included in a stdenv-update like branch
Also cmake builds in parallel perfectly fine
update cmake to latest minor number, I didn't change the patches,
just reapplied them manually recordin a new patch
2013-05-28 16:22:45 +02:00
Ricardo M. Correia
eb01d87b31
apparmor: Fix broken iputils/ping profile
2013-05-28 14:17:29 +00:00
Eelco Dolstra
6c03d641fa
openvpn: Update to 2.3.1
2013-05-28 14:48:56 +02:00