Commit Graph

4065 Commits

Author SHA1 Message Date
Vladimír Čunát
137eae0b55 Merge #2630: add and use fetchpatch
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
2014-05-17 07:31:03 +02:00
Eelco Dolstra
168fe56f3b Merge branch 'monit-5.8' of github.com:wmertens/nixpkgs 2014-05-15 14:42:20 +02:00
aszlig
4be7e939a0
Merge pull request #2645 from vandenoever/ori.
Add ori, a secure distributed filesystem.
2014-05-15 06:31:23 +02:00
lethalman
0bf388b697 Merge pull request #2618 from coreyoconnor/jmtpfs-upstream
add jmtpfs - a FUSE filesystem for MTP
2014-05-14 22:17:13 +02:00
Austin Seipp
832c1abc91 Merge pull request #2632 from cstrahan/biosdevname
biosdevname: add package
2014-05-14 15:00:10 -05:00
Jos van den Oever
8d6a940057 Add ori, a secure distributed filesystem. 2014-05-14 20:07:39 +02:00
Lluís Batlle i Rossell
4fcdc32924 Adding rkflashtool, to flash MK802IV. 2014-05-14 09:59:36 +02:00
Austin Seipp
158462e323 Merge pull request #2637 from wkennington/master.openvpn
openvpn: Update 2.3.3 -> 2.3.4
2014-05-13 19:49:16 -05:00
Austin Seipp
564e685d35 Merge pull request #2609 from CodeBlock/wicd-curses
wicd: enable curses, urwid is packaged now
2014-05-13 19:45:49 -05:00
Charles Strahan
f43d070865 biosdevname: add package 2014-05-13 19:20:44 -04:00
William A. Kennington III
6ddafad82a openvpn: Update 2.3.3 -> 2.3.4 2014-05-13 16:49:31 -05:00
Chris Double
1d1a1c2585 Update tor-browser to 3.6 2014-05-14 02:03:51 +12:00
Chris Double
f76e56fb38 Update tor to 0.2.4.21 2014-05-14 01:53:25 +12:00
Vladimír Čunát
7f3dba49e5 Merge #2556: update xpra, pygtk and ffmpeg2 2014-05-13 11:50:56 +02:00
Domen Kožar
ed890ab85f Merge pull request #2628 from pSub/nm-connection-editor
nm-connection-editor: fix missing schema for gtk3 FileChooser
2014-05-12 23:37:38 +02:00
Pascal Wittmann
1b22c53fa6 nm-connection-editor: fix missing schema for gtk3 FileChooser 2014-05-12 16:15:04 +02:00
Corey O'Connor
ce5dd5681e use 0.5 archive of jmtpfs 2014-05-11 13:06:26 -07:00
Corey O'Connor
2efda9dce7 add jmtpfs - a FUSE filesystem for MTP 2014-05-11 12:36:51 -07:00
宋文武
e47172ce38 fcitx: build im modules for gtk2, gtk3 and qt4
Close #2498.
2014-05-11 14:01:53 +02:00
Ricky Elrod
31a0844f79 wicd: enable curses, urwid is packaged
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 05:41:08 -04:00
Wout Mertens
1e711ee42d Fix OpenSSL requirement 2014-05-09 22:47:45 +02:00
Ricky Elrod
db98ce61d2 httpie: Update -> 0.8.0
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-08 16:39:24 -04:00
Rob Vermaas
14eebb54df Merge pull request #2564 from darklajid/bump_tmux
nixpkgs: bump tmux to 1.9
2014-05-08 21:42:06 +02:00
Rob Vermaas
4169bda163 Merge pull request #2579 from darklajid/bump_lftp
nixpkgs: Bump lftp to 4.4.16
2014-05-08 21:40:36 +02:00
Benjamin Podszun
69188e87c3 nixpkgs: Bump lftp to 4.4.16 2014-05-08 20:55:03 +02:00
Benjamin Podszun
141d1a1253 nixpkgs: Bump screen to 4.2.1 2014-05-08 16:25:27 +02:00
Eelco Dolstra
6aeb59bbe0 Rename fetchGitHub -> fetchFromGitHub
We're not fetching all of GitHub, after all.
2014-05-08 15:49:39 +02:00
Eelco Dolstra
ebd8573046 Add a utility function "fetchGitHub"
This is a small wrapper around fetchzip. It allows you to say:

  src = fetchGitHub {
    owner = "NixOS";
    repo = "nix";
    rev = "924e19341a5ee488634bc9ce1ea9758ac496afc3"; # or a tag
    sha256 = "1ld1jc26wy0smkg63chvdzsppfw6zy1ykf3mmc50hkx397wcbl09";
  };
