1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00
Commit graph

1189 commits

Author SHA1 Message Date
Domen Kožar 4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Bjørn Forsman 32da2ba923 plantuml: update from 7991 to 8012 2014-12-06 16:13:15 +01:00
Pascal Wittmann 47eabfabe2 Merge pull request #5239 from robberer/pkgs/mrtg
mrtg: add 2.17.4
2014-12-06 10:58:53 +01:00
Longrin Wischnewski cf4318ad4e mrtg: add 2.17.4
- The Multi Router Traffic Grapher
- You have a router, you want to know what it does all day long?
- Then MRTG is for you. It will monitor SNMP network devices and draw
- pretty pictures showing how much traffic has passed through each interface.
2014-12-06 09:05:29 +01:00
Rok Garbas 24848992bc goaccess: update to 0.8.5 2014-12-05 11:30:25 +01:00
Emery Hemingway 3faacca044 nixpkgs: iPXE initial package 2014-12-04 11:03:56 +01:00
lethalman 9bce8d2ef2 Merge pull request #5190 from deepfire/debootstrap-version-fix
debootstrap | 404-fix:  -> 1.0.64, since 1.0.63 disappeared from archive
2014-12-02 10:59:14 +01:00
Kosyrev Serge ae72e5ba8f debootstrap | 404-fix: -> 1.0.64, since 1.0.63 disappeared from archive 2014-11-30 16:51:42 +03:00
Arseniy Seroka 5b8fb2239c Merge pull request #5188 from DamienCassou/umlet
New package for Umlet 13.1
2014-11-30 15:30:03 +03:00
Damien Cassou dcc2f1ac38 New package for Umlet 13.1 2014-11-30 12:56:08 +01:00
Jaka Hudoklin 31ebe4d89d Merge pull request #5181 from grwlf/plowshare
plowshare: version bump
2014-11-29 21:57:05 +01:00
Sergey Mironov 2e95f697fb plowshare: version bump
fixes games/adom downloader
2014-11-29 23:39:33 +03:00
Patrick Mahoney cf5f282940 Consolidate conf-compile steps for skarnet.org pkgs. 2014-11-28 13:10:37 -06:00
Vladimír Čunát cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Mateusz Kowalczyk 456312a5fc youtube-dl: update to 2014.11.27 2014-11-28 02:31:01 +00:00
Oliver Charles 1132484200 opentsdb: Use fetchurl to fetch all dependencies 2014-11-27 12:06:01 +00:00
William A. Kennington III 021efdf021 yubico-piv-tool: 0.1.0 -> 0.1.2 2014-11-26 15:50:15 -08:00
William A. Kennington III e1988740a5 yubikey-personalization: 1.16.0 -> 1.16.1 2014-11-26 15:47:43 -08:00
Vladimír Čunát bdc323c540 opentsdb: mark as broken
It tries to download things and fails. CC @ocharles.
2014-11-27 00:45:47 +01:00
muflax dc9f084278 parcellite: 1.1.7 -> 1.1.9 2014-11-26 21:23:17 +00:00
Vladimír Čunát b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Pascal Wittmann 10c9196c0f parallel: update from 20141022 to 20141122 2014-11-25 18:18:05 +01:00
Pascal Wittmann 880f6a517e bmon: update from 3.5 to 3.6 2014-11-25 18:18:05 +01:00
Vladimír Čunát a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Oliver Charles 9cab0e1b8a Add meta information to hbase, bosun, scollector, opentsdb 2014-11-24 14:40:48 +00:00
Oliver Charles 751a2943f4 opentsdb: Upgrade to 2.1.0-RC1 2014-11-24 14:40:47 +00:00
Oliver Charles 764cca613d opentsdb: New package and NixOS module 2014-11-24 14:40:47 +00:00
Mateusz Kowalczyk 8570046e5c rlwrap: update from 0.41 to 0.42 2014-11-20 13:28:43 +00:00
Pascal Wittmann dfc3140b3d Merge pull request #5031 from AndersonTorres/youtubeDL
Youtube-DL: update to 2014.11.16
2014-11-18 14:47:21 +01:00
AndersonTorres a24225da61 Youtube-DL: update to 2014.11.16 2014-11-18 11:31:55 -02:00
Longrin Wischnewski 73aef348bb hdf5: move to a more stable URL 2014-11-18 11:14:17 +01:00
Eelco Dolstra a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Lengyel Balázs 79fc5bde48 updated hdf5 to version HDF5-1.8.14 2014-11-16 09:27:32 +01:00
Evgeny Egorochkin 7e2f54ae44 youtube-dl: update from 2014.11.12 to 2014.11.13.3 2014-11-15 22:20:16 +02:00
Pascal Wittmann 58ad907b49 abduco: update from 0.1 to 0.2 2014-11-15 16:21:56 +01:00
Pascal Wittmann dd37edd2d8 dvtm: update from 0.12 to 0.13 2014-11-15 16:21:56 +01:00
Domen Kožar 62dd6c1d72 pastebinit: fix build 2014-11-15 10:57:51 +01:00
Vladimír Čunát b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Pascal Wittmann f6b8460aa4 youtube-dl: update from 2014.11.04 to 2014.11.12 2014-11-12 16:11:07 +01:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann ea49ac0496 flashrom: fix 4936 2014-11-11 21:53:37 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Pascal Wittmann fa9af37751 kermit: update from 8.0.211 to 9.0.302 2014-11-09 17:26:37 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
宋文武 33d1a9a3cf ostree: new package 2014-11-07 13:30:04 +08:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
AndersonTorres 56e9b2c953 Youtube-dl: upgrade to 2014.11.04 2014-11-05 06:01:24 -02:00