Michael Raskin
ccc11345c9
Adding jq JSON processor
2013-05-23 14:41:29 +04:00
Vladimír Čunát
1278859d31
Merge branch 'master' into x-updates
...
Conflicts (just splitting version from name):
pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Shea Levy
f8f9f3b1cc
binutils_gold: Don't require unneded dependencies.
...
Based on my scan of the logs they weren't even used when enabled
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 18:05:45 -04:00
Peter Simons
0b946a6374
haddock: update to version 2.13.2
2013-05-03 11:38:57 +02:00
Peter Simons
318b7e2eeb
Merge pull request #495 from bjornfor/stlink
...
stlink: new package
2013-05-02 06:21:37 -07:00
Bjørn Forsman
8df1afa9c9
stlink: new package
...
stlink is an in-circuit debugging and programming tool for ST-Link v1
and v2 devices. It is similar to OpenOCD but just for ST-Link devices.
https://github.com/texane/stlink
IMPORTANT: You need permissions to access the stlink usb devices. Here
are example udev rules for stlink v1 and v2 so you don't need to have
root permissions (copied from <stlink>/49-stlink*.rules):
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n"
2013-05-01 23:29:59 +02:00
Vladimír Čunát
8fc5fb6ecc
Merge branch 'master' into x-updates
2013-05-01 08:14:15 +02:00
Lluís Batlle i Rossell
b4fd5fdd83
gdb: update to 7.6
2013-04-29 13:44:23 +04:00
Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Peter Simons
acd879f36f
xxdiff: update to current HEAD of the source repository
2013-04-23 12:11:58 +02:00
Peter Simons
afd37640e7
haskell-hlint: update to version 1.8.44
2013-04-22 14:14:39 +02:00
Vladimír Čunát
1b349b06d8
itstool: update
2013-04-20 10:25:24 +02:00
Vladimír Čunát
ec736312d4
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/development/compilers/vala/default.nix (it's different version)
pkgs/development/libraries/cairo/default.nix (trivial)
2013-04-17 18:26:28 +02:00
viric
d2d69902e8
Merge pull request #456 from bjornfor/premake
...
premake: bump to version 4.3
2013-04-15 14:35:46 -07:00
Michael Raskin
0d9d2a65ba
Adding libffi to autogen dependencies to fix the build
2013-04-15 09:46:42 +04:00
Vladimír Čunát
17ae1617dc
Merge branch 'master' into x-updates
...
Conflicts (systemd version is split on x-updates):
pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Peter Simons
1bec0e5a34
haskell-cabal-dev: update to version 0.9.2
2013-04-13 00:13:22 +02:00
Eelco Dolstra
4adad458e7
Remove the "proprietary" license
...
We already had "unfree".
2013-04-12 14:37:50 +02:00
Vladimír Čunát
8249695b61
Merge branch 'master' into x-updates
...
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Bjørn Forsman
38c7d196ac
premake: bump to version 4.3
...
aacskeys depends on premake3, so keep that version around.
2013-04-08 21:06:54 +02:00
Peter Simons
c976480a01
elfutils: disable -Werror to fix the build
...
nm.c: In function 'show_symbols_sysv':
nm.c:773:27: error: argument to 'sizeof' in 'snprintf' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess]
snprintf (name, sizeof name, "[invalid sh_name %#" PRIx32 "]",
^
cc1: all warnings being treated as errors
2013-04-07 23:33:20 +02:00
Peter Simons
1ebb925939
haskell-cabal2nix: update to version 1.49
2013-04-06 15:56:27 +02:00
Peter Simons
d81e8a9cc3
gnulib: update to version 0.0-7901-g076ac82
2013-04-06 15:09:25 +02:00
Vladimír Čunát
eb2e46aab2
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Peter Simons
e1b932689f
haskell-cabal2nix: update to version 1.48
2013-04-04 16:27:57 +02:00
Peter Simons
e71abf64c8
haskell-keter: update to version 0.3.6.1
2013-04-04 16:22:47 +02:00
Peter Simons
3c66736304
haskell-uuagc: update to version 0.9.42.3
2013-04-04 16:18:08 +02:00
Pascal Wittmann
310b1221e1
New: keter, Yesod deployment manager.
...
Including the dependencies: unix-process-conduit and networkConduitTls.
2013-04-03 23:50:40 +02:00
Moritz Ulrich
05f2ea2d12
Add myself (the-kenny) to the maintainer list.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-30 21:05:15 +01:00
Moritz Ulrich
d2cb352ad9
leiningen: Update to 2.1.2
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-30 20:09:39 +01:00
Peter Simons
600d023c33
texinfo-5.1: install tex-related files like 'texinfo.tex'
2013-03-26 01:16:15 +01:00
Peter Simons
96dbbc7e21
gnulib: update to version 0.0-7899-g34f8464 and provide a proper meta section
2013-03-26 01:16:15 +01:00
Peter Simons
ac86eed59c
gnumake: disable test suite on FreeBSD
...
One test fails, unfortunately, but I'm not sure what to do about it.
2013-03-25 12:44:23 +01:00
Peter Simons
d2fff5ed22
gnulib: add version 0.0-7898-gdb9cad7
2013-03-24 23:32:14 +01:00
Peter Simons
6fc2cccfe6
Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix.
2013-03-23 15:58:14 +01:00
Carles Pagès
381660cf31
doxygen: update to 1.8.3.1
...
There are many bugfixes and some new features over 1.8.1.
2013-03-22 15:44:27 +01:00
Peter Simons
8e9ff8e1ab
cppi: update to version 1.18
2013-03-18 11:37:46 +01:00
Vladimír Čunát
b1eeae8cac
Merge branch 'master' into x-updates
...
Conflicts (easy):
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Malcolm Matalka
27e2fb6895
Upgrade to 1.0.0
2013-03-15 12:41:01 +01:00
Peter Simons
a8a6fd4063
texinfo: update to version 5.1
2013-03-13 15:13:40 +01:00
Lluís Batlle i Rossell
183b37645b
cmake setup-hook: fixing cmakeFlagsArray
...
The array wasn'te expanded properly, the spaces weren't preserved.
2013-03-12 11:31:58 +01:00
Peter Simons
f21539578e
haskell-alex: update to version 3.0.5
2013-03-11 11:26:15 +01:00
Peter Simons
e45d55964b
alex: update to version 3.0.5
2013-03-11 11:26:14 +01:00
Vladimír Čunát
86639d9bb9
Merge branch 'master' into x-updates
...
Conflicts (taken master versions):
pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
pkgs/desktops/xfce/applications/gigolo.nix
pkgs/desktops/xfce/applications/mousepad.nix
pkgs/desktops/xfce/applications/ristretto.nix
pkgs/desktops/xfce/applications/terminal.nix
pkgs/desktops/xfce/applications/xfce4-mixer.nix
pkgs/desktops/xfce/applications/xfce4-notifyd.nix
pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
pkgs/desktops/xfce/art/xfce4-icon-theme.nix
pkgs/desktops/xfce/core/exo.nix
pkgs/desktops/xfce/core/garcon.nix
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
pkgs/desktops/xfce/core/libxfce4ui.nix
pkgs/desktops/xfce/core/libxfce4util.nix
pkgs/desktops/xfce/core/libxfcegui4.nix
pkgs/desktops/xfce/core/thunar-volman.nix
pkgs/desktops/xfce/core/thunar.nix
pkgs/desktops/xfce/core/tumbler.nix
pkgs/desktops/xfce/core/xfce4-appfinder.nix
pkgs/desktops/xfce/core/xfce4-panel.nix
pkgs/desktops/xfce/core/xfce4-power-manager.nix
pkgs/desktops/xfce/core/xfce4-session.nix
pkgs/desktops/xfce/core/xfce4-settings.nix
pkgs/desktops/xfce/core/xfconf.nix
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/desktops/xfce/core/xfwm4.nix
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
pkgs/development/libraries/webkit/default.nix
pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Shea Levy
b634efe63c
ocamlPackages.opam: Fix indentation
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:12:56 -05:00
Shea Levy
66ad165829
Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs
...
This adds the opam ocaml package, and also adds orbitz as a maintainer.
I've tested that it builds, nothing more.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:10:54 -05:00
orbitz
55be059467
Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me
2013-03-08 22:59:54 +01:00
orbitz
98a6759bc7
Delete 0.9.4
2013-03-08 22:48:58 +01:00
orbitz
fd48192018
Add opam 0.9.5
2013-03-08 22:42:22 +01:00
Peter Simons
1f38a4ca66
haskell-cabal2nix: update to version 1.47
2013-03-08 13:44:59 +01:00