2014-05-08 15:30:18 +02:00
Eelco Dolstra
c8df888858 Add a function "fetchzip"
This function downloads and unpacks a file in one fixed-output
derivation. This is primarily useful for dynamically generated zip
files, such as GitHub's /archive URLs, where the unpacked content of
the zip file doesn't change, but the zip file itself may (e.g. due to
minor changes in the compression algorithm, or changes in timestamps).

Fetchzip is implemented by extending fetchurl with a "postFetch" hook
that is executed after the file has been downloaded. This hook can
thus perform arbitrary checks or transformations on the downloaded
file.
2014-05-08 15:30:17 +02:00
Eelco Dolstra
2a43a4163a Fix indentation 2014-05-08 15:30:17 +02:00
aszlig
709ccd520b
patchutils: Update to new upstream version 0.3.3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-08 15:01:55 +02:00
Benjamin Podszun
719bcde6cc nixpkgs: bump tmux to 1.9 2014-05-08 08:59:32 +02:00
Rob Vermaas
31428612c2 Upgrade rtmpdump and get_iplayer 2014-05-07 20:56:37 +02:00
Chris Double
1c7d11ac2a Update xpra to 0.12.5 2014-05-08 00:54:15 +12:00
Eelco Dolstra
535de5e45a Add nifskope 2014-05-07 00:08:40 +02:00
Peter Simons
f5a6b58374 cabal-install: update to version 1.20.0.1 2014-05-05 10:46:40 +02:00
Wout Mertens
6ab576b702 Monit: Bump to 5.8
- Use callPackage etc
- Make PAM optional
2014-05-04 09:53:26 +02:00
Vladimír Čunát
062e2567c9 curl: minor update 7.35.0 -> 7.36.0, including CVE fixes 2014-05-03 11:30:53 +02:00
Michael Raskin
aea5277ca2 Switch Axel to a publically accessible download source 2014-05-03 01:08:15 +04:00
宋文武
eb36621839 dvtm: update from 0.10 to 0.11 2014-05-02 21:31:05 +02:00
Austin Seipp
368a677c97 nixos: overhaul datadog module
This overhauls the Datadog module a bit to be much more useful. In
particular, it adds support for nginx and postgresql monitoring
integrations to dd-agent. These have to exist in separate files under
/etc/dd-agent, so the module just exposes then as separate options. In
the future, more integrations could be added this way.

In the process of doing this, I also had to rename the dd-agent user to
datadog. Note the UIDs did not change, so this is strictly backwards
compatible. The reason for this is to make it easier to create a
'datadog' postgres user with access to pg_stats, as 'dd-agent' typically
isn't a valid username. This allows the out of the box configurations to
be used.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 01:24:35 -05:00
Eelco Dolstra
6c69ad3a97 Fix meta.license attribute 2014-05-01 10:51:15 +02:00
Moritz Ulrich
397682be6b Bump pass(word-store) to 1.6.1.
...and also simplify the expression massively.
2014-04-30 23:52:55 +02:00
Rob Vermaas
fed7a43020 Update nixops 1.1.1 to 1.2. 2014-04-30 11:15:36 +02:00
Austin Seipp
111e1536e5 nixpkgs: remove cb1cat
Brice Minaud reported a simple attack on the CBEAM Pi permutation
function, resulting in it being withdrawn from CAESAR. :(

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-27 13:51:56 -05:00
Peter Simons
3c08cdce48 gtk-gnutella: mark as "broken"
The current version doesn't compile with the latest GCC any more.
2014-04-26 15:54:18 +02:00
Oliver Charles
e89d37b4c4 Merge pull request #2393 from linquize/cpuminer
cpuminer: Upgrade to 2.3.3
2014-04-26 10:00:50 +01:00
Linquize
ae1189379e cpuminer: Upgrade to 2.3.3 2014-04-25 18:21:58 +02:00
Oliver Charles
cb82334421 Merge pull request #2336 from jwiegley/cabal
Add expression for cabal-install 1.20.0.0
2014-04-25 10:55:12 +01:00
Rob Vermaas
477b9a9bbb Merge pull request #2363 from wizeman/u/nethogs
nethogs: Add package
2014-04-25 11:34:22 +02:00