Merge remote-tracking branch 'upstream/master' into HEAD
This commit is contained in:
Frederik Rietdijk
commit
94eb74eaad
@ -68,6 +68,10 @@ pkgs.stdenv.mkDerivation {
|
||||
inputFile = ../pkgs/development/r-modules/README.md;
|
||||
outputFile = "languages-frameworks/r.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./languages-frameworks/rust.md;
|
||||
outputFile = "./languages-frameworks/rust.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./languages-frameworks/vim.md;
|
||||
outputFile = "./languages-frameworks/vim.xml";
|
||||
|
||||
@ -27,6 +27,7 @@ such as Perl or Haskell. These are described in this chapter.</para>
|
||||
<xi:include href="qt.xml" />
|
||||
<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md -->
|
||||
<xi:include href="ruby.xml" />
|
||||
<xi:include href="rust.xml" />
|
||||
<xi:include href="texlive.xml" />
|
||||
<xi:include href="vim.xml" />
|
||||
|
||||
|
||||
@ -897,6 +897,27 @@ is executed it will attempt to download the python modules listed in
|
||||
requirements.txt. However these will be cached locally within the `virtualenv`
|
||||
folder and not downloaded again.
|
||||
|
||||
### How to override a Python package from `configuration.nix`?
|
||||
|
||||
If you need to change a package's attribute(s) from `configuration.nix` you could do:
|
||||
|
||||
```nix
|
||||
nixpkgs.config.packageOverrides = superP: {
|
||||
pythonPackages = superP.pythonPackages.override {
|
||||
overrides = self: super: {
|
||||
bepasty-server = super.bepasty-server.overrideAttrs ( oldAttrs: {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/bepasty/bepasty-server";
|
||||
sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps";
|
||||
rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
};
|
||||
```
|
||||
|
||||
If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`).
|
||||
|
||||
## Contributing
|
||||
|
||||
|
||||
91
doc/languages-frameworks/rust.md
Normal file
91
doc/languages-frameworks/rust.md
Normal file
@ -0,0 +1,91 @@
|
||||
---
|
||||
title: Rust
|
||||
author: Matthias Beyer
|
||||
date: 2017-03-05
|
||||
---
|
||||
|
||||
# User's Guide to the Rust Infrastructure
|
||||
|
||||
To install the rust compiler and cargo put
|
||||
|
||||
```
|
||||
rustStable.rustc
|
||||
rustStable.cargo
|
||||
```
|
||||
|
||||
into the `environment.systemPackages` or bring them into scope with
|
||||
`nix-shell -p rustStable.rustc -p rustStable.cargo`.
|
||||
|
||||
There are also `rustBeta` and `rustNightly` package sets available.
|
||||
These are not updated very regulary. For daily builds see
|
||||
[Using the Rust nightlies overlay](#using-the-rust-nightlies-overlay)
|
||||
|
||||
## Packaging Rust applications
|
||||
|
||||
Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:
|
||||
|
||||
```
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
name = "ripgrep-${version}";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BurntSushi";
|
||||
repo = "ripgrep";
|
||||
rev = "${version}";
|
||||
sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
|
||||
};
|
||||
|
||||
depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
|
||||
homepage = https://github.com/BurntSushi/ripgrep;
|
||||
license = with licenses; [ unlicense ];
|
||||
maintainers = [ maintainers.tailhook ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
`buildRustPackage` requires a `depsSha256` attribute which is computed over
|
||||
all crate sources of this package. Currently it is obtained by inserting a
|
||||
fake checksum into the expression and building the package once. The correct
|
||||
checksum can be then take from the failed build.
|
||||
|
||||
To install crates with nix there is also an experimental project called
|
||||
[nixcrates](https://github.com/fractalide/nixcrates).
|
||||
|
||||
## Using the Rust nightlies overlay
|
||||
|
||||
Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.
|
||||
This overlay can _also_ be used to install recent unstable or stable versions
|
||||
of Rust, if desired.
|
||||
|
||||
To use this overlay, clone
|
||||
[nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla),
|
||||
and create a symbolic link to the file
|
||||
[rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix)
|
||||
in the `~/.config/nixpkgs/overlays` directory.
|
||||
|
||||
$ git clone https://github.com/mozilla/nixpkgs-mozilla.git
|
||||
$ mkdir -p ~/.config/nixpkgs/overlays
|
||||
$ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix
|
||||
|
||||
The latest version can be installed with the following command:
|
||||
|
||||
$ nix-env -Ai nixos.rustChannels.stable.rust
|
||||
|
||||
Or using the attribute with nix-shell:
|
||||
|
||||
$ nix-shell -p nixos.rustChannels.stable.rust
|
||||
|
||||
To install the beta or nightly channel, "stable" should be substituted by
|
||||
"nightly" or "beta", or
|
||||
use the function provided by this overlay to pull a version based on a
|
||||
build date.
|
||||
|
||||
The overlay automatically updates itself as it uses the same source as
|
||||
[rustup](https://www.rustup.rs/).
|
||||
@ -16,17 +16,22 @@ rec {
|
||||
*/
|
||||
singleton = x: [x];
|
||||
|
||||
/* "Fold" a binary function `op' between successive elements of
|
||||
`list' with `nul' as the starting value, i.e., `fold op nul [x_1
|
||||
x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is
|
||||
Haskell's foldr).
|
||||
/* “right fold” a binary function `op' between successive elements of
|
||||
`list' with `nul' as the starting value, i.e.,
|
||||
`foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'.
|
||||
Type:
|
||||
foldr :: (a -> b -> b) -> b -> [a] -> b
|
||||
|
||||
Example:
|
||||
concat = fold (a: b: a + b) "z"
|
||||
concat = foldr (a: b: a + b) "z"
|
||||
concat [ "a" "b" "c" ]
|
||||
=> "abcz"
|
||||
# different types
|
||||
strange = foldr (int: str: toString (int + 1) + str) "a"
|
||||
strange [ 1 2 3 4 ]
|
||||
=> "2345a"
|
||||
*/
|
||||
fold = op: nul: list:
|
||||
foldr = op: nul: list:
|
||||
let
|
||||
len = length list;
|
||||
fold' = n:
|
||||
@ -35,13 +40,25 @@ rec {
|
||||
else op (elemAt list n) (fold' (n + 1));
|
||||
in fold' 0;
|
||||
|
||||
/* Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul
|
||||
x_1) x_2) ... x_n)'.
|
||||
/* `fold' is an alias of `foldr' for historic reasons */
|
||||
# FIXME(Profpatsch): deprecate?
|
||||
fold = foldr;
|
||||
|
||||
|
||||
/* “left fold”, like `foldr', but from the left:
|
||||
`foldl op nul [x_1 x_2 ... x_n] == op (... (op (op nul x_1) x_2) ... x_n)`.
|
||||
|
||||
Type:
|
||||
foldl :: (b -> a -> b) -> b -> [a] -> b
|
||||
|
||||
Example:
|
||||
lconcat = foldl (a: b: a + b) "z"
|
||||
lconcat [ "a" "b" "c" ]
|
||||
=> "zabc"
|
||||
# different types
|
||||
lstrange = foldl (str: int: str + toString (int + 1)) ""
|
||||
strange [ 1 2 3 4 ]
|
||||
=> "a2345"
|
||||
*/
|
||||
foldl = op: nul: list:
|
||||
let
|
||||
@ -52,7 +69,7 @@ rec {
|
||||
else op (foldl' (n - 1)) (elemAt list n);
|
||||
in foldl' (length list - 1);
|
||||
|
||||
/* Strict version of foldl.
|
||||
/* Strict version of `foldl'.
|
||||
|
||||
The difference is that evaluation is forced upon access. Usually used
|
||||
with small whole results (in contract with lazily-generated list or large
|
||||
@ -140,7 +157,7 @@ rec {
|
||||
any isString [ 1 { } ]
|
||||
=> false
|
||||
*/
|
||||
any = builtins.any or (pred: fold (x: y: if pred x then true else y) false);
|
||||
any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false);
|
||||
|
||||
/* Return true iff function `pred' returns true for all elements of
|
||||
`list'.
|
||||
@ -151,7 +168,7 @@ rec {
|
||||
all (x: x < 3) [ 1 2 3 ]
|
||||
=> false
|
||||
*/
|
||||
all = builtins.all or (pred: fold (x: y: if pred x then y else false) true);
|
||||
all = builtins.all or (pred: foldr (x: y: if pred x then y else false) true);
|
||||
|
||||
/* Count how many times function `pred' returns true for the elements
|
||||
of `list'.
|
||||
@ -219,7 +236,7 @@ rec {
|
||||
=> { right = [ 5 3 4 ]; wrong = [ 1 2 ]; }
|
||||
*/
|
||||
partition = builtins.partition or (pred:
|
||||
fold (h: t:
|
||||
foldr (h: t:
|
||||
if pred h
|
||||
then { right = [h] ++ t.right; wrong = t.wrong; }
|
||||
else { right = t.right; wrong = [h] ++ t.wrong; }
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
# to run these tests:
|
||||
# nix-instantiate --eval --strict nixpkgs/lib/tests.nix
|
||||
# if the resulting list is empty, all tests passed
|
||||
let inherit (builtins) add; in
|
||||
with import ./default.nix;
|
||||
|
||||
@ -45,9 +48,33 @@ runTests {
|
||||
expected = ["b" "c"];
|
||||
};
|
||||
|
||||
testFold = {
|
||||
expr = fold (builtins.add) 0 (range 0 100);
|
||||
expected = 5050;
|
||||
testFold =
|
||||
let
|
||||
f = op: fold: fold op 0 (range 0 100);
|
||||
# fold with associative operator
|
||||
assoc = f builtins.add;
|
||||
# fold with non-associative operator
|
||||
nonAssoc = f builtins.sub;
|
||||
in {
|
||||
expr = {
|
||||
assocRight = assoc foldr;
|
||||
# right fold with assoc operator is same as left fold
|
||||
assocRightIsLeft = assoc foldr == assoc foldl;
|
||||
nonAssocRight = nonAssoc foldr;
|
||||
nonAssocLeft = nonAssoc foldl;
|
||||
# with non-assoc operator the fold results are not the same
|
||||
nonAssocRightIsNotLeft = nonAssoc foldl != nonAssoc foldr;
|
||||
# fold is an alias for foldr
|
||||
foldIsRight = nonAssoc fold == nonAssoc foldr;
|
||||
};
|
||||
expected = {
|
||||
assocRight = 5050;
|
||||
assocRightIsLeft = true;
|
||||
nonAssocRight = 50;
|
||||
nonAssocLeft = (-5050);
|
||||
nonAssocRightIsNotLeft = true;
|
||||
foldIsRight = true;
|
||||
};
|
||||
};
|
||||
|
||||
testTake = testAllTrue [
|
||||
|
||||
@ -1,17 +1,44 @@
|
||||
rec {
|
||||
|
||||
# Identity function.
|
||||
/* The identity function
|
||||
For when you need a function that does “nothing”.
|
||||
|
||||
Type: id :: a -> a
|
||||
*/
|
||||
id = x: x;
|
||||
|
||||
# Constant function.
|
||||
/* The constant function
|
||||
Ignores the second argument.
|
||||
Or: Construct a function that always returns a static value.
|
||||
|
||||
Type: const :: a -> b -> a
|
||||
Example:
|
||||
let f = const 5; in f 10
|
||||
=> 5
|
||||
*/
|
||||
const = x: y: x;
|
||||
|
||||
# Named versions corresponding to some builtin operators.
|
||||
|
||||
## Named versions corresponding to some builtin operators.
|
||||
|
||||
/* Concat two strings */
|
||||
concat = x: y: x ++ y;
|
||||
|
||||
/* boolean “or” */
|
||||
or = x: y: x || y;
|
||||
|
||||
/* boolean “and” */
|
||||
and = x: y: x && y;
|
||||
|
||||
/* Merge two attribute sets shallowly, right side trumps left
|
||||
|
||||
Example:
|
||||
mergeAttrs { a = 1; b = 2; } // { b = 3; c = 4; }
|
||||
=> { a = 1; b = 3; c = 4; }
|
||||
*/
|
||||
mergeAttrs = x: y: x // y;
|
||||
|
||||
|
||||
# Compute the fixed point of the given function `f`, which is usually an
|
||||
# attribute set that expects its final, non-recursive representation as an
|
||||
# argument:
|
||||
|
||||
@ -237,10 +237,22 @@ following incompatible changes:</para>
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>
|
||||
The socket handling of the <literal>services.rmilter</literal> module
|
||||
has been fixed and refactored. As rmilter doesn't support binding to
|
||||
more than one socket, the options <literal>bindUnixSockets</literal>
|
||||
and <literal>bindInetSockets</literal> have been replaced by
|
||||
<literal>services.rmilter.bindSocket.*</literal>. The default is still
|
||||
a unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to
|
||||
the options documentation for more information.
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
</itemizedlist>
|
||||
|
||||
|
||||
<para>Other notable improvements:</para>
|
||||
<para>Other notable changes:</para>
|
||||
|
||||
<itemizedlist>
|
||||
|
||||
@ -261,6 +273,14 @@ following incompatible changes:</para>
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Python 2.6 interpreter and package set have been removed.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>The Python 2.7 interpreter does not use modules anymore. Instead, all CPython interpreters now include the whole standard library except for `tkinter`, which is available in the Python package set.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>
|
||||
Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
|
||||
@ -271,6 +291,22 @@ following incompatible changes:</para>
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>The Python package sets now use a fixed-point combinator and the sets are available as attributes of the interpreters.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>The Python function `buildPythonPackage` has been improved and can be used to build from Setuptools source, Flit source, and precompiled Wheels.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>
|
||||
When adding new or updating current Python libraries, the expressions should be put
|
||||
in separate files in <literal>pkgs/development/python-modules</literal> and
|
||||
called from <literal>python-packages.nix</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
</itemizedlist>
|
||||
|
||||
|
||||
|
||||
@ -108,16 +108,16 @@ rec {
|
||||
mkdir -p $out/bin
|
||||
echo "$testScript" > $out/test-script
|
||||
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
|
||||
vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)"
|
||||
vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
|
||||
wrapProgram $out/bin/nixos-test-driver \
|
||||
--add-flags "$vms" \
|
||||
--add-flags "''${vms[*]}" \
|
||||
${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
|
||||
--run "testScript=\"\$(cat $out/test-script)\"" \
|
||||
--set testScript '$testScript' \
|
||||
--set VLANS '${toString vlans}'
|
||||
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
|
||||
wrapProgram $out/bin/nixos-run-vms \
|
||||
--add-flags "$vms" \
|
||||
--add-flags "''${vms[*]}" \
|
||||
${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
|
||||
--set tests 'startAll; joinAll;' \
|
||||
--set VLANS '${toString vlans}' \
|
||||
|
||||
@ -28,7 +28,7 @@ in
|
||||
boot.loader.generic-extlinux-compatible.enable = true;
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"];
|
||||
boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"];
|
||||
|
||||
# FIXME: this probably should be in installation-device.nix
|
||||
users.extraUsers.root.initialHashedPassword = "";
|
||||
|
||||
@ -48,7 +48,7 @@ let cfg = config.system.autoUpgrade; in
|
||||
description = ''
|
||||
Specification (in the format described by
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>) of the time at
|
||||
<manvolnum>7</manvolnum></citerefentry>) of the time at
|
||||
which the update will occur.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -45,7 +45,7 @@ in
|
||||
description = ''
|
||||
Specification (in the format described by
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>) of the time at
|
||||
<manvolnum>7</manvolnum></citerefentry>) of the time at
|
||||
which the Venus will collect feeds.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -35,6 +35,9 @@ with lib;
|
||||
(mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")
|
||||
(mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")
|
||||
|
||||
(mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead")
|
||||
(mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead")
|
||||
|
||||
# Old Grub-related options.
|
||||
(mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
|
||||
(mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])
|
||||
|
||||
@ -110,7 +110,7 @@ in
|
||||
description = ''
|
||||
Systemd calendar expression when to check for renewal. See
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>.
|
||||
<manvolnum>7</manvolnum></citerefentry>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -14,14 +14,28 @@ in
|
||||
|
||||
options = {
|
||||
|
||||
hardware.bluetooth.enable = mkEnableOption "support for Bluetooth.";
|
||||
hardware.bluetooth = {
|
||||
enable = mkEnableOption "support for Bluetooth.";
|
||||
|
||||
hardware.bluetooth.powerOnBoot = mkOption {
|
||||
powerOnBoot = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to power up the default Bluetooth controller on boot.";
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
[General]
|
||||
ControllerMode = bredr
|
||||
'';
|
||||
description = ''
|
||||
Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf).
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
###### implementation
|
||||
@ -30,6 +44,11 @@ in
|
||||
|
||||
environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
|
||||
|
||||
environment.etc = singleton {
|
||||
source = pkgs.writeText "main.conf" cfg.extraConfig;
|
||||
target = "bluetooth/main.conf";
|
||||
};
|
||||
|
||||
services.udev.packages = [ bluez-bluetooth ];
|
||||
services.dbus.packages = [ bluez-bluetooth ];
|
||||
systemd.packages = [ bluez-bluetooth ];
|
||||
|
||||
@ -38,7 +38,7 @@ in
|
||||
Specification of the time at which awstats will get updated.
|
||||
(in the format described by <citerefentry>
|
||||
<refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>)
|
||||
<manvolnum>7</manvolnum></citerefentry>)
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -5,18 +5,21 @@ with lib;
|
||||
let
|
||||
|
||||
rspamdCfg = config.services.rspamd;
|
||||
postfixCfg = config.services.postfix;
|
||||
cfg = config.services.rmilter;
|
||||
|
||||
inetSockets = map (sock: let s = stringSplit ":" sock; in "inet:${last s}:${head s}") cfg.bindInetSockets;
|
||||
unixSockets = map (sock: "unix:${sock}") cfg.bindUnixSockets;
|
||||
inetSocket = addr: port: "inet:[${toString port}@${addr}]";
|
||||
unixSocket = sock: "unix:${sock}";
|
||||
|
||||
allSockets = unixSockets ++ inetSockets;
|
||||
systemdSocket = if cfg.bindSocket.type == "unix" then cfg.bindSocket.path
|
||||
else "${cfg.bindSocket.address}:${toString cfg.bindSocket.port}";
|
||||
rmilterSocket = if cfg.bindSocket.type == "unix" then unixSocket cfg.bindSocket.path
|
||||
else inetSocket cfg.bindSocket.address cfg.bindSocket.port;
|
||||
|
||||
rmilterConf = ''
|
||||
pidfile = /run/rmilter/rmilter.pid;
|
||||
bind_socket = ${if cfg.socketActivation then "fd:3" else concatStringsSep ", " allSockets};
|
||||
bind_socket = ${if cfg.socketActivation then "fd:3" else rmilterSocket};
|
||||
tempdir = /tmp;
|
||||
|
||||
'' + (with cfg.rspamd; if enable then ''
|
||||
spamd {
|
||||
servers = ${concatStringsSep ", " servers};
|
||||
@ -48,11 +51,13 @@ in
|
||||
services.rmilter = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = cfg.rspamd.enable;
|
||||
description = "Whether to run the rmilter daemon.";
|
||||
};
|
||||
|
||||
debug = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to run the rmilter daemon in debug mode.";
|
||||
};
|
||||
@ -73,25 +78,37 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
bindUnixSockets = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = ["/run/rmilter/rmilter.sock"];
|
||||
bindSocket.type = mkOption {
|
||||
type = types.enum [ "unix" "inet" ];
|
||||
default = "unix";
|
||||
description = ''
|
||||
Unix domain sockets to listen for MTA requests.
|
||||
'';
|
||||
example = ''
|
||||
[ "/run/rmilter.sock"]
|
||||
What kind of socket rmilter should listen on. Either "unix"
|
||||
for an Unix domain socket or "inet" for a TCP socket.
|
||||
'';
|
||||
};
|
||||
|
||||
bindInetSockets = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
bindSocket.path = mkOption {
|
||||
type = types.str;
|
||||
default = "/run/rmilter/rmilter.sock";
|
||||
description = ''
|
||||
Inet addresses to listen (in format accepted by systemd.socket)
|
||||
Path to Unix domain socket to listen on.
|
||||
'';
|
||||
example = ''
|
||||
["127.0.0.1:11990"]
|
||||
};
|
||||
|
||||
bindSocket.address = mkOption {
|
||||
type = types.str;
|
||||
default = "::1";
|
||||
example = "0.0.0.0";
|
||||
description = ''
|
||||
Inet address to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
bindSocket.port = mkOption {
|
||||
type = types.int;
|
||||
default = 11990;
|
||||
description = ''
|
||||
Inet port to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -100,14 +117,16 @@ in
|
||||
default = true;
|
||||
description = ''
|
||||
Enable systemd socket activation for rmilter.
|
||||
(disabling socket activation not recommended
|
||||
when unix socket used, and follow to wrong
|
||||
permissions on unix domain socket.)
|
||||
|
||||
Disabling socket activation is not recommended when a Unix
|
||||
domain socket is used and could lead to incorrect
|
||||
permissions.
|
||||
'';
|
||||
};
|
||||
|
||||
rspamd = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = rspamdCfg.enable;
|
||||
description = "Whether to use rspamd to filter mails";
|
||||
};
|
||||
@ -157,13 +176,9 @@ in
|
||||
type = types.str;
|
||||
description = "Addon to postfix configuration";
|
||||
default = ''
|
||||
smtpd_milters = ${head allSockets}
|
||||
# or for TCP socket
|
||||
# # smtpd_milters = inet:localhost:9900
|
||||
smtpd_milters = ${rmilterSocket}
|
||||
milter_protocol = 6
|
||||
milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}
|
||||
# skip mail without checks if milter will die
|
||||
milter_default_action = accept
|
||||
'';
|
||||
};
|
||||
};
|
||||
@ -175,11 +190,13 @@ milter_default_action = accept
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = mkMerge [
|
||||
|
||||
(mkIf cfg.enable {
|
||||
|
||||
users.extraUsers = singleton {
|
||||
name = cfg.user;
|
||||
description = "rspamd daemon";
|
||||
description = "rmilter daemon";
|
||||
uid = config.ids.uids.rmilter;
|
||||
group = cfg.group;
|
||||
};
|
||||
@ -203,7 +220,7 @@ milter_default_action = accept
|
||||
PermissionsStartOnly = true;
|
||||
Restart = "always";
|
||||
RuntimeDirectory = "rmilter";
|
||||
RuntimeDirectoryMode = "0755";
|
||||
RuntimeDirectoryMode = "0750";
|
||||
};
|
||||
|
||||
};
|
||||
@ -212,15 +229,21 @@ milter_default_action = accept
|
||||
description = "Rmilter service socket";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
socketConfig = {
|
||||
ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
|
||||
ListenStream = systemdSocket;
|
||||
SocketUser = cfg.user;
|
||||
SocketGroup = cfg.group;
|
||||
SocketMode = "0666";
|
||||
SocketMode = "0660";
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment;
|
||||
users.users.postfix.extraGroups = [ cfg.group ];
|
||||
};
|
||||
(mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) {
|
||||
users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ];
|
||||
})
|
||||
|
||||
(mkIf (cfg.enable && cfg.postfix.enable) {
|
||||
services.postfix.extraConfig = cfg.postfix.configFragment;
|
||||
users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ];
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
@ -53,8 +53,11 @@ in
|
||||
bindSocket = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [
|
||||
"/run/rspamd/rspamd.sock mode=0666 owner=${cfg.user}"
|
||||
"/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}"
|
||||
];
|
||||
defaultText = ''[
|
||||
"/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}"
|
||||
]'';
|
||||
description = ''
|
||||
List of sockets to listen, in format acceptable by rspamd
|
||||
'';
|
||||
|
||||
@ -46,6 +46,7 @@ let
|
||||
binary-caches = ${toString cfg.binaryCaches}
|
||||
trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
|
||||
binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys}
|
||||
auto-optimise-store = ${if cfg.autoOptimiseStore then "true" else "false"}
|
||||
${optionalString cfg.requireSignedBinaryCaches ''
|
||||
signed-binary-caches = *
|
||||
''}
|
||||
@ -86,6 +87,18 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
autoOptimiseStore = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
example = true;
|
||||
description = ''
|
||||
If set to true, Nix automatically detects files in the store that have
|
||||
identical contents, and replaces them with hard links to a single copy.
|
||||
This saves disk space. If set to false (the default), you can still run
|
||||
nix-store --optimise to get rid of duplicate files.
|
||||
'';
|
||||
};
|
||||
|
||||
buildCores = mkOption {
|
||||
type = types.int;
|
||||
default = 1;
|
||||
|
||||
@ -26,7 +26,7 @@ in
|
||||
description = ''
|
||||
Specification (in the format described by
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>) of the time at
|
||||
<manvolnum>7</manvolnum></citerefentry>) of the time at
|
||||
which the garbage collector will run.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -26,7 +26,7 @@ in
|
||||
description = ''
|
||||
Specification (in the format described by
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>) of the time at
|
||||
<manvolnum>7</manvolnum></citerefentry>) of the time at
|
||||
which the optimiser will run.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -87,6 +87,8 @@ let
|
||||
|
||||
server_tokens ${if cfg.serverTokens then "on" else "off"};
|
||||
|
||||
${cfg.commonHttpConfig}
|
||||
|
||||
${vhosts}
|
||||
|
||||
${optionalString cfg.statusPage ''
|
||||
@ -244,11 +246,13 @@ in
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.nginx;
|
||||
defaultText = "pkgs.nginx";
|
||||
default = pkgs.nginxStable;
|
||||
defaultText = "pkgs.nginxStable";
|
||||
type = types.package;
|
||||
description = "
|
||||
Nginx package to use.
|
||||
Nginx package to use. This defaults to the stable version. Note
|
||||
that the nginx team recommends to use the mainline version which
|
||||
available in nixpkgs as <literal>nginxMainline</literal>.
|
||||
";
|
||||
};
|
||||
|
||||
@ -275,6 +279,24 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
commonHttpConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
resolver 127.0.0.1 valid=5s;
|
||||
|
||||
log_format myformat '$remote_addr - $remote_user [$time_local] '
|
||||
'"$request" $status $body_bytes_sent '
|
||||
'"$http_referer" "$http_user_agent"';
|
||||
'';
|
||||
description = ''
|
||||
With nginx you must provide common http context definitions before
|
||||
they are used, e.g. log_format, resolver, etc. inside of server
|
||||
or location contexts. Use this attribute to set these definitions
|
||||
at the appropriate location.
|
||||
'';
|
||||
};
|
||||
|
||||
httpConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
|
||||
@ -32,8 +32,8 @@ in
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.fluxbox
|
||||
pkgs.qt5.kwindowsystem
|
||||
pkgs.qt5.oxygen-icons5
|
||||
pkgs.libsForQt5.kwindowsystem
|
||||
pkgs.kdeFrameworks.oxygen-icons5
|
||||
pkgs.lumina
|
||||
pkgs.numlockx
|
||||
pkgs.qt5.qtsvg
|
||||
|
||||
@ -225,11 +225,6 @@ in
|
||||
security.pam.services.sddm.enableKwallet = true;
|
||||
security.pam.services.slim.enableKwallet = true;
|
||||
|
||||
# use kimpanel as the default IBus panel
|
||||
i18n.inputMethod.ibus.panel =
|
||||
lib.mkDefault
|
||||
"${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
|
||||
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -328,7 +328,7 @@ in rec {
|
||||
Automatically start this unit at the given date/time, which
|
||||
must be in the format described in
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>. This is equivalent
|
||||
<manvolnum>7</manvolnum></citerefentry>. This is equivalent
|
||||
to adding a corresponding timer unit with
|
||||
<option>OnCalendar</option> set to the value given here.
|
||||
'';
|
||||
@ -375,9 +375,9 @@ in rec {
|
||||
Each attribute in this set specifies an option in the
|
||||
<literal>[Timer]</literal> section of the unit. See
|
||||
<citerefentry><refentrytitle>systemd.timer</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry> and
|
||||
<manvolnum>7</manvolnum></citerefentry> and
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||
<manvolnum>7</manvolnum></citerefentry> for details.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -234,7 +234,7 @@ in
|
||||
description = ''
|
||||
Systemd calendar expression when to scrub ZFS pools. See
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>.
|
||||
<manvolnum>7</manvolnum></citerefentry>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ in
|
||||
description = ''
|
||||
Specification (in the format described by
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>) of the time at
|
||||
<manvolnum>7</manvolnum></citerefentry>) of the time at
|
||||
which the garbage collector will run.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
|
||||
, stableBranch ? false
|
||||
, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ]
|
||||
, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
|
||||
, stableBranch ? false
|
||||
, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ]
|
||||
, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
|
||||
}:
|
||||
|
||||
with import ../lib;
|
||||
@ -280,6 +280,7 @@ in rec {
|
||||
tests.networkingProxy = callTest tests/networking-proxy.nix {};
|
||||
tests.nfs3 = callTest tests/nfs.nix { version = 3; };
|
||||
tests.nfs4 = callTest tests/nfs.nix { version = 4; };
|
||||
tests.nginx = callTest tests/nginx.nix { };
|
||||
tests.leaps = callTest tests/leaps.nix { };
|
||||
tests.nsd = callTest tests/nsd.nix {};
|
||||
tests.openssh = callTest tests/openssh.nix {};
|
||||
|
||||
42
nixos/tests/nginx.nix
Normal file
42
nixos/tests/nginx.nix
Normal file
@ -0,0 +1,42 @@
|
||||
# verifies:
|
||||
# 1. nginx generates config file with shared http context definitions above
|
||||
# generated virtual hosts config.
|
||||
|
||||
import ./make-test.nix ({ pkgs, ...} : {
|
||||
name = "jenkins";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ mbbx6spp ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
webserver =
|
||||
{ config, pkgs, ... }:
|
||||
{ services.nginx.enable = true;
|
||||
services.nginx.commonHttpConfig = ''
|
||||
log_format ceeformat '@cee: {"status":"$status",'
|
||||
'"request_time":$request_time,'
|
||||
'"upstream_response_time":$upstream_response_time,'
|
||||
'"pipe":"$pipe","bytes_sent":$bytes_sent,'
|
||||
'"connection":"$connection",'
|
||||
'"remote_addr":"$remote_addr",'
|
||||
'"host":"$host",'
|
||||
'"timestamp":"$time_iso8601",'
|
||||
'"request":"$request",'
|
||||
'"http_referer":"$http_referer",'
|
||||
'"upstream_addr":"$upstream_addr"}';
|
||||
'';
|
||||
services.nginx.virtualHosts."0.my.test" = {
|
||||
extraConfig = ''
|
||||
access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
startAll;
|
||||
|
||||
$webserver->waitForUnit("nginx");
|
||||
$webserver->waitForOpenPort("80");
|
||||
'';
|
||||
})
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
|
||||
, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl
|
||||
, withGui }:
|
||||
|
||||
@ -6,14 +6,17 @@ with stdenv.lib;
|
||||
stdenv.mkDerivation rec{
|
||||
|
||||
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
|
||||
version = "0.11D";
|
||||
version = "0.11F";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bitcoinxt/bitcoinxt/archive/v${version}.tar.gz";
|
||||
sha256 = "09r2i88wzqaj6mh66l3ngyfkm1a0dhwm5ibalj6y55wbxm9bvd36";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcoinxt";
|
||||
repo = "bitcoinxt";
|
||||
rev = "v${version}";
|
||||
sha256 = "13s5k9mxmlbf49p5hc546x20y5dslfp6g9hi6nw5yja5bngbwr24";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ openssl db48 boost zlib
|
||||
miniupnpc utillinux protobuf curl ]
|
||||
++ optionals withGui [ qt4 qrencode ];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
|
||||
, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau
|
||||
, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -9,15 +9,17 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Beep6581";
|
||||
repo = "RawTherapee";
|
||||
rev = "1077c4ba2e2dbe249884e6974c6050db8eb5e9c2";
|
||||
sha256 = "1xqmkwprk3h9nhy6q562mkjdpynyg9ff7a92sdga50k56gi0aj0s";
|
||||
rev = version + "-gtk3";
|
||||
sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
|
||||
lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx
|
||||
pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
|
||||
lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPROC_TARGET_NUMBER=2"
|
||||
];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yEd-${version}";
|
||||
version = "3.16.2.1";
|
||||
version = "3.17";
|
||||
|
||||
src = requireFile {
|
||||
name = "${name}.zip";
|
||||
url = "https://www.yworks.com/en/products/yfiles/yed/";
|
||||
sha256 = "019qfmdifqsrc9h4g3zbn7ivdc0dzlp3isa5ixdkgdhfsdm79b27";
|
||||
sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "albert-${version}";
|
||||
version = "0.9.4";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manuelschneid3r";
|
||||
owner = "albertlauncher";
|
||||
repo = "albert";
|
||||
rev = "v${version}";
|
||||
sha256 = "131ij525rgh2j9m2vydh79wm4bs0p3x27crar9f16rqhz15gkcpl";
|
||||
sha256 = "1r8m0b6lqljy314ilpi58sdpqyb9rr502nzx3pgmx2g2xz4izsfj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeQtWrapper ];
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/manuelSchneid3r/albert;
|
||||
homepage = https://albertlauncher.github.io/;
|
||||
description = "Desktop agnostic launcher";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ericsagnes ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "j4-dmenu-desktop-${version}";
|
||||
version = "2.14";
|
||||
version = "2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "enkore";
|
||||
repo = "j4-dmenu-desktop";
|
||||
rev = "r${version}";
|
||||
sha256 = "14srrkz4qx8qplgrrjv38ri4pnkxaxaq6jy89j13xhna492bq128";
|
||||
sha256 = "1yn45i3hpim2hriaqkq7wmawwsmkynvy2xgz7dg6p5r0ikw5bn1r";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -61,6 +61,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
|
||||
"--with-system-libvpx"
|
||||
"--with-system-png" # needs APNG support
|
||||
"--with-system-icu"
|
||||
"--enable-alsa"
|
||||
"--enable-system-ffi"
|
||||
"--enable-system-hunspell"
|
||||
"--enable-system-pixman"
|
||||
|
||||
@ -27,7 +27,7 @@ let
|
||||
export HOME=$TMP
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
doCheck = builtins.compareVersions version "0.8.8" >= 0;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tool for building, changing, and versioning infrastructure";
|
||||
@ -48,12 +48,8 @@ in rec {
|
||||
sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
|
||||
};
|
||||
|
||||
terraform_0_9_0 = generic {
|
||||
version = "0.9.0";
|
||||
sha256 = "1v96qgc6pd1bkwvkz855625xdcy7xb5lk60lg70144idqmwfjb9g";
|
||||
terraform_0_9_1 = generic {
|
||||
version = "0.9.1";
|
||||
sha256 = "081p6dlvkg9mgaz49ichxzlk1ks0rxa7nvilaq8jj1gq3jvylqnh";
|
||||
};
|
||||
|
||||
terraform_0_8 = terraform_0_8_8;
|
||||
terraform_0_9 = terraform_0_9_0;
|
||||
terraform = terraform_0_9;
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qtox-${version}";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tux3";
|
||||
repo = "qTox";
|
||||
rev = "v${version}";
|
||||
sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq";
|
||||
sha256 = "0l008mzrs1wsv5cbzxjkv3k48lghlcdsp8blqrkihjv5gcn3psml";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGIT_DESCRIBE=${version}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
|
||||
sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2";
|
||||
sha256 = "1j4sc3pmy8l6k41007spglcqiabjlzc7f85pn3jmjr9ksv9qipbm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -35,13 +35,7 @@ in stdenv.mkDerivation {
|
||||
++ optionals stdenv.isLinux [ libcap libnl ]
|
||||
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
|
||||
|
||||
patches = [ ./wireshark-lookup-dumpcap-in-path.patch
|
||||
(fetchurl {
|
||||
url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=c7042bedbb3b12c5f4e19e59e52da370d4ffe62f;hp=bc2b135677110d8065ba1174f09bc7f5ba73b9e9";
|
||||
sha256 = "1m70akywf2r52lhlvzr720vl1i7ng9cqbzaiif8s81xs4g4nn2rz";
|
||||
name = "wireshark-CVE-2017-6014.patch";
|
||||
})
|
||||
];
|
||||
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
|
||||
|
||||
postInstall = optionalString (withQt || withGtk) ''
|
||||
${optionalString withGtk ''
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.14.24";
|
||||
version = "0.14.25";
|
||||
name = "syncthing-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1";
|
||||
sha256 = "1if92y32h1wp5sz2lnlw5fqibzbik7bklq850j9wcxfvr6ahck0w";
|
||||
};
|
||||
|
||||
buildInputs = [ go removeReferencesTo ];
|
||||
|
||||
@ -25,6 +25,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = (stdenv.lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]);
|
||||
|
||||
# With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these...
|
||||
postPatch = stdenv.lib.optionalString stdenv.cc.isClang ''
|
||||
substituteInPlace src/gnu/neuron_gnu_builtin.h \
|
||||
--replace 'double abs(double arg);' "" \
|
||||
--replace 'float abs(float arg);' "" \
|
||||
--replace 'short abs(short arg);' "" \
|
||||
--replace 'long abs(long arg);' ""
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
## neuron install by default everything under prefix/${host_arch}/*
|
||||
|
||||
30
pkgs/applications/version-management/pijul/default.nix
Normal file
30
pkgs/applications/version-management/pijul/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchurl, rustPlatform, perl, darwin }:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
name = "pijul-${version}";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pijul.org/releases/${name}.tar.gz";
|
||||
sha256 = "2c7b354b4ab142ac50a85d70c80949ff864377b37727b862d103d3407e2c7818";
|
||||
};
|
||||
|
||||
sourceRoot = "pijul/pijul";
|
||||
|
||||
buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin
|
||||
(with darwin.apple_sdk.frameworks; [ Security ]);
|
||||
|
||||
doCheck = false;
|
||||
|
||||
depsSha256 = "03bb92mn16d38l49x4p1z21k7gvq3l3ki10brr13p7yv45rwvmzc";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A distributed version control system";
|
||||
homepage = https://pijul.org;
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
maintainers = [ maintainers.gal_bolle ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -75,7 +75,7 @@ let
|
||||
mkdir -p $out/share/bash-completion/completions
|
||||
cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion
|
||||
|
||||
for f in $out/lib/*.la; do
|
||||
for f in $out/lib/*.la $out/lib/python*/site-packages/*/*.la; do
|
||||
substituteInPlace $f \
|
||||
--replace "${expat.dev}/lib" "${expat.out}/lib" \
|
||||
--replace "${zlib.dev}/lib" "${zlib.out}/lib" \
|
||||
|
||||
@ -9,12 +9,12 @@ with python2Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
name = "virt-manager-${version}";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
|
||||
sha256 = "1jnawqjmcqd2db78ngx05x7cxxn3iy1sb4qfgbwcn045qh6a8cdz";
|
||||
sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
||||
@ -18,10 +18,10 @@ let
|
||||
python = python2;
|
||||
buildType = "release";
|
||||
|
||||
extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85";
|
||||
extpackRev = 112924;
|
||||
main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a";
|
||||
version = "5.1.14";
|
||||
extpack = "996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd";
|
||||
extpackRev = "114002";
|
||||
main = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9";
|
||||
version = "5.1.18";
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/672 for details
|
||||
extensionPack = requireFile rec {
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a";
|
||||
sha256 = "f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a";
|
||||
};
|
||||
|
||||
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
|
||||
|
||||
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# ToDo: ldap reported as not found but afterwards reported as supported
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://projects.gnome.org/gconf/;
|
||||
description = "A system for storing application preferences";
|
||||
|
||||
@ -282,6 +282,7 @@ self: super: {
|
||||
etcd = dontCheck super.etcd;
|
||||
fb = dontCheck super.fb; # needs credentials for Facebook
|
||||
fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw
|
||||
friday-juicypixels = dontCheck super.friday-juicypixels; #tarball missing test/rgba8.png
|
||||
ghc-events = dontCheck super.ghc-events; # http://hydra.cryp.to/build/498226/log/raw
|
||||
ghc-events-parallel = dontCheck super.ghc-events-parallel; # http://hydra.cryp.to/build/496828/log/raw
|
||||
ghc-imported-from = dontCheck super.ghc-imported-from;
|
||||
@ -824,12 +825,6 @@ self: super: {
|
||||
# https://github.com/xmonad/xmonad-extras/issues/3
|
||||
xmonad-extras = doJailbreak super.xmonad-extras;
|
||||
|
||||
# https://github.com/bmillwood/pointfree/issues/21
|
||||
pointfree = appendPatch super.pointfree (pkgs.fetchpatch {
|
||||
url = "https://github.com/bmillwood/pointfree/pull/22.patch";
|
||||
sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp";
|
||||
});
|
||||
|
||||
# https://github.com/int-e/QuickCheck-safe/issues/2
|
||||
QuickCheck-safe = doJailbreak super.QuickCheck-safe;
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ core-packages:
|
||||
|
||||
default-package-overrides:
|
||||
- store < 0.4.1 # https://github.com/fpco/store/issues/104
|
||||
# LTS Haskell 8.4
|
||||
# LTS Haskell 8.5
|
||||
- abstract-deque ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
- AC-Vector ==2.3.2
|
||||
@ -65,7 +65,7 @@ default-package-overrides:
|
||||
- airship ==0.6.0
|
||||
- alarmclock ==0.4.0.2
|
||||
- alex ==3.2.1
|
||||
- alternators ==0.1.1.0
|
||||
- alternators ==0.1.1.1
|
||||
- ALUT ==2.4.0.2
|
||||
- amazonka ==1.4.5
|
||||
- amazonka-apigateway ==1.4.5
|
||||
@ -209,9 +209,11 @@ default-package-overrides:
|
||||
- base64-string ==0.2
|
||||
- basic-prelude ==0.6.1.1
|
||||
- bcrypt ==0.0.10
|
||||
- bench ==1.0.3
|
||||
- benchpress ==0.2.2.9
|
||||
- bencode ==0.6.0.0
|
||||
- bento ==0.1.0
|
||||
- between ==0.11.0.0
|
||||
- bifunctors ==5.4.1
|
||||
- bimap ==0.3.2
|
||||
- bimap-server ==0.1.0.1
|
||||
@ -235,6 +237,8 @@ default-package-overrides:
|
||||
- biofastq ==0.1
|
||||
- biopsl ==0.4
|
||||
- bitarray ==0.0.1.1
|
||||
- bitcoin-api ==0.12.1
|
||||
- bitcoin-api-extra ==0.9.1
|
||||
- bitcoin-block ==0.13.1
|
||||
- bitcoin-script ==0.11.1
|
||||
- bitcoin-tx ==0.13.1
|
||||
@ -256,6 +260,8 @@ default-package-overrides:
|
||||
- bloodhound ==0.12.1.0
|
||||
- blosum ==0.1.1.4
|
||||
- bmp ==1.2.6.3
|
||||
- boltzmann-samplers ==0.1.0.0
|
||||
- bookkeeping ==0.2.1.1
|
||||
- bool-extras ==0.4.0
|
||||
- Boolean ==0.2.4
|
||||
- boolean-like ==0.1.1.0
|
||||
@ -296,7 +302,7 @@ default-package-overrides:
|
||||
- cabal-helper ==0.7.3.0
|
||||
- cabal-rpm ==0.11
|
||||
- cache ==0.1.0.0
|
||||
- cacophony ==0.9.1
|
||||
- cacophony ==0.9.2
|
||||
- cairo ==0.13.3.1
|
||||
- call-stack ==0.1.0
|
||||
- camfort ==0.901
|
||||
@ -365,7 +371,7 @@ default-package-overrides:
|
||||
- cmark ==0.5.5
|
||||
- cmark-highlight ==0.2.0.0
|
||||
- cmark-lucid ==0.1.0.0
|
||||
- cmdargs ==0.10.14
|
||||
- cmdargs ==0.10.15
|
||||
- code-builder ==0.1.3
|
||||
- code-page ==0.1.2
|
||||
- codo-notation ==0.5.2
|
||||
@ -382,7 +388,7 @@ default-package-overrides:
|
||||
- concurrent-output ==1.7.9
|
||||
- concurrent-supply ==0.1.8
|
||||
- conduit ==1.2.9
|
||||
- conduit-combinators ==1.1.0
|
||||
- conduit-combinators ==1.1.1
|
||||
- conduit-connection ==0.1.0.3
|
||||
- conduit-extra ==1.1.15
|
||||
- conduit-iconv ==0.1.1.1
|
||||
@ -392,6 +398,7 @@ default-package-overrides:
|
||||
- configurator ==0.3.0.0
|
||||
- configurator-export ==0.1.0.1
|
||||
- connection ==0.2.7
|
||||
- connection-pool ==0.2.1
|
||||
- console-style ==0.0.2.1
|
||||
- constraints ==0.9
|
||||
- consul-haskell ==0.4.2
|
||||
@ -402,6 +409,10 @@ default-package-overrides:
|
||||
- control-monad-free ==0.6.1
|
||||
- control-monad-loop ==0.1
|
||||
- control-monad-omega ==0.3.1
|
||||
- conversion ==1.2.1
|
||||
- conversion-bytestring ==1.0.1
|
||||
- conversion-case-insensitive ==1.0.0.0
|
||||
- conversion-text ==1.0.1
|
||||
- convert-annotation ==0.5.0.1
|
||||
- convertible ==1.1.1.0
|
||||
- cookie ==0.4.2.1
|
||||
@ -437,6 +448,7 @@ default-package-overrides:
|
||||
- cryptonite ==0.21
|
||||
- cryptonite-conduit ==0.2.0
|
||||
- cryptonite-openssl ==0.5
|
||||
- csp ==1.3.1
|
||||
- css-syntax ==0.0.5
|
||||
- css-text ==0.1.2.2
|
||||
- csv ==0.1.2
|
||||
@ -500,11 +512,13 @@ default-package-overrides:
|
||||
- directory-tree ==0.12.1
|
||||
- discount ==0.1.1
|
||||
- disk-free-space ==0.1.0.1
|
||||
- disposable ==0.2.0.0
|
||||
- distance ==0.1.0.0
|
||||
- distributed-closure ==0.3.3.0
|
||||
- distributed-process ==0.6.6
|
||||
- distributed-process-simplelocalnet ==0.2.3.3
|
||||
- distributed-static ==0.3.5.0
|
||||
- distribution ==1.1.0.0
|
||||
- distribution-nixpkgs ==1.0.0.1
|
||||
- distributive ==0.5.2
|
||||
- diversity ==0.8.0.2
|
||||
@ -533,6 +547,7 @@ default-package-overrides:
|
||||
- drifter ==0.2.2
|
||||
- drifter-postgresql ==0.1.0
|
||||
- dual-tree ==0.2.0.9
|
||||
- dvorak ==0.1.0.0
|
||||
- dynamic-state ==0.2.2.0
|
||||
- dyre ==0.8.12
|
||||
- Earley ==0.11.0.1
|
||||
@ -546,12 +561,14 @@ default-package-overrides:
|
||||
- edit-distance ==0.2.2.1
|
||||
- editor-open ==0.6.0.0
|
||||
- effect-handlers ==0.1.0.8
|
||||
- effin ==0.3.0.2
|
||||
- either ==4.4.1.1
|
||||
- either-unwrap ==1.1
|
||||
- ekg ==0.4.0.12
|
||||
- ekg-core ==0.1.1.1
|
||||
- ekg-json ==0.1.0.4
|
||||
- ekg-statsd ==0.2.1.0
|
||||
- ekg-wai ==0.1.0.0
|
||||
- elerea ==2.9.0
|
||||
- elm-bridge ==0.4.0
|
||||
- elm-core-sources ==1.0.0
|
||||
@ -561,6 +578,8 @@ default-package-overrides:
|
||||
- emailaddress ==0.2.0.0
|
||||
- enclosed-exceptions ==1.0.2
|
||||
- encoding-io ==0.0.1
|
||||
- engine-io ==1.2.15
|
||||
- engine-io-wai ==1.0.6
|
||||
- EntrezHTTP ==1.0.3
|
||||
- entropy ==0.3.7
|
||||
- enummapset-th ==0.6.1.1
|
||||
@ -594,6 +613,7 @@ default-package-overrides:
|
||||
- extensible-effects ==1.11.0.4
|
||||
- extensible-exceptions ==0.1.1.4
|
||||
- extra ==1.5.1
|
||||
- extract-dependencies ==0.2.0.1
|
||||
- fail ==4.9.0.0
|
||||
- farmhash ==0.1.0.5
|
||||
- fast-builder ==0.0.0.6
|
||||
@ -650,6 +670,8 @@ default-package-overrides:
|
||||
- free ==4.12.4
|
||||
- free-vl ==0.1.4
|
||||
- freenect ==1.2.1
|
||||
- freer ==0.2.4.1
|
||||
- freer-effects ==0.3.0.0
|
||||
- friendly-time ==0.4
|
||||
- frisby ==0.2
|
||||
- from-sum ==0.2.1.0
|
||||
@ -660,9 +682,10 @@ default-package-overrides:
|
||||
- fuzzcheck ==0.1.1
|
||||
- gd ==3000.7.3
|
||||
- Genbank ==1.0.3
|
||||
- general-games ==1.0.3
|
||||
- generic-aeson ==0.2.0.8
|
||||
- generic-deriving ==1.11.1
|
||||
- generic-random ==0.4.0.0
|
||||
- generic-random ==0.4.1.0
|
||||
- generic-xmlpickler ==0.1.0.5
|
||||
- GenericPretty ==1.2.1
|
||||
- generics-eot ==0.2.1.1
|
||||
@ -701,6 +724,7 @@ default-package-overrides:
|
||||
- gio ==0.13.3.1
|
||||
- gipeda ==0.3.3.1
|
||||
- giphy-api ==0.5.2.0
|
||||
- git ==0.2.0
|
||||
- github ==0.15.0
|
||||
- github-release ==1.0.1
|
||||
- github-types ==0.2.1
|
||||
@ -832,6 +856,12 @@ default-package-overrides:
|
||||
- gravatar ==0.8.0
|
||||
- graylog ==0.1.0.1
|
||||
- groom ==0.1.2
|
||||
- groundhog ==0.8
|
||||
- groundhog-inspector ==0.8
|
||||
- groundhog-mysql ==0.8
|
||||
- groundhog-postgresql ==0.8
|
||||
- groundhog-sqlite ==0.8
|
||||
- groundhog-th ==0.8
|
||||
- grouped-list ==0.2.1.2
|
||||
- groupoids ==4.0
|
||||
- groups ==0.4.0.0
|
||||
@ -851,14 +881,16 @@ default-package-overrides:
|
||||
- hamilton ==0.1.0.0
|
||||
- hamlet ==1.2.0
|
||||
- HandsomeSoup ==0.4.2
|
||||
- handwriting ==0.1.0.3
|
||||
- hapistrano ==0.2.1.2
|
||||
- happstack-authenticate ==2.3.4.7
|
||||
- happstack-clientsession ==7.3.1
|
||||
- happstack-hsp ==7.3.7.1
|
||||
- happstack-hsp ==7.3.7.2
|
||||
- happstack-jmacro ==7.0.11
|
||||
- happstack-server ==7.4.6.3
|
||||
- happstack-server ==7.4.6.4
|
||||
- happstack-server-tls ==7.1.6.2
|
||||
- happy ==1.19.5
|
||||
- HaRe ==0.8.4.0
|
||||
- harp ==0.4.2
|
||||
- hasbolt ==0.1.1.1
|
||||
- hashable ==1.2.5.0
|
||||
@ -868,6 +900,7 @@ default-package-overrides:
|
||||
- haskeline ==0.7.3.1
|
||||
- haskell-gi ==0.20
|
||||
- haskell-gi-base ==0.20
|
||||
- haskell-import-graph ==1.0.1
|
||||
- haskell-lexer ==1.0.1
|
||||
- haskell-names ==0.8.0
|
||||
- haskell-neo4j-client ==0.3.2.4
|
||||
@ -916,6 +949,7 @@ default-package-overrides:
|
||||
- heterocephalus ==1.0.4.0
|
||||
- hex ==0.1.2
|
||||
- hexml ==0.3.1
|
||||
- hexpat ==0.20.10
|
||||
- hexstring ==0.11.1
|
||||
- hflags ==0.4.2
|
||||
- hformat ==0.1.0.1
|
||||
@ -953,6 +987,7 @@ default-package-overrides:
|
||||
- hOpenPGP ==2.5.5
|
||||
- hopenpgp-tools ==0.19.4
|
||||
- hopenssl ==1.7
|
||||
- hopfli ==0.2.1.1
|
||||
- hosc ==0.15
|
||||
- hostname ==1.0
|
||||
- hostname-validate ==1.0.0
|
||||
@ -1113,6 +1148,7 @@ default-package-overrides:
|
||||
- iso3166-country-codes ==0.20140203.8
|
||||
- iso639 ==0.1.0.3
|
||||
- iso8601-time ==0.1.4
|
||||
- isotope ==0.4.0.0
|
||||
- iterable ==3.0
|
||||
- ix-shapable ==0.1.0
|
||||
- ixset ==1.0.7
|
||||
@ -1132,7 +1168,7 @@ default-package-overrides:
|
||||
- json-rpc-generic ==0.2.1.2
|
||||
- json-schema ==0.7.4.1
|
||||
- json-stream ==0.4.1.3
|
||||
- JuicyPixels ==3.2.8
|
||||
- JuicyPixels ==3.2.8.1
|
||||
- JuicyPixels-extra ==0.1.1
|
||||
- JuicyPixels-scale-dct ==0.1.1.2
|
||||
- jvm ==0.1.2
|
||||
@ -1151,11 +1187,11 @@ default-package-overrides:
|
||||
- knob ==0.1.1
|
||||
- koofr-client ==1.0.0.3
|
||||
- kraken ==0.0.3
|
||||
- l10n ==0.1.0.0
|
||||
- l10n ==0.1.0.1
|
||||
- labels ==0.3.2
|
||||
- lackey ==0.4.2
|
||||
- language-c ==0.5.0
|
||||
- language-c-quote ==0.11.7.1
|
||||
- language-c-quote ==0.11.7.3
|
||||
- language-dockerfile ==0.3.5.0
|
||||
- language-ecmascript ==0.17.1.0
|
||||
- language-fortran ==0.5.1
|
||||
@ -1229,7 +1265,7 @@ default-package-overrides:
|
||||
- lzma-conduit ==1.1.3.1
|
||||
- machines ==0.6.1
|
||||
- machines-binary ==0.3.0.3
|
||||
- machines-directory ==0.2.0.10
|
||||
- machines-directory ==0.2.1.0
|
||||
- machines-io ==0.2.0.13
|
||||
- machines-process ==0.2.0.8
|
||||
- magic ==1.1
|
||||
@ -1240,8 +1276,11 @@ default-package-overrides:
|
||||
- markdown ==0.1.16
|
||||
- markdown-unlit ==0.4.0
|
||||
- markup ==3.1.0
|
||||
- marvin ==0.2.3
|
||||
- marvin-interpolate ==1.1
|
||||
- math-functions ==0.2.1.0
|
||||
- mathexpr ==0.3.0.0
|
||||
- matplotlib ==0.4.1
|
||||
- matrices ==0.4.4
|
||||
- matrix ==0.3.5.0
|
||||
- matrix-market-attoparsec ==0.1.0.5
|
||||
@ -1249,7 +1288,7 @@ default-package-overrides:
|
||||
- mbox ==0.3.3
|
||||
- mcmc-types ==1.0.3
|
||||
- median-stream ==0.7.0.0
|
||||
- mega-sdist ==0.3.0
|
||||
- mega-sdist ==0.3.0.2
|
||||
- megaparsec ==5.2.0
|
||||
- memory ==0.14.1
|
||||
- MemoTrie ==0.6.7
|
||||
@ -1262,21 +1301,22 @@ default-package-overrides:
|
||||
- mfsolve ==0.3.2.0
|
||||
- microbench ==0.1
|
||||
- microformats2-parser ==1.0.1.6
|
||||
- microlens ==0.4.7.0
|
||||
- microlens ==0.4.8.0
|
||||
- microlens-aeson ==2.2.0
|
||||
- microlens-contra ==0.1.0.1
|
||||
- microlens-ghc ==0.4.7.0
|
||||
- microlens-ghc ==0.4.8.0
|
||||
- microlens-mtl ==0.1.10.0
|
||||
- microlens-platform ==0.3.7.1
|
||||
- microlens-platform ==0.3.8.0
|
||||
- microlens-th ==0.4.1.1
|
||||
- mighty-metropolis ==1.2.0
|
||||
- mime-mail ==0.4.13
|
||||
- mime-mail ==0.4.13.1
|
||||
- mime-mail-ses ==0.3.2.3
|
||||
- mime-types ==0.1.0.7
|
||||
- mintty ==0.1
|
||||
- misfortune ==0.1.1.2
|
||||
- missing-foreign ==0.1.1
|
||||
- MissingH ==1.4.0.1
|
||||
- mixed-types-num ==0.1.0.1
|
||||
- mmap ==0.5.9
|
||||
- mmorph ==1.0.9
|
||||
- mockery ==0.3.4
|
||||
@ -1330,6 +1370,7 @@ default-package-overrides:
|
||||
- multistate ==0.7.1.1
|
||||
- murmur-hash ==0.1.0.9
|
||||
- MusicBrainz ==0.2.4
|
||||
- mustache ==2.1.2
|
||||
- mutable-containers ==0.3.3
|
||||
- mwc-probability ==1.3.0
|
||||
- mwc-random ==0.13.5.0
|
||||
@ -1380,6 +1421,7 @@ default-package-overrides:
|
||||
- nix-paths ==1.0.0.1
|
||||
- non-empty-sequence ==0.2.0.2
|
||||
- nonce ==1.0.2
|
||||
- nondeterminism ==1.4
|
||||
- NoTrace ==0.3.0.1
|
||||
- nsis ==0.3.1
|
||||
- numbers ==3000.2.0.1
|
||||
@ -1413,13 +1455,14 @@ default-package-overrides:
|
||||
- opml-conduit ==0.6.0.1
|
||||
- optional-args ==1.0.1
|
||||
- options ==1.2.1.1
|
||||
- optparse-applicative ==0.13.1.0
|
||||
- optparse-applicative ==0.13.2.0
|
||||
- optparse-generic ==1.1.4
|
||||
- optparse-helper ==0.2.1.1
|
||||
- optparse-simple ==0.0.3
|
||||
- optparse-text ==0.1.1.0
|
||||
- osdkeys ==0.0
|
||||
- overloaded-records ==0.4.2.0
|
||||
- package-description-remote ==0.2.0.0
|
||||
- packdeps ==0.4.3
|
||||
- pager ==0.1.1.0
|
||||
- pagerduty ==0.0.8
|
||||
@ -1457,13 +1500,13 @@ default-package-overrides:
|
||||
- permutation ==0.5.0.5
|
||||
- persistable-record ==0.4.1.1
|
||||
- persistable-types-HDBC-pg ==0.0.1.4
|
||||
- persistent ==2.6
|
||||
- persistent-mysql ==2.6
|
||||
- persistent-postgresql ==2.6
|
||||
- persistent ==2.6.1
|
||||
- persistent-mysql ==2.6.0.1
|
||||
- persistent-postgresql ==2.6.1
|
||||
- persistent-redis ==2.5.2
|
||||
- persistent-refs ==0.4
|
||||
- persistent-sqlite ==2.6.0.1
|
||||
- persistent-template ==2.5.1.6
|
||||
- persistent-sqlite ==2.6.2
|
||||
- persistent-template ==2.5.2
|
||||
- pgp-wordlist ==0.1.0.2
|
||||
- phantom-state ==0.2.1.2
|
||||
- picedit ==0.2.3.0
|
||||
@ -1473,7 +1516,7 @@ default-package-overrides:
|
||||
- pinch ==0.3.0.2
|
||||
- pinchot ==0.24.0.0
|
||||
- pipes ==4.3.2
|
||||
- pipes-attoparsec ==0.5.1.4
|
||||
- pipes-attoparsec ==0.5.1.5
|
||||
- pipes-bytestring ==2.1.4
|
||||
- pipes-cacophony ==0.4.1
|
||||
- pipes-category ==0.2.0.1
|
||||
@ -1509,6 +1552,7 @@ default-package-overrides:
|
||||
- post-mess-age ==0.2.1.0
|
||||
- postgresql-binary ==0.9.3
|
||||
- postgresql-libpq ==0.9.3.0
|
||||
- postgresql-schema ==0.1.10
|
||||
- postgresql-simple ==0.5.2.1
|
||||
- postgresql-simple-migration ==0.1.9.0
|
||||
- postgresql-simple-url ==0.2.0.0
|
||||
@ -1567,9 +1611,10 @@ default-package-overrides:
|
||||
- quickcheck-instances ==0.3.12
|
||||
- quickcheck-io ==0.1.4
|
||||
- quickcheck-simple ==0.1.0.1
|
||||
- quickcheck-special ==0.1.0.3
|
||||
- quickcheck-special ==0.1.0.4
|
||||
- quickcheck-text ==0.1.2.1
|
||||
- quickcheck-unicode ==1.0.0.1
|
||||
- raaz ==0.1.1
|
||||
- rainbow ==0.28.0.4
|
||||
- rainbox ==0.18.0.10
|
||||
- ramus ==0.1.2
|
||||
@ -1611,6 +1656,7 @@ default-package-overrides:
|
||||
- reform-happstack ==0.2.5.1
|
||||
- reform-hsp ==0.2.7.1
|
||||
- RefSerialize ==0.4.0
|
||||
- regex ==0.5.0.0
|
||||
- regex-applicative ==0.3.3
|
||||
- regex-applicative-text ==0.1.0.1
|
||||
- regex-base ==0.93.2
|
||||
@ -1666,9 +1712,9 @@ default-package-overrides:
|
||||
- rvar ==0.2.0.3
|
||||
- s3-signer ==0.3.0.0
|
||||
- safe ==0.3.14
|
||||
- safe-exceptions ==0.1.4.0
|
||||
- safe-exceptions ==0.1.5.0
|
||||
- safe-exceptions-checked ==0.1.0
|
||||
- safecopy ==0.9.2
|
||||
- safecopy ==0.9.3
|
||||
- SafeSemaphore ==0.10.1
|
||||
- sampling ==0.3.2
|
||||
- sandi ==0.4.0
|
||||
@ -1680,11 +1726,13 @@ default-package-overrides:
|
||||
- scanner ==0.2
|
||||
- scientific ==0.3.4.10
|
||||
- scotty ==0.11.0
|
||||
- scrape-changes ==0.1.0.5
|
||||
- scrypt ==0.5.0
|
||||
- sdl2 ==2.2.0
|
||||
- sdl2-gfx ==0.2
|
||||
- sdl2-image ==2.0.0
|
||||
- sdl2-mixer ==0.1
|
||||
- search-algorithms ==0.1.0
|
||||
- securemem ==0.1.9
|
||||
- SegmentTree ==0.3
|
||||
- semigroupoid-extras ==5
|
||||
@ -1729,6 +1777,7 @@ default-package-overrides:
|
||||
- shake-language-c ==0.10.0
|
||||
- shakespeare ==2.0.12.1
|
||||
- shell-conduit ==4.5.2
|
||||
- shelly ==1.6.8.3
|
||||
- shortcut-links ==0.4.2.0
|
||||
- should-not-typecheck ==2.1.0
|
||||
- show-prettyprint ==0.1.2
|
||||
@ -1790,7 +1839,8 @@ default-package-overrides:
|
||||
- sqlite-simple ==0.4.13.0
|
||||
- sqlite-simple-errors ==0.6.0.0
|
||||
- srcloc ==0.5.1.0
|
||||
- stache ==0.2.0
|
||||
- stache ==0.2.1
|
||||
- stack-run-auto ==0.1.1.4
|
||||
- stack-type ==0.1.0.0
|
||||
- state-plus ==0.1.2
|
||||
- stateref ==0.3
|
||||
@ -1806,7 +1856,7 @@ default-package-overrides:
|
||||
- stm-conduit ==3.0.0
|
||||
- stm-containers ==0.2.15
|
||||
- stm-delay ==0.1.1.1
|
||||
- stm-extras ==0.1.0.1
|
||||
- stm-extras ==0.1.0.2
|
||||
- stm-stats ==0.2.0.0
|
||||
- stm-supply ==0.2.0.0
|
||||
- STMonadTrans ==0.4.3
|
||||
@ -1814,6 +1864,7 @@ default-package-overrides:
|
||||
- storable-complex ==0.2.2
|
||||
- storable-endian ==0.2.6
|
||||
- storable-record ==0.0.3.1
|
||||
- store-core ==0.4
|
||||
- Strafunski-StrategyLib ==5.0.0.10
|
||||
- stratosphere ==0.4.1
|
||||
- streaming ==0.1.4.5
|
||||
@ -1885,6 +1936,7 @@ default-package-overrides:
|
||||
- tasty-rerun ==1.1.6
|
||||
- tasty-silver ==3.1.9
|
||||
- tasty-smallcheck ==0.8.1
|
||||
- tasty-stats ==0.2.0.2
|
||||
- tasty-tap ==0.0.4
|
||||
- tasty-th ==0.1.4
|
||||
- Taxonomy ==1.0.2
|
||||
@ -1892,7 +1944,7 @@ default-package-overrides:
|
||||
- tce-conf ==1.3
|
||||
- tcp-streams ==0.6.0.0
|
||||
- tcp-streams-openssl ==0.6.0.0
|
||||
- telegram-api ==0.6.0.2
|
||||
- telegram-api ==0.6.1.0
|
||||
- template ==0.2.0.10
|
||||
- temporary ==1.2.0.4
|
||||
- temporary-rc ==1.2.0.3
|
||||
@ -1907,7 +1959,7 @@ default-package-overrides:
|
||||
- test-framework-th ==0.2.4
|
||||
- test-simple ==0.1.9
|
||||
- testing-feat ==0.4.0.3
|
||||
- texmath ==0.9.1
|
||||
- texmath ==0.9.3
|
||||
- text ==1.2.2.1
|
||||
- text-all ==0.3.0.2
|
||||
- text-binary ==0.2.1.1
|
||||
@ -1935,10 +1987,12 @@ default-package-overrides:
|
||||
- th-reify-compat ==0.0.1.1
|
||||
- th-reify-many ==0.1.6
|
||||
- th-to-exp ==0.0.1.0
|
||||
- th-utilities ==0.2.0.1
|
||||
- these ==0.7.3
|
||||
- thread-local-storage ==0.1.1
|
||||
- threads ==0.5.1.4
|
||||
- threepenny-gui ==0.7.0.1
|
||||
- threepenny-gui-flexbox ==0.3.0.2
|
||||
- through-text ==0.1.0.0
|
||||
- thumbnail-plus ==1.0.5
|
||||
- thyme ==0.3.5.5
|
||||
@ -1971,6 +2025,7 @@ default-package-overrides:
|
||||
- tree-fun ==0.8.1.0
|
||||
- trifecta ==1.6.2.1
|
||||
- true-name ==0.1.0.2
|
||||
- tsv2csv ==0.1.0.1
|
||||
- ttrie ==0.1.2.1
|
||||
- tttool ==1.7.0.1
|
||||
- tuple ==0.3.0.2
|
||||
@ -2007,6 +2062,7 @@ default-package-overrides:
|
||||
- union ==0.1.1.1
|
||||
- union-find ==0.2
|
||||
- uniplate ==1.6.12
|
||||
- uniq-deep ==1.1.0.0
|
||||
- Unique ==0.4.6.1
|
||||
- units ==2.4
|
||||
- units-defs ==2.0.1.1
|
||||
@ -2042,6 +2098,7 @@ default-package-overrides:
|
||||
- uuid-types ==1.0.3
|
||||
- vado ==0.0.8
|
||||
- validate-input ==0.4.0.0
|
||||
- validation ==0.5.4
|
||||
- varying ==0.7.0.3
|
||||
- vault ==0.3.0.6
|
||||
- vcswrapper ==0.1.5
|
||||
@ -2056,6 +2113,7 @@ default-package-overrides:
|
||||
- vector-split ==1.0.0.2
|
||||
- vector-th-unbox ==0.2.1.6
|
||||
- vectortiles ==1.2.0.2
|
||||
- verbosity ==0.2.3.0
|
||||
- versions ==3.0.0
|
||||
- vhd ==0.2.2
|
||||
- ViennaRNAParser ==1.3.2
|
||||
@ -2072,6 +2130,7 @@ default-package-overrides:
|
||||
- wai-extra ==3.0.19.1
|
||||
- wai-handler-launch ==3.0.2.2
|
||||
- wai-logger ==2.3.0
|
||||
- wai-middleware-auth ==0.1.1.1
|
||||
- wai-middleware-caching ==0.1.0.2
|
||||
- wai-middleware-caching-lru ==0.1.0.0
|
||||
- wai-middleware-caching-redis ==0.2.0.0
|
||||
@ -2139,13 +2198,15 @@ default-package-overrides:
|
||||
- wordpass ==1.0.0.7
|
||||
- Workflow ==0.8.3
|
||||
- wrap ==0.0.0
|
||||
- wreq ==0.5.0.0
|
||||
- writer-cps-full ==0.1.0.0
|
||||
- writer-cps-lens ==0.1.0.0
|
||||
- writer-cps-morph ==0.1.0.1
|
||||
- writer-cps-lens ==0.1.0.1
|
||||
- writer-cps-morph ==0.1.0.2
|
||||
- writer-cps-mtl ==0.1.1.2
|
||||
- writer-cps-transformers ==0.1.1.2
|
||||
- wuss ==1.1.3
|
||||
- X11 ==1.8
|
||||
- X11-xft ==0.3.1
|
||||
- x509 ==1.6.5
|
||||
- x509-store ==1.6.2
|
||||
- x509-system ==1.6.4
|
||||
@ -2153,6 +2214,7 @@ default-package-overrides:
|
||||
- Xauth ==0.1
|
||||
- xdcc ==1.1.3
|
||||
- xdg-basedir ==0.2.2
|
||||
- xeno ==0.1
|
||||
- xenstore ==0.1.1
|
||||
- xhtml ==3000.2.1
|
||||
- xlsior ==0.1.0.1
|
||||
@ -2164,6 +2226,7 @@ default-package-overrides:
|
||||
- xml-conduit-writer ==0.1.1.1
|
||||
- xml-hamlet ==0.4.1
|
||||
- xml-html-qq ==0.1.0.1
|
||||
- xml-indexed-cursor ==0.1.1.0
|
||||
- xml-lens ==0.1.6.3
|
||||
- xml-picklers ==0.3.6
|
||||
- xml-to-json-fast ==2.0.0
|
||||
@ -2171,6 +2234,7 @@ default-package-overrides:
|
||||
- xmlgen ==0.6.2.1
|
||||
- xmlhtml ==0.2.3.5
|
||||
- xmonad ==0.13
|
||||
- xmonad-contrib ==0.13
|
||||
- xss-sanitize ==0.3.5.7
|
||||
- yackage ==0.8.1
|
||||
- yahoo-finance-api ==0.2.0.1
|
||||
@ -2183,7 +2247,7 @@ default-package-overrides:
|
||||
- yesod-auth-account ==1.4.3
|
||||
- yesod-auth-basic ==0.1.0.2
|
||||
- yesod-auth-hashdb ==1.6.0.1
|
||||
- yesod-bin ==1.5.2
|
||||
- yesod-bin ==1.5.2.1
|
||||
- yesod-core ==1.4.32
|
||||
- yesod-eventsource ==1.4.1
|
||||
- yesod-fay ==0.8.0
|
||||
@ -2191,6 +2255,7 @@ default-package-overrides:
|
||||
- yesod-form-richtext ==0.1.0.0
|
||||
- yesod-gitrepo ==0.2.1.0
|
||||
- yesod-gitrev ==0.1.0.0
|
||||
- yesod-markdown ==0.11.4
|
||||
- yesod-newsfeed ==1.6
|
||||
- yesod-persistent ==1.4.2
|
||||
- yesod-sitemap ==1.4.0.1
|
||||
@ -2228,7 +2293,8 @@ extra-packages:
|
||||
- aeson < 0.8 # newer versions don't work with GHC 6.12.3
|
||||
- aeson < 1.1 # required by stack
|
||||
- aeson-pretty < 0.8 # required by elm compiler
|
||||
- binary > 0.7 && < 0.8 # binary 0.8.x is the latest, but it's largely unsupported so far
|
||||
- binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers
|
||||
- binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers
|
||||
- Cabal == 1.18.* # required for cabal-install et al on old GHC versions
|
||||
- Cabal == 1.20.* # required for cabal-install et al on old GHC versions
|
||||
- containers < 0.5 # required to build alex with GHC 6.12.3
|
||||
|
||||
@ -131,8 +131,6 @@ self: super: builtins.intersectAttrs super {
|
||||
|
||||
# Need WebkitGTK, not just webkit.
|
||||
webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };
|
||||
webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
|
||||
webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
|
||||
websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
|
||||
|
||||
hs-mesos = overrideCabal super.hs-mesos (drv: {
|
||||
@ -433,10 +431,6 @@ self: super: builtins.intersectAttrs super {
|
||||
# This propagates this to everything depending on haskell-gi-base
|
||||
haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
|
||||
|
||||
# requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version)
|
||||
gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; };
|
||||
gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; };
|
||||
|
||||
# Requires gi-javascriptcore API version 4
|
||||
gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_11; };
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
||||
name = "clooj-${version}";
|
||||
|
||||
jar = fetchurl {
|
||||
url = "http://download1492.mediafire.com/dptomdxrjaag/prkf64humftrmz3/clooj-0.4.4-standalone.jar";
|
||||
url = "http://download1492.mediafire.com/5bbi05sxgxog/prkf64humftrmz3/clooj-0.4.4-standalone.jar";
|
||||
sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
|
||||
};
|
||||
|
||||
|
||||
@ -306,6 +306,10 @@ let
|
||||
substituteInPlace configure --replace "-lstdc++" "-lc++"
|
||||
'';
|
||||
|
||||
stripDebugList = "bin sbin lib modules";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
});
|
||||
|
||||
in {
|
||||
|
||||
@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin)
|
||||
preConfigure = "rm BUILD";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DBUILD_STATIC_LIBS=ON"
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
mkdir -p $out
|
||||
unpackPhase
|
||||
cd $name
|
||||
$apacheAnt/bin/ant
|
||||
cp -R ./* $out
|
||||
@ -1,11 +1,24 @@
|
||||
{stdenv, fetchurl, apacheAnt}:
|
||||
{stdenv, fetchurl, ant, jdk}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "martyr-0.3.9";
|
||||
builder = ./builder.sh;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "martyr-${version}";
|
||||
version = "0.3.9";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/martyr/martyr-0.3.9.tar.gz";
|
||||
url = "mirror://sourceforge/martyr/${name}.tar.gz";
|
||||
sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
|
||||
};
|
||||
inherit stdenv apacheAnt;
|
||||
|
||||
buildInputs = [ ant jdk ];
|
||||
|
||||
buildPhase = "ant";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/share/java"
|
||||
cp -v *.jar "$out/share/java"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
|
||||
homepage = http://martyr.sourceforge.net/;
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,6 +30,8 @@ stdenv.mkDerivation rec
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
setupHook = [ ./setup-hook.sh ];
|
||||
|
||||
meta = {
|
||||
homepage = http://ocsigen.org/eliom/;
|
||||
description = "Ocaml Framework for programming Web sites and client/server Web applications";
|
||||
|
||||
5
pkgs/development/ocaml-modules/eliom/setup-hook.sh
Normal file
5
pkgs/development/ocaml-modules/eliom/setup-hook.sh
Normal file
@ -0,0 +1,5 @@
|
||||
addOcsigenDistilleryTemplate() {
|
||||
addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates
|
||||
}
|
||||
|
||||
envHooks+=(addOcsigenDistilleryTemplate)
|
||||
34
pkgs/development/ocaml-modules/ocsigen-start/default.nix
Normal file
34
pkgs/development/ocaml-modules/ocsigen-start/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }:
|
||||
|
||||
buildOcaml rec
|
||||
{
|
||||
name = "ocsigen-start";
|
||||
version = "1.0.0";
|
||||
|
||||
buildInputs = [ eliom ];
|
||||
propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ];
|
||||
|
||||
patches = [ ./templates-dir.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "src/os_db.ml" --replace "citext" "text"
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
|
||||
sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll";
|
||||
};
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://ocsigen.org/ocsigen-start;
|
||||
description = "Eliom application skeleton";
|
||||
longDescription =''
|
||||
An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc.
|
||||
'';
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
maintainers = [ stdenv.lib.maintainers.gal_bolle ];
|
||||
};
|
||||
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/scripts/install.sh b/scripts/install.sh
|
||||
index f88ae11..d6aae70 100755
|
||||
--- a/scripts/install.sh
|
||||
+++ b/scripts/install.sh
|
||||
@@ -11,9 +11,9 @@ fi
|
||||
|
||||
TPL_DIR=$1
|
||||
TPL_NAME=$2
|
||||
-DEST0=$DESTDIR/$(eliom-distillery -dir)
|
||||
+DEST0=$out/eliom-distillery-templates
|
||||
DEST=$DEST0/$TPL_NAME
|
||||
|
||||
mkdir -p $DEST0
|
||||
@ -1,24 +1,34 @@
|
||||
{stdenv, fetchurl, unzip}:
|
||||
{ stdenv, fetchFromGitHub, ant, jdk }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "jdepend-2.9";
|
||||
buildInputs = [unzip] ;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jdepend-${version}";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.clarkware.com/software/jdepend-2.9.zip ;
|
||||
sha256 = "1915fk9w9mjv9i6hlkn2grv2kjqcgn4xa8278v66f1ix5wpfcb90";
|
||||
src = fetchFromGitHub {
|
||||
owner = "clarkware";
|
||||
repo = "jdepend";
|
||||
rev = version;
|
||||
sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant jdk ];
|
||||
buildPhase = "ant jar";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -R * $out
|
||||
mkdir -p $out/bin $out/share
|
||||
install dist/${name}.jar $out/share
|
||||
|
||||
cat > "$out/bin/jdepend" <<EOF
|
||||
#!${stdenv.shell}
|
||||
exec ${jdk.jre}/bin/java -classpath "$out/share/*" "\$@"
|
||||
EOF
|
||||
chmod a+x $out/bin/jdepend
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Traverses Java class file directories and generates design quality metrics for each Java package";
|
||||
homepage = http://www.clarkware.com/software/JDepend.html;
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
27
pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
Normal file
27
pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchurl, ocamlPackages }:
|
||||
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
name = "ocsigen-i18n";
|
||||
version = "3.1.0";
|
||||
|
||||
buildInputs = with ocamlPackages; [ ocaml findlib ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
make bindir=$out/bin install
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/besport/${name}/archive/${version}.tar.gz";
|
||||
sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/besport/ocsigen-i18n;
|
||||
description = "I18n made easy for web sites written with eliom";
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
maintainers = [ stdenv.lib.maintainers.gal_bolle ];
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, unzip, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.2";
|
||||
version = "0.6.6";
|
||||
baseName = "scalafmt";
|
||||
name = "${baseName}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
|
||||
sha256 = "0xafl7vmncdycapi9shxqf73nhb24llgxjd2x98irmr9bvzg844q";
|
||||
url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
|
||||
sha256 = "143g288m6xr93pavbym2y6f8gvihsf53fnzjra6ln1s39n9h205n";
|
||||
};
|
||||
|
||||
unpackPhase = "tar xvzf $src";
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
let
|
||||
|
||||
name = "hplip-${version}";
|
||||
version = "3.16.5";
|
||||
version = "3.16.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hplip/${name}.tar.gz";
|
||||
sha256 = "1nay65q1zmx2jxiwn66n7mlr73azacz5097gw98kqqf90dh522f6";
|
||||
sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn";
|
||||
};
|
||||
|
||||
plugin = fetchurl {
|
||||
url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
|
||||
sha256 = "15qrcd3ndnxri6pfdfmsjyv2f3zfkig80yghs76jbsm106rp8g3q";
|
||||
sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg";
|
||||
};
|
||||
|
||||
hplipState =
|
||||
|
||||
25
pkgs/misc/logging/filebeat/default.nix
Normal file
25
pkgs/misc/logging/filebeat/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, buildGoPackage }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "filebeat-${version}";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
rev = "v${version}";
|
||||
sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/elastic/beats";
|
||||
|
||||
subPackages = [ "filebeat" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lightweight shipper for logfiles";
|
||||
homepage = https://www.elastic.co/products/beats;
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.fadenb ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
25
pkgs/misc/logging/heartbeat/default.nix
Normal file
25
pkgs/misc/logging/heartbeat/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, buildGoPackage }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "heartbeat-${version}";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
rev = "v${version}";
|
||||
sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/elastic/beats";
|
||||
|
||||
subPackages = [ "heartbeat" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lightweight shipper for uptime monitoring";
|
||||
homepage = https://www.elastic.co/products/beats;
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.fadenb ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
25
pkgs/misc/logging/metricbeat/default.nix
Normal file
25
pkgs/misc/logging/metricbeat/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, buildGoPackage }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "metricbeat-${version}";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
rev = "v${version}";
|
||||
sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/elastic/beats";
|
||||
|
||||
subPackages = [ "metricbeat" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lightweight shipper for metrics";
|
||||
homepage = https://www.elastic.co/products/beats;
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.fadenb ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
36
pkgs/misc/logging/packetbeat/default.nix
Normal file
36
pkgs/misc/logging/packetbeat/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ stdenv, fetchFromGitHub, buildGoPackage, libpcap }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "packetbeat-${version}";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
rev = "v${version}";
|
||||
sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/elastic/beats";
|
||||
|
||||
subPackages = [ "packetbeat" ];
|
||||
|
||||
buildInputs = [ libpcap ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Network packet analyzer that ships data to Elasticsearch";
|
||||
longDescription = ''
|
||||
Packetbeat is an open source network packet analyzer that ships the
|
||||
data to Elasticsearch.
|
||||
|
||||
Think of it like a distributed real-time Wireshark with a lot more
|
||||
analytics features. The Packetbeat shippers sniff the traffic between
|
||||
your application processes, parse on the fly protocols like HTTP, MySQL,
|
||||
PostgreSQL, Redis or Thrift and correlate the messages into transactions.
|
||||
'';
|
||||
homepage = https://www.elastic.co/products/beats;
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.fadenb ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -83,6 +83,12 @@ in rec {
|
||||
filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
|
||||
};
|
||||
|
||||
ubootOdroidXU3 = buildUBoot rec {
|
||||
defconfig = "odroid-xu3_defconfig";
|
||||
targetPlatforms = ["armv7l-linux"];
|
||||
filesToInstall = ["u-boot-dtb.bin"];
|
||||
};
|
||||
|
||||
ubootPcduino3Nano = buildUBoot rec {
|
||||
defconfig = "Linksprite_pcDuino3_Nano_defconfig";
|
||||
targetPlatforms = ["armv7l-linux"];
|
||||
|
||||
@ -73,6 +73,10 @@ stdenv.mkDerivation rec {
|
||||
mkdir $out/sbin
|
||||
ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
|
||||
ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
|
||||
|
||||
# Add extra configuration
|
||||
mkdir $out/etc/bluetooth
|
||||
ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -40,7 +40,13 @@ stdenv.mkDerivation rec {
|
||||
longDescription = ''
|
||||
CRDA acts as the udev helper for communication between the kernel and
|
||||
userspace for regulatory compliance. It relies on nl80211 for communication.
|
||||
|
||||
CRDA is intended to be run only through udev communication from the kernel.
|
||||
To use it under NixOS, add
|
||||
|
||||
services.udev.packages = [ pkgs.crda ];
|
||||
|
||||
to the system configuration.
|
||||
'';
|
||||
homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/;
|
||||
license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site
|
||||
|
||||
@ -19,17 +19,17 @@ stdenv.mkDerivation rec {
|
||||
preConfigure =
|
||||
''
|
||||
export PATH=${systemd.udev.bin}/sbin:$PATH
|
||||
substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/
|
||||
substituteInPlace user/Makefile.in \
|
||||
--replace /sbin '$(sbindir)'
|
||||
substituteInPlace user/legacy/Makefile.in \
|
||||
--replace /sbin/ $out/sbin/ \
|
||||
--replace '$(DESTDIR)/lib/drbd' $out/lib/drbd
|
||||
--replace '$(DESTDIR)/lib/drbd' '$(DESTDIR)$(LIBDIR)'
|
||||
substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd
|
||||
substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm
|
||||
'';
|
||||
|
||||
makeFlags = "SHELL=${stdenv.shell}";
|
||||
|
||||
installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d DESTDIR=$(out)";
|
||||
installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.drbd.org/;
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }:
|
||||
{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kmscube-2016-09-19";
|
||||
name = "kmscube-2017-03-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robclark";
|
||||
repo = "kmscube";
|
||||
rev = "8c6a20901f95e1b465bbca127f9d47fcfb8762e6";
|
||||
sha256 = "045pf4q3g5b54cdbxppn1dxpcn81h630vmhrixz1d5bcl822nhwj";
|
||||
src = fetchgit {
|
||||
url = git://anongit.freedesktop.org/mesa/kmscube;
|
||||
rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea";
|
||||
sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
|
||||
let
|
||||
name = "wireguard-${version}";
|
||||
|
||||
version = "0.0.20170223";
|
||||
version = "0.0.20170320.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
|
||||
sha256 = "6d2c8cd29c4f9fb404546a4749ec050739a26b4a49b5864f1dec531377c3c50d";
|
||||
sha256 = "19rcsmwcb9jp4lrfrkf1x78y4i6dcqx5p7kmcbjnbwl0nkc48vr8";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = ''
|
||||
configureFlags="$configureFlags --includedir=$dev/include"
|
||||
'';
|
||||
|
||||
configureFlags = ''
|
||||
--with-apr=${apr.dev}
|
||||
--with-apr-util=${aprutil.dev}
|
||||
@ -67,6 +68,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
stripDebugList = "lib modules bin";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $doc/share/doc/httpd
|
||||
mv $out/manual $doc/share/doc/httpd
|
||||
|
||||
@ -62,6 +62,6 @@ stdenv.mkDerivation {
|
||||
homepage = http://nginx.org;
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice raskin ];
|
||||
maintainers = with maintainers; [ thoughtpolice raskin fpletz ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -66,7 +66,8 @@ stdenv.mkDerivation rec {
|
||||
++ optional (!enableDomainController) "--without-ad-dc"
|
||||
++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# To build in parallel.
|
||||
buildPhase = "python buildtools/bin/waf build -j $NIX_BUILD_CORES";
|
||||
|
||||
# Some libraries don't have /lib/samba in RPATH but need it.
|
||||
# Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \;
|
||||
|
||||
@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
preConfigure = ''
|
||||
# Fix hard-coded installation paths, so make does not try to overwrite our
|
||||
# Python installation.
|
||||
|
||||
@ -29,11 +29,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
|
||||
# Also these libraries: python3-guestfs
|
||||
# FIXME: move xxd into a separate package so we don't have to pull in all of vim.
|
||||
propagatedBuildInputs = (with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]) ++
|
||||
buildInputs =
|
||||
map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
|
||||
gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
|
||||
] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
|
||||
|
||||
pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ];
|
||||
|
||||
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
|
||||
|
||||
postInstall = ''
|
||||
|
||||
34
pkgs/tools/misc/odroid-xu3-bootloader/default.nix
Normal file
34
pkgs/tools/misc/odroid-xu3-bootloader/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "odroid-xu3-bootloader-2015-12-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hardkernel";
|
||||
repo = "u-boot";
|
||||
rev = "fe2f831fd44a4071f58a42f260164544697aa666";
|
||||
sha256 = "1h5yvawzla0vqhkk98gxcwc824bhc936bh6j77qkyspvqcw761fr";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel_1mb_uboot/{bl2,tzsw}.*
|
||||
install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel/bl1.*
|
||||
ln -sf ${ubootOdroidXU3}/u-boot-dtb.bin $out/lib/sd_fuse-xu3/u-boot-dtb.bin
|
||||
|
||||
install -Dm755 $src/sd_fuse/hardkernel_1mb_uboot/sd_fusing.1M.sh $out/bin/sd_fuse-xu3
|
||||
sed -i \
|
||||
-e '1i#!${stdenv.shell}' \
|
||||
-e '1iPATH=${lib.makeBinPath [ coreutils ]}:$PATH' \
|
||||
-e '/set -x/d' \
|
||||
-e 's,.\/sd_fusing\.sh,sd_fuse-xu3,g' \
|
||||
-e "s,\./,$out/lib/sd_fuse-xu3/,g" \
|
||||
$out/bin/sd_fuse-xu3
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
description = "Secure boot enabled boot loader for ODROID-XU{3,4}";
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
@ -16,8 +16,6 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "1vxczk22f58nbikvj47s2x1gzh6q4mbgwnf091p00h3b6nxppdgn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pythonPackages.pycurl ];
|
||||
|
||||
patches = [ ./detect_serverbindir.patch ];
|
||||
|
||||
buildInputs =
|
||||
@ -27,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
pythonPath = with pythonPackages;
|
||||
[ pycups pycurl dbus-python pygobject3 requests2 pycairo ];
|
||||
[ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ];
|
||||
|
||||
configureFlags =
|
||||
[ "--with-udev-rules"
|
||||
@ -35,6 +33,8 @@ in stdenv.mkDerivation rec {
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
];
|
||||
|
||||
stripDebugList = "bin lib etc/udev";
|
||||
|
||||
postInstall =
|
||||
let
|
||||
giTypelibPath = stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gdk_pixbuf.out gtk3.out pango.out atk.out libnotify.out ];
|
||||
@ -44,6 +44,7 @@ in stdenv.mkDerivation rec {
|
||||
--set GI_TYPELIB_PATH ${giTypelibPath} \
|
||||
--set CUPS_DATADIR ${cups-filters}/share/cups"
|
||||
wrapPythonPrograms
|
||||
|
||||
# The program imports itself, so we need to move shell wrappers to a proper place.
|
||||
fixupWrapper() {
|
||||
mv "$out/share/system-config-printer/$2.py" \
|
||||
|
||||
@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
|
||||
pythonPackages.ntplib
|
||||
pythonPackages.simplejson
|
||||
pythonPackages.pyyaml
|
||||
pythonPackages.pymongo
|
||||
pythonPackages.pymongo_2_9_1
|
||||
pythonPackages.python-etcd
|
||||
pythonPackages.consul
|
||||
docker_1_10
|
||||
|
||||
@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
|
||||
++ optionals gnutlsSupport [ gnutls nettle ]
|
||||
++ optional opensslSupport openssl;
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = {
|
||||
description = "Toolkit for RTMP streams";
|
||||
homepage = http://rtmpdump.mplayerhq.hu/;
|
||||
|
||||
@ -902,6 +902,8 @@ with pkgs;
|
||||
|
||||
fastJson = callPackage ../development/libraries/fastjson { };
|
||||
|
||||
filebeat = callPackage ../misc/logging/filebeat { };
|
||||
|
||||
filebench = callPackage ../tools/misc/filebench { };
|
||||
|
||||
fsmon = callPackage ../tools/misc/fsmon { };
|
||||
@ -944,6 +946,8 @@ with pkgs;
|
||||
|
||||
gti = callPackage ../tools/misc/gti { };
|
||||
|
||||
heartbeat = callPackage ../misc/logging/heartbeat { };
|
||||
|
||||
heatseeker = callPackage ../tools/misc/heatseeker { };
|
||||
|
||||
hexio = callPackage ../development/tools/hexio { };
|
||||
@ -970,6 +974,8 @@ with pkgs;
|
||||
|
||||
meson = callPackage ../development/tools/build-managers/meson { };
|
||||
|
||||
metricbeat = callPackage ../misc/logging/metricbeat { };
|
||||
|
||||
mp3fs = callPackage ../tools/filesystems/mp3fs { };
|
||||
|
||||
mpdcron = callPackage ../tools/audio/mpdcron { };
|
||||
@ -3320,6 +3326,8 @@ with pkgs;
|
||||
nix = nixUnstable;
|
||||
};
|
||||
|
||||
packetbeat = callPackage ../misc/logging/packetbeat { };
|
||||
|
||||
packetdrill = callPackage ../tools/networking/packetdrill { };
|
||||
|
||||
pakcs = callPackage ../development/compilers/pakcs {};
|
||||
@ -5496,6 +5504,10 @@ with pkgs;
|
||||
|
||||
ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };
|
||||
|
||||
ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n {
|
||||
ocamlPackages = ocamlPackages_4_03;
|
||||
};
|
||||
|
||||
opa = callPackage ../development/compilers/opa {
|
||||
nodejs = nodejs-4_x;
|
||||
ocamlPackages = ocamlPackages_4_02;
|
||||
@ -10529,7 +10541,7 @@ with pkgs;
|
||||
spidermonkey = spidermonkey_1_8_5;
|
||||
python = python27;
|
||||
sphinx = python27Packages.sphinx;
|
||||
erlang = erlangR16;
|
||||
erlang = erlangR17;
|
||||
};
|
||||
|
||||
couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {
|
||||
@ -10685,7 +10697,9 @@ with pkgs;
|
||||
|
||||
neard = callPackage ../servers/neard { };
|
||||
|
||||
nginx = callPackage ../servers/http/nginx/stable.nix {
|
||||
nginx = nginxStable;
|
||||
|
||||
nginxStable = callPackage ../servers/http/nginx/stable.nix {
|
||||
# We don't use `with` statement here on purpose!
|
||||
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
|
||||
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
|
||||
@ -11094,7 +11108,7 @@ with pkgs;
|
||||
|
||||
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
|
||||
|
||||
yaws = callPackage ../servers/http/yaws { erlang = erlangR17; };
|
||||
yaws = callPackage ../servers/http/yaws { };
|
||||
|
||||
zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {});
|
||||
|
||||
@ -11937,6 +11951,8 @@ with pkgs;
|
||||
|
||||
nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
|
||||
|
||||
odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
|
||||
|
||||
pagemon = callPackage ../os-specific/linux/pagemon { };
|
||||
|
||||
pam = callPackage ../os-specific/linux/pam { };
|
||||
@ -12133,6 +12149,7 @@ with pkgs;
|
||||
ubootBananaPi
|
||||
ubootBeagleboneBlack
|
||||
ubootJetsonTK1
|
||||
ubootOdroidXU3
|
||||
ubootPcduino3Nano
|
||||
ubootRaspberryPi
|
||||
ubootRaspberryPi2
|
||||
@ -14715,6 +14732,8 @@ with pkgs;
|
||||
|
||||
pig = callPackage ../applications/networking/cluster/pig { };
|
||||
|
||||
pijul = callPackage ../applications/version-management/pijul {};
|
||||
|
||||
planner = callPackage ../applications/office/planner { };
|
||||
|
||||
playonlinux = callPackage ../applications/misc/playonlinux {
|
||||
@ -18093,10 +18112,10 @@ with pkgs;
|
||||
inherit (callPackage ../applications/networking/cluster/terraform {})
|
||||
terraform_0_8_5
|
||||
terraform_0_8_8
|
||||
terraform_0_9_0;
|
||||
terraform_0_9_1;
|
||||
|
||||
terraform_0_8 = terraform_0_8_8;
|
||||
terraform_0_9 = terraform_0_9_0;
|
||||
terraform_0_9 = terraform_0_9_1;
|
||||
terraform = terraform_0_8;
|
||||
|
||||
terragrunt = callPackage ../applications/networking/cluster/terragrunt {
|
||||
|
||||
@ -384,6 +384,8 @@ let
|
||||
|
||||
ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
|
||||
|
||||
ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };
|
||||
|
||||
ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };
|
||||
|
||||
ojquery = callPackage ../development/ocaml-modules/ojquery { };
|
||||
|
||||
@ -20081,7 +20081,7 @@ in {
|
||||
sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
|
||||
buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
{ runCommand, fetchFromGitHub, git }:
|
||||
|
||||
let
|
||||
version = "2017-03-13";
|
||||
rev = "e5b7b45fa4e1168715a1132a65ad89fbc1d5ed82";
|
||||
sha256 = "1glwd7b5ckiw2nzc28djyarml21cqdajc1jn03vzf4sl58bvahyb";
|
||||
version = "2017-03-19";
|
||||
rev = "6ac4724ed839594a132f5199d70d40fa15bd6b7a";
|
||||
sha256 = "159b82zma3y0kcg55c6zm6ddsw4jm0c4y85b6l1ny108l9k3hy79";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user