1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

10331 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice 934910acdd Merge pull request #6185 from fredlebel/mdp-0.93
Added mdp-0.93
2015-02-06 03:15:55 +01:00
Frederic LeBel 1e509d011d Added mdp-0.93
A command-line based markdown presentation tool.
2015-02-05 21:04:33 -05:00
Nikolay Amiantov aa54b77611 Merge pull request #6189 from abbradar/fhs-userenv
steamOriginal: rename to steam-original
2015-02-06 03:59:43 +03:00
Nikolay Amiantov fd99962abb steamOriginal: rename to steam-original 2015-02-06 03:48:32 +03:00
William A. Kennington III 28d8af438a samba_light: Use samba4 instead of samba3 2015-02-05 14:21:57 -08:00
Russell O'Connor 3feac4fd86 Merge branch 'master' of github.com:NixOS/nixpkgs 2015-02-05 15:21:54 -05:00
Nikolay Amiantov 627f8178b8 steam: rename, add a warning 2015-02-05 19:46:25 +03:00
Nikolay Amiantov 4b3bb7b448 userFHSEnv: add build tool 2015-02-05 19:46:25 +03:00
Nikolay Amiantov b3ee378f50 buildFHSChrootEnv: split environment and chroot scripts 2015-02-05 19:46:00 +03:00
Russell O'Connor af3c4a2744 Bitcoin 0.9.3 won't work with OpenSSL 1.0.1k.
This patch restores OpenSSL 1.0.1j and builds Bitcoin against it.
2015-02-05 11:40:57 -05:00
Nikolay Amiantov f35568e705 Merge pull request #5277 from abbradar/uwsgi
Add uWSGI application server
2015-02-05 17:10:37 +03:00
William A. Kennington III 43d8b1ef3c openntpd: Fixes 2015-02-04 17:30:22 -08:00
Eric Seidel cac8cc8985 Merge pull request #6160 from gridaphobe/master
fix xorgserver / xquartz on darwin
2015-02-04 15:34:51 -08:00
Eric Seidel 7f7482b6bd fix xorgserver / xquartz on darwin 2015-02-04 15:14:36 -08:00
Shea Levy e14d39b97b Merge branch 'osx-i3-urxvt' of git://github.com/cresh/nixpkgs 2015-02-04 22:14:52 +00:00
Vladimír Čunát 6437727773 avxsynth: fix build by using libjpeg_original
It broke since the last major libjpeg_turbo update.
2015-02-04 21:45:00 +01:00
Nikolay Amiantov a6050c9268 Merge pull request #6153 from abbradar/android-udev
android-udev-rules: add package
2015-02-04 23:30:01 +03:00
Nikolay Amiantov 104d7e7e62 android-udev-rules: add package 2015-02-04 23:09:47 +03:00
Marcus Crestani 92ca614934 i3: Use xcb-util-cursor-HEAD on OS X. 2015-02-04 20:44:19 +01:00
Edward Tjörnhammar d593f9e3ef Merge pull request #6110 from edwtjo/ihaskell-ng-wrapper
ihaskell-with-packages: add environment
2015-02-04 20:43:15 +01:00
Shea Levy b45aa294d4 Merge branch 'llvm-bump'
Bump default llvm on non-darwin too
2015-02-04 11:48:50 -05:00
Domen Kožar bb7246be3e Revert "arduino: new package"
This reverts commit ca982158bf.

@bjornfor
2015-02-04 13:49:27 +01:00
Domen Kožar d75a91ef1e pypy: 2.4 -> 2.5 2015-02-04 13:21:20 +01:00
Domen Kožar cb6706c22f Remove Varnish 2.1.5
Last release was in 2010, has vulns CVE-2013-4484, cc @garbas
2015-02-04 11:53:22 +01:00
Shea Levy df430ab2ea Fix imake on darwin.
Taken from joelteon/nixpkgs@6b3f7e6fb0

Original author Mike Sperber <sperber@deinprogramm.de>
2015-02-04 10:00:50 +00:00
Mike Sperber b611e3fb61 Add tradcpp package, needed for making imake work.
(cherry picked from commit e0c197b2f4fa53ebd7896940e6e14170664de8e7)
2015-02-04 09:29:34 +00:00
Bjørn Forsman ca982158bf arduino: new package
This commit adds the graphical Arduino IDE, built from the arduino-core
expression.

Also:
  - Add libusb to RPATH for avrdude. Without this, avrdude is broken.
    Possible TODO: replace bundled avrdude with the one from nixpkgs.
  - Use "cp -r ./build/linux/work/*", so example sketeches, the HTML
    reference documentation and the 'arduino' shell script that starts the
    IDE gets included.
  - Make meta.description slightly more generic, to cover both GUI/core
    variants.
2015-02-04 07:22:39 +01:00
Bjørn Forsman 83e3f38593 arduino-core: align attrname with package name
arduino_core => arduino-core. Retain copy of old attrname for backward
compatibility.
2015-02-04 07:22:39 +01:00
Shea Levy a1f1d0d442 Switch default llvm to 3.5 2015-02-03 20:01:39 -05:00
Shea Levy 5ac0318332 Merge branch 'new-darwin-stdenv' of git://github.com/gridaphobe/nixpkgs
refs #6122
2015-02-03 18:19:22 -05:00
Eric Seidel 4a467ec02b move libcxx[abi] into llvm tree 2015-02-03 14:58:10 -08:00
Eric Seidel dbf3d31727 make llvm-3.5 the default and remove references to gccApple
make perl be less dumb

revert change to release.nix
2015-02-03 14:31:04 -08:00
Ben Ford 9adc826c9a Update hzk to use correct zookeeper_mt 2015-02-03 22:44:26 +01:00
Ben Ford 40af5a2b59 Fix haskakafka library to use rdkafka 2015-02-03 22:44:26 +01:00
Peter Simons 1f25998a60 all-packages.nix: don't print a message every time 'cmplayer' is evaluated 2015-02-03 22:44:26 +01:00
Peter Simons d034aa11ee Merge pull request #6121 from boothead/kafka
Kafka and c libraries for kafka and zookeeper
2015-02-03 20:17:22 +01:00
Nikolay Amiantov 9b631cd0f8 bomi: rename from cmplayer and update 2015-02-03 14:27:43 +03:00
Peter Simons b7ecd5e729 Merge pull request #5025 from abbradar/xmonad-wrapper
nixos/xmonad: make a wrapper
2015-02-03 11:52:09 +01:00
Ben Ford b34a1cc248 Add a kafka package 2015-02-03 08:46:25 +00:00
Shea Levy aea1254f96 cc-wrapper merge fixes 2015-02-02 21:30:05 -05:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Nikolay Amiantov b7bb524f04 nixos/xmonad: move to haskell-ng and make a wrapper 2015-02-03 01:05:23 +03:00
Edward Tjörnhammar 7814b1739b ihaskell-with-packages: add environment 2015-02-02 23:00:46 +01:00
Nikolay Amiantov f08abb15f1 uwsgi: add package 2015-02-02 22:23:30 +03:00
Peter Simons 87c7fb24ed Merge pull request #6027 from offlinehacker/pkgs/godep/add
Add godep, dependency tool for go
2015-02-02 11:42:03 +01:00
Michael Alyn Miller 6cb1d1aaaf Add xss-lock 2015-02-01 10:07:01 -08:00
Thomas Tuegel 95829c8959 k3b: propagate cdrecord dependency
By default, k3b will use cdrkit, but that can be overriden by choosing
the original cdrtools.
2015-02-01 10:34:30 -06:00
Thomas Tuegel 76c396848d Merge branch 'quassel'
Add Qt 5 versions of Quassel's client and daemon.
2015-02-01 10:33:09 -06:00
Thomas Tuegel d9fce39cc4 quassel: add Qt 5 version of daemon 2015-02-01 10:32:27 -06:00
Thomas Tuegel 3d779db0ca quassel: add Qt 5 version of client 2015-02-01 10:31:56 -06:00