mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 22:50:49 +00:00
Merge remote-tracking branch 'channels/nixos-unstable' into staging
This commit is contained in:
John Ericson
commit
7db0b80c61
|
|
@ -33,7 +33,8 @@
|
|||
|
||||
, name ? "nixos-disk-image"
|
||||
|
||||
, format ? "raw"
|
||||
, # Disk image format, one of qcow2, vpc, raw.
|
||||
format ? "raw"
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
|
@ -45,7 +46,7 @@ let
|
|||
raw = "img";
|
||||
};
|
||||
|
||||
nixpkgs = lib.cleanSource pkgs.path;
|
||||
nixpkgs = cleanSource pkgs.path;
|
||||
|
||||
channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''
|
||||
mkdir -p $out
|
||||
|
|
@ -64,7 +65,7 @@ let
|
|||
${channelSources}
|
||||
'';
|
||||
|
||||
prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot libfaketime config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
|
||||
prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
|
||||
|
||||
# I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
|
||||
# image building logic. The comment right below this now appears in 4 different places in nixpkgs :)
|
||||
|
|
@ -73,7 +74,7 @@ let
|
|||
targets = map (x: x.target) contents;
|
||||
|
||||
prepareImage = ''
|
||||
export PATH=${pkgs.lib.makeSearchPathOutput "bin" "bin" prepareImageInputs}
|
||||
export PATH=${makeSearchPathOutput "bin" "bin" prepareImageInputs}
|
||||
|
||||
mkdir $out
|
||||
diskImage=nixos.raw
|
||||
|
|
@ -86,8 +87,8 @@ let
|
|||
offset=0
|
||||
''}
|
||||
|
||||
faketime -f "1970-01-01 00:00:01" mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
|
||||
|
||||
mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
|
||||
|
||||
root="$PWD/root"
|
||||
mkdir -p $root
|
||||
|
||||
|
|
@ -124,15 +125,7 @@ let
|
|||
fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure
|
||||
|
||||
echo "copying staging root to image..."
|
||||
# If we don't faketime, we can end up with timestamps other than 1 on the nix store, which
|
||||
# will confuse Nix in some situations (e.g., breaking image builds in the target image)
|
||||
# N.B: I use 0 here, which results in timestamp = 1 in the image. It's weird but see
|
||||
# https://github.com/lkl/linux/issues/393. Also, running under faketime makes `cptofs` super
|
||||
# noisy and it prints out that it can't find a bunch of files, and then works anyway. We'll
|
||||
# shut it up someday but trying to do a stderr filter through grep is running into some nasty
|
||||
# bug in some eval nonsense we have in runInLinuxVM and I'm sick of trying to fix it.
|
||||
faketime -f "1970-01-01 00:00:00" \
|
||||
cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
|
||||
cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
|
||||
'';
|
||||
in pkgs.vmTools.runInLinuxVM (
|
||||
pkgs.runCommand name
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@ with lib;
|
|||
|
||||
let
|
||||
cfg = config.services.nzbget;
|
||||
nzbget = pkgs.nzbget;
|
||||
in
|
||||
{
|
||||
nzbget = pkgs.nzbget; in {
|
||||
options = {
|
||||
services.nzbget = {
|
||||
enable = mkEnableOption "NZBGet";
|
||||
|
|
@ -42,21 +40,41 @@ in
|
|||
p7zip
|
||||
];
|
||||
preStart = ''
|
||||
test -d /var/lib/nzbget || {
|
||||
echo "Creating nzbget state directoy in /var/lib/"
|
||||
mkdir -p /var/lib/nzbget
|
||||
datadir=/var/lib/nzbget
|
||||
cfgtemplate=${cfg.package}/share/nzbget/nzbget.conf
|
||||
test -d $datadir || {
|
||||
echo "Creating nzbget data directory in $datadir"
|
||||
mkdir -p $datadir
|
||||
}
|
||||
test -f /var/lib/nzbget/nzbget.conf || {
|
||||
echo "nzbget.conf not found. Copying default config to /var/lib/nzbget/nzbget.conf"
|
||||
cp ${cfg.package}/share/nzbget/nzbget.conf /var/lib/nzbget/nzbget.conf
|
||||
echo "Setting file mode of nzbget.conf to 0700 (needs to be written and contains plaintext credentials)"
|
||||
chmod 0700 /var/lib/nzbget/nzbget.conf
|
||||
test -f $configfile || {
|
||||
echo "nzbget.conf not found. Copying default config $cfgtemplate to $configfile"
|
||||
cp $cfgtemplate $configfile
|
||||
echo "Setting $configfile permissions to 0700 (needs to be written and contains plaintext credentials)"
|
||||
chmod 0700 $configfile
|
||||
echo "Setting temporary \$MAINDIR variable in default config required in order to allow nzbget to complete initial start"
|
||||
echo "Remember to change this to a proper value once NZBGet startup has been completed"
|
||||
sed -i -e 's/MainDir=.*/MainDir=\/tmp/g' /var/lib/nzbget/nzbget.conf
|
||||
sed -i -e 's/MainDir=.*/MainDir=\/tmp/g' $configfile
|
||||
}
|
||||
echo "Ensuring proper ownership of /var/lib/nzbget (${cfg.user}:${cfg.group})."
|
||||
chown -R ${cfg.user}:${cfg.group} /var/lib/nzbget
|
||||
echo "Ensuring proper ownership of $datadir (${cfg.user}:${cfg.group})."
|
||||
chown -R ${cfg.user}:${cfg.group} $datadir
|
||||
'';
|
||||
|
||||
script = ''
|
||||
configfile=/var/lib/nzbget/nzbget.conf
|
||||
args="--daemon --configfile $configfile"
|
||||
# The script in preStart (above) copies nzbget's config template to datadir on first run, containing paths that point to the nzbget derivation installed at the time.
|
||||
# These paths break when nzbget is upgraded & the original derivation is garbage collected. If such broken paths are found in the config file, override them to point to
|
||||
# the currently installed nzbget derivation.
|
||||
cfgfallback () {
|
||||
local hit=`grep -Po "(?<=^$1=).*+" "$configfile" | sed 's/[ \t]*$//'` # Strip trailing whitespace
|
||||
( test $hit && test -e $hit ) || {
|
||||
echo "In $configfile, valid $1 not found; falling back to $1=$2"
|
||||
args+=" -o $1=$2"
|
||||
}
|
||||
}
|
||||
cfgfallback ConfigTemplate ${cfg.package}/share/nzbget/nzbget.conf
|
||||
cfgfallback WebDir ${cfg.package}/share/nzbget/webui
|
||||
${cfg.package}/bin/nzbget $args
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
|
@ -64,7 +82,6 @@ in
|
|||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
PermissionsStartOnly = "true";
|
||||
ExecStart = "${cfg.package}/bin/nzbget --daemon --configfile /var/lib/nzbget/nzbget.conf";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,17 +8,20 @@ let
|
|||
${optionalString cfg.userControlled.enable ''
|
||||
ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
|
||||
update_config=1''}
|
||||
${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: let
|
||||
psk = if networkConfig.psk != null
|
||||
then ''"${networkConfig.psk}"''
|
||||
else networkConfig.pskRaw;
|
||||
priority = networkConfig.priority;
|
||||
${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let
|
||||
key = if psk != null
|
||||
then ''"${psk}"''
|
||||
else pskRaw;
|
||||
baseAuth = if key != null
|
||||
then ''psk=${key}''
|
||||
else ''key_mgmt=NONE'';
|
||||
in ''
|
||||
network={
|
||||
ssid="${ssid}"
|
||||
${optionalString (psk != null) ''psk=${psk}''}
|
||||
${optionalString (psk == null) ''key_mgmt=NONE''}
|
||||
${optionalString (priority != null) ''priority=${toString priority}''}
|
||||
${optionalString hidden "scan_ssid=1"}
|
||||
${if (auth != null) then auth else baseAuth}
|
||||
${extraConfig}
|
||||
}
|
||||
'') cfg.networks)}
|
||||
'' else "/etc/wpa_supplicant.conf";
|
||||
|
|
@ -70,6 +73,32 @@ in {
|
|||
Mutually exclusive with <varname>psk</varname>.
|
||||
'';
|
||||
};
|
||||
|
||||
auth = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = ''
|
||||
key_mgmt=WPA-EAP
|
||||
eap=PEAP
|
||||
identity="user@example.com"
|
||||
password="secret"
|
||||
'';
|
||||
description = ''
|
||||
Use this option to configure advanced authentication methods like EAP.
|
||||
See wpa_supplicant.conf(5) for example configurations.
|
||||
|
||||
Mutually exclusive with <varname>psk</varname> and <varname>pskRaw</varname>.
|
||||
'';
|
||||
};
|
||||
|
||||
hidden = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Set this to <literal>true</literal> if the SSID of the network is hidden.
|
||||
'';
|
||||
};
|
||||
|
||||
priority = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
default = null;
|
||||
|
|
@ -83,6 +112,19 @@ in {
|
|||
policy, signal strength, etc.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
example = ''
|
||||
bssid_blacklist=02:11:22:33:44:55 02:22:aa:44:55:66
|
||||
'';
|
||||
description = ''
|
||||
Extra configuration lines appended to the network block.
|
||||
See wpa_supplicant.conf(5) for available options.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
});
|
||||
description = ''
|
||||
|
|
@ -128,8 +170,8 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = flip mapAttrsToList cfg.networks (name: cfg: {
|
||||
assertion = cfg.psk == null || cfg.pskRaw == null;
|
||||
message = ''networking.wireless."${name}".psk and networking.wireless."${name}".pskRaw are mutually exclusive'';
|
||||
assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1;
|
||||
message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive'';
|
||||
});
|
||||
|
||||
environment.systemPackages = [ pkgs.wpa_supplicant ];
|
||||
|
|
|
|||
|
|
@ -27,14 +27,13 @@ in rec {
|
|||
|
||||
preview = mkStudio {
|
||||
pname = "android-studio-preview";
|
||||
version = "3.1.0.0"; # "Android Studio 3.1 Canary 1"
|
||||
build = "171.4415322";
|
||||
sha256Hash = "08xgwv6mg2zxys9dqjfz66h60g640ni3snyb89ij0fkmd28rbxgj";
|
||||
version = "3.1.0.2"; # "Android Studio 3.1 Canary 3"
|
||||
build = "171.4435470";
|
||||
sha256Hash = "1yqzxmzqxvhq9q9k07yfchh2al0wdy0j5k5fmjv4zbw20panx10h";
|
||||
|
||||
meta = stable.meta // {
|
||||
description = "The Official IDE for Android (preview version)";
|
||||
homepage = https://developer.android.com/studio/preview/index.html;
|
||||
maintainers = with stdenv.lib.maintainers; [ primeos ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -700,10 +700,10 @@
|
|||
ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
|
||||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.4.1.tar";
|
||||
sha256 = "0gv1q1xkhjab0l77c92znn6x0dfdbnj6hc48axmrx6a7zwbm3g2r";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.4.2.tar";
|
||||
sha256 = "1j9hgxa6csj3iz5vrl22xvhl9lxhig0n1cixgzhs1sb3z3nn2li6";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -1464,10 +1464,10 @@
|
|||
}) {};
|
||||
nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "nlinum";
|
||||
version = "1.8";
|
||||
version = "1.8.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nlinum-1.8.el";
|
||||
sha256 = "0bb1c8a68fzv59q2ri7ppbx8cm7sa8n4hxxvxv73db2dcgwrgwga";
|
||||
url = "https://elpa.gnu.org/packages/nlinum-1.8.1.el";
|
||||
sha256 = "0fx560yfjy6nqgs1d3fiv0h46i8q3r592clsia7nihkriah7rlwf";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -1556,10 +1556,10 @@
|
|||
}) {};
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20171030";
|
||||
version = "20171106";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-20171030.tar";
|
||||
sha256 = "1lszws6b5s4r7w871cyigs433dflf6w0y33fj6rzrq8240d5092i";
|
||||
url = "https://elpa.gnu.org/packages/org-20171106.tar";
|
||||
sha256 = "08gziccqfrl65v18ri2m6csb6smyafaz7pv86gnvpw05g7aj6alq";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3691,12 +3691,12 @@
|
|||
caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "caml";
|
||||
version = "4.6.0pre1";
|
||||
version = "4.6.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml";
|
||||
repo = "ocaml";
|
||||
rev = "500625015d40f716e19278209faaa44216dcff58";
|
||||
sha256 = "1s10wirx080yl0gd2n09lw5kj8yy1mbiipmcr8gpfyc8dq7kfjna";
|
||||
rev = "0d68080b95016f747b7cb63dd36ccdd42d40016e";
|
||||
sha256 = "1dxg82xqjx4yh4sg2dy48ybn4czv9yq0q3zpr29sxp1grvwvrg2b";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
|
||||
|
|
@ -6437,12 +6437,12 @@
|
|||
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "cython-mode";
|
||||
version = "0.27.2";
|
||||
version = "0.27.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cython";
|
||||
repo = "cython";
|
||||
rev = "41b4a28d7c7c505d58502c9cf69bde2e33091de0";
|
||||
sha256 = "04k534xyr8816821y0lf2dq24bzvb40v99ijdwgy5qhv4rjxbr18";
|
||||
rev = "8ad16fc871be075f889d5e7c2892db3e4c8ce978";
|
||||
sha256 = "144mqqyaid6w9qx38m88snd3c8qm2k1a73vs21h9cmnp19gigfby";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
|
||||
|
|
@ -6521,12 +6521,12 @@
|
|||
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "darcula-theme";
|
||||
version = "1.7";
|
||||
version = "2.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "fommil";
|
||||
repo = "emacs-darcula-theme";
|
||||
rev = "25f179b9fb72c1b95a3907aa4b4a44f8d261e45a";
|
||||
sha256 = "0x1amh0ycjvk218d6cyqizkak47b6r1wczakbfkvnbr0khgkgmr7";
|
||||
rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976";
|
||||
sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
|
||||
|
|
@ -8123,12 +8123,12 @@
|
|||
eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "eacl";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redguardtoo";
|
||||
repo = "eacl";
|
||||
rev = "c7a8d705295dc51cc306cb4c2d8773e24c4c74f4";
|
||||
sha256 = "1f3liqrw55v9wnf7g475iabx4pf7gbg2x82mqrf22hhkvxzi2b2b";
|
||||
rev = "ef58d13fbff4b5c49f934cfb9e3fd6ee219ef4b2";
|
||||
sha256 = "0xxxzdr6iddxwx8z4lfay4n9r1ry8571lj2gadz5ycff6f6bxmhb";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
|
||||
|
|
@ -8627,12 +8627,12 @@
|
|||
egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "egison-mode";
|
||||
version = "3.6.4";
|
||||
version = "3.7.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "egisatoshi";
|
||||
repo = "egison3";
|
||||
rev = "62c99118f32dd23a088e2d9c0d6b7b755206cac6";
|
||||
sha256 = "1f0s9pvns4gq6xzp4vp74xxxbmzp06vdv0jgh0x1xy0mfklgll8x";
|
||||
rev = "accb84375895946f0d0bed3917e0193074bd4131";
|
||||
sha256 = "0adxbjbmph186amkyhyl9syypfawarxmyk80zz4c0b6bgxy15rc1";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
|
||||
|
|
@ -9785,12 +9785,12 @@
|
|||
enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "enh-ruby-mode";
|
||||
version = "20170417";
|
||||
version = "20171101";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zenspider";
|
||||
repo = "enhanced-ruby-mode";
|
||||
rev = "2e483fe316ff993c80eafcf4ce4defd87d97776d";
|
||||
sha256 = "1xzhgmbc9iplxmqm7gc4hqk6nfdhqcrxz8g9kkf5ww3dx1czhiv7";
|
||||
rev = "9467cd7fc8b6bb3caf644b223e3046fc32013ccb";
|
||||
sha256 = "0spsgfkka6sld8ac3m2biydyp8xj84vxa0w7apqvhhmfk3klbbhf";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
|
||||
|
|
@ -10149,12 +10149,12 @@
|
|||
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "erlang";
|
||||
version = "20.1.3";
|
||||
version = "20.1.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "erlang";
|
||||
repo = "otp";
|
||||
rev = "a98379d0519c28f9bc9b673ed2c09fb1ad52456e";
|
||||
sha256 = "1672yqqh7ql88c6ifv555wvqrj8nyn5a2nph43n2nc43h7hhz17c";
|
||||
rev = "3e8c1ff94c0a73df71daadd4eb782c21c49f22d9";
|
||||
sha256 = "19vd6x20i3pc3ddrjalli937i44z6z2yrdg7ir3gpaghhx8fhcav";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
|
||||
|
|
@ -11051,12 +11051,12 @@
|
|||
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "evil-nerd-commenter";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redguardtoo";
|
||||
repo = "evil-nerd-commenter";
|
||||
rev = "92bee71aa6fbb36299a4e69e710da786f3694637";
|
||||
sha256 = "1sxwiar17jvqj7plf7jdpwx9kymabr0dsfl7mbkcxpzvrfdlmp12";
|
||||
rev = "76fd0c5692e9852a2d6fc6c0ce0e782792c28ddd";
|
||||
sha256 = "1bydqdk52q8777m234jxp03y2zz23204r1fyq39ks9h9bpglc561";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
|
||||
|
|
@ -11195,22 +11195,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-smartparens = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
|
||||
evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
|
||||
melpaBuild {
|
||||
pname = "evil-smartparens";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "expez";
|
||||
repo = "evil-smartparens";
|
||||
rev = "12521212b8e4a02cbec733882bb89c6fac37301f";
|
||||
sha256 = "0j2m3rsszivyjhv8bjid5fdqaf1vwp8rf55b27y4vc2489wrw415";
|
||||
rev = "9fe4eed1c6327197afe6c13bb0771e18908aff00";
|
||||
sha256 = "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
|
||||
sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
|
||||
name = "evil-smartparens";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs evil smartparens ];
|
||||
packageRequires = [ emacs evil smartparens ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/evil-smartparens";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -17141,12 +17141,12 @@
|
|||
helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-ext";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cute-jumper";
|
||||
repo = "helm-ext";
|
||||
rev = "115a3ca9a466fa84c1874ac6175fdf2256c3765c";
|
||||
sha256 = "19bcrgj531par1ayhgwxvzz28fyd7dx5flslxf1vl4qawhn173fz";
|
||||
rev = "c8ac56918b200239b3f73a4e6a031deecc2c5646";
|
||||
sha256 = "08c6n4zr6s3h7y0kk6g51xqs6hs29hkfmn55jfjw6hpimbk3vi1j";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
|
||||
|
|
@ -22758,12 +22758,12 @@
|
|||
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "magithub";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vermiculus";
|
||||
repo = "magithub";
|
||||
rev = "959e7b259697c79ccf46b95827575d3e15e83d30";
|
||||
sha256 = "19m7qmp5pi5l3mak1j475qxgnpr4kc4dm7qj80qc4m844bkacc4h";
|
||||
rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794";
|
||||
sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
|
||||
|
|
@ -24987,11 +24987,11 @@
|
|||
}) {};
|
||||
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
|
||||
pname = "notmuch";
|
||||
version = "0.25.1";
|
||||
version = "0.25.2";
|
||||
src = fetchgit {
|
||||
url = "git://git.notmuchmail.org/git/notmuch";
|
||||
rev = "949c27144e0b9294267511993a109c29d319a23d";
|
||||
sha256 = "088f6f5696v8zrgbipshns6gla4zmfpj8n4jm66slgip9fcrbpvb";
|
||||
rev = "83f266136369452b859393429b8530efac2e09fb";
|
||||
sha256 = "0idim2yslpjzbzy5hh9qhw1gy0h9p92rs0jrr8d2l9y8nsnh6zzr";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
|
||||
|
|
@ -25641,8 +25641,8 @@
|
|||
src = fetchFromGitHub {
|
||||
owner = "OmniSharp";
|
||||
repo = "omnisharp-emacs";
|
||||
rev = "906e29a702237f039f24c215fdb561a728a3df1b";
|
||||
sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8";
|
||||
rev = "ad4a19c60f7dc3d52a5b11febdcc9b78930a1e7d";
|
||||
sha256 = "0jc2ap9l0cc636kssld1bqalbriib57sw1rzz45s8r19jqa8w5gm";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
|
||||
|
|
@ -32576,12 +32576,12 @@
|
|||
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "shx";
|
||||
version = "0.0.10";
|
||||
version = "0.0.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "riscy";
|
||||
repo = "shx-for-emacs";
|
||||
rev = "e53d798ba4a4c07a3ee1c194840c937b18c02087";
|
||||
sha256 = "0sig9gpa2wn23skwny9jpvwxax0gbwp143anvgkc5gm87iw2jgrd";
|
||||
rev = "dfeb23f99673479b17b5817aeb5641e7cc0e5a2d";
|
||||
sha256 = "1zljrvanwn37jkc9jpqj8c11dfbqxjz9ivzbpqr0ipskw9gaay7k";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
|
||||
|
|
@ -33920,12 +33920,12 @@
|
|||
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ssh-deploy";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cjohansson";
|
||||
repo = "emacs-ssh-deploy";
|
||||
rev = "dbd8608551bc9e05280415b7b3937b1a151c7718";
|
||||
sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr";
|
||||
rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23";
|
||||
sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
|
||||
|
|
@ -37594,6 +37594,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "wordsmith-mode";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "istib";
|
||||
repo = "wordsmith-mode";
|
||||
rev = "41b10f2fe3589da9812395cb417c3dcf906f0969";
|
||||
sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b5fda506e5b388cd6824d433b89032ed46858dc/recipes/wordsmith-mode";
|
||||
sha256 = "0s6b6dfqn31jdcgs2mlmvwgpr5a4zs4xi8m002ly11c6sn035xb1";
|
||||
name = "wordsmith-mode";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/wordsmith-mode";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }:
|
||||
melpaBuild {
|
||||
pname = "worf";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ callPackage }: {
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20171030";
|
||||
version = "20171106";
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/elpa/org-20171030.tar";
|
||||
sha256 = "1g2dyzy1844lli2hhfjnbskn1mskccgaaf0mxb1cm0zhhas8bnfd";
|
||||
url = "http://orgmode.org/elpa/org-20171106.tar";
|
||||
sha256 = "080zkrbivd0y67ydcqj97c672q6d9d33qgb5z723niy8a8xjrp20";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -14,10 +14,10 @@
|
|||
}) {};
|
||||
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
version = "20171030";
|
||||
version = "20171106";
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/elpa/org-plus-contrib-20171030.tar";
|
||||
sha256 = "0pq2hs5d2i6s036pcs0jn6ld2p1ap08dmbjf17hsh899741mg9cj";
|
||||
url = "http://orgmode.org/elpa/org-plus-contrib-20171106.tar";
|
||||
sha256 = "1ckh7q7kc72qc1wh4xypfadj9dpnn4xzc6ap4gg428q85bi091h1";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An image viewer and organizer";
|
||||
homepage = http://oferkv.github.io/phototonic/;
|
||||
homepage = https://sourceforge.net/projects/phototonic/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
|
|
|
|||
|
|
@ -1,25 +1,30 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtsvg, qtx11extras, muparser, cmake }:
|
||||
{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser,
|
||||
cmake, python3 }:
|
||||
|
||||
mkDerivation rec {
|
||||
name = "albert-${version}";
|
||||
version = "0.12.0";
|
||||
version = "0.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "albertlauncher";
|
||||
repo = "albert";
|
||||
rev = "v${version}";
|
||||
sha256 = "120l7hli2l4qj2s126nawc4dsy4qvwvb0svc42hijry4l8imdhkq";
|
||||
sha256 = "1ryjrbrbgignhkvsv4021l4am8ml7g8v4bs5cp5jj288k4p2rf4n";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
||||
buildInputs = [ qtbase qtsvg qtx11extras muparser ];
|
||||
buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# We don't have virtualbox sdk so disable plugin
|
||||
cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/QStringList dirs = {/a \"$out/lib\"," \
|
||||
src/lib/albert/src/albert/extensionmanager.cpp
|
||||
sed -i "/QStringList dirs = {/a \"$out/libs\"," \
|
||||
lib/albertcore/src/core/albert.cpp
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchipfs }:
|
||||
{ stdenv, fetchipfs, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hello-2.10";
|
||||
|
|
@ -22,4 +22,9 @@ stdenv.mkDerivation rec {
|
|||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
passthru.srcTarball = fetchurl {
|
||||
inherit (src) url;
|
||||
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
on the map, make new tracks and waypoints, see real-time GPS
|
||||
position, etc.
|
||||
'';
|
||||
homepage = http://viking.sourceforge.net/;
|
||||
homepage = https://sourceforge.net/projects/viking/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = with platforms; linux;
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.5.1";
|
||||
version = "0.5.6";
|
||||
name = "baresip-${version}";
|
||||
src=fetchurl {
|
||||
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
|
||||
sha256 = "0yi80gi2vb600n7wi6mk81zfdi1n5pg1dsz7458sb3z5cv5gj8yg";
|
||||
sha256 = "036hvl652zndqj3kmkv8z9pv7r4d1jxq8b7rg8jf0hh82vpyz38l";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [zlib openssl libre librem
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = with platforms; linux;
|
||||
updateWalker = true;
|
||||
downloadPage = "http://mcabber.com/files/";
|
||||
downloadURLRegexp = "mcabber-[0-9.]+[.]tar[.][a-z0-9]+$";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec{
|
|||
"0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else
|
||||
"1dk400ap5qwdhjvn8lnk602f5akayr391fkljxdkrpn5xac01m97";
|
||||
};
|
||||
|
||||
|
||||
meta = {
|
||||
description = "Office program originally named Kingsoft Office";
|
||||
homepage = http://wps-community.org/;
|
||||
|
|
@ -42,6 +42,10 @@ in stdenv.mkDerivation rec{
|
|||
|
||||
dontPatchELF = true;
|
||||
|
||||
# wpsoffice uses `/build` in its own build system making nix things there
|
||||
# references to nix own build directory
|
||||
noAuditTmpdir = true;
|
||||
|
||||
installPhase = ''
|
||||
prefix=$out/opt/kingsoft/wps-office
|
||||
mkdir -p $prefix
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "pari-${version}";
|
||||
version = "2.9.1";
|
||||
version = "2.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
|
||||
sha256 = "0rq7wz9df1xs4acdzzb5dapx8vs6m5py39n2wynw2qv4d2b0ylfw";
|
||||
sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7";
|
||||
};
|
||||
|
||||
buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, gmp, readline, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8.1.beta";
|
||||
version = "2.9.3";
|
||||
name = "pari-unstable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pari.math.u-bordeaux.fr/pub/pari/unstable/pari-${version}.tar.gz";
|
||||
sha256 = "167dcqrqsblqrd7z5pb8jrs9xqm8138mik0s4ihlqcq6c3wndhv1";
|
||||
sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7";
|
||||
};
|
||||
|
||||
buildInputs = [gmp readline];
|
||||
|
|
|
|||
|
|
@ -1,24 +1,17 @@
|
|||
{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="golly";
|
||||
version="2.8";
|
||||
name="${baseName}-${version}";
|
||||
hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
|
||||
url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz";
|
||||
sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
|
||||
stdenv.mkDerivation rec {
|
||||
baseName="golly";
|
||||
version = "3.1";
|
||||
name="${baseName}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "0dn74k3rylhx023n047lz4z6qrqijfcxi0b6jryqklhmm2n532f7";
|
||||
url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
wxGTK perl python2 zlib mesa libX11
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
sourceRoot=$(echo */gui-wx/configure)
|
||||
|
|
@ -37,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
inherit version;
|
||||
description = "Cellular automata simulation program";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lkl-2017-10-18";
|
||||
rev = "bfb315c4612c38427e3239d0a427a125d9ba0ede";
|
||||
name = "lkl-2017-11-10";
|
||||
rev = "52a6a643c7d1dd3031c0cbec75e1ac7a999f3d57";
|
||||
|
||||
outputs = [ "dev" "lib" "out" ];
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
inherit rev;
|
||||
owner = "lkl";
|
||||
repo = "linux";
|
||||
sha256 = "172ccn2gsybnji7giiqq63bvp9nsw8kri88pjlvinwpwsv7x81aa";
|
||||
sha256 = "1i5ywrfxqpykjjalwh9g4rwd4s186cqk3j806d327a67xb2ivxnp";
|
||||
};
|
||||
|
||||
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
attribute_name anonymousPro
|
||||
url http://www.ms-studio.com/FontSales/anonymouspro.html
|
||||
version_link '/AnonymousPro-.*[.]zip$'
|
||||
do_overwrite (){
|
||||
do_overwrite_just_version
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
attribute_name cm_unicode
|
||||
url http://sourceforge.net/projects/cm-unicode/files/cm-unicode/
|
||||
SF_version_dir
|
||||
version_link '[-]otf[.]tar[.][a-z0-9]+/download$'
|
||||
SF_redirect
|
||||
ensure_hash
|
||||
do_overwrite() { do_overwrite_just_version; }
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
let
|
||||
inherit (bootPkgs) ghc;
|
||||
version = "8.2.1.20171030";
|
||||
version = "8.2.1.20171108";
|
||||
|
||||
commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
|
||||
commonPreConfigure = ''
|
||||
|
|
@ -26,8 +26,8 @@ in stdenv.mkDerivation (rec {
|
|||
name = "ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/~ghc/8.2.2-rc2/${name}-src.tar.xz";
|
||||
sha256 = "0m2lx13yscgxmb18nrzhgg5h4kwzcnxdw7rjcqwx4dcwl1k0a724";
|
||||
url = "https://downloads.haskell.org/~ghc/8.2.2-rc3/${name}-src.tar.xz";
|
||||
sha256 = "13h55vcrs243bv4hv8i4jq80rsx5hvhi09r3rcs562d8zk7k665w";
|
||||
};
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ stdenv, fetchurl, coq }:
|
||||
{ stdenv, fetchurl, coq, coqPackages }:
|
||||
|
||||
if !stdenv.lib.versionAtLeast coq.coq-version "8.6"
|
||||
then throw "CoLoR is not available for Coq ${coq.coq-version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-CoLoR-1.3.0";
|
||||
name = "coq${coq.coq-version}-CoLoR-1.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://gforge.inria.fr/frs/download.php/file/36399/color.1.3.0.tar.gz;
|
||||
sha256 = "0n7431mc4a5bn9fsyk5167j2vnbxz4vgggjch4pm0x58lda8mxv1";
|
||||
url = https://gforge.inria.fr/frs/download.php/file/37205/color.1.4.0.tar.gz;
|
||||
sha256 = "1jsp9adsh7w59y41ihbwchryjhjpajgs9bhf8rnb4b3hzccqxgag";
|
||||
};
|
||||
|
||||
buildInputs = [ coq ];
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ coq coqPackages.bignums ];
|
||||
enableParallelBuilding = false;
|
||||
|
||||
installPhase = ''
|
||||
make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
|
||||
|
|
|
|||
|
|
@ -15,9 +15,15 @@ let param =
|
|||
};
|
||||
|
||||
"8.6" = {
|
||||
version = "20170616";
|
||||
rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a";
|
||||
sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9";
|
||||
version = "20171102";
|
||||
rev = "0fdb769e1dc87a278383b44a9f5102cc7ccbafcf";
|
||||
sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
|
||||
};
|
||||
|
||||
"8.7" = {
|
||||
version = "20171102";
|
||||
rev = "ddf746809c211fa7edfdbfe459d5a7e1cca47a44";
|
||||
sha256 = "0jg3x0w8p088b8369qx492hjpq09f9h2i0li6ph3pny6hdkpdzsi";
|
||||
};
|
||||
|
||||
}."${coq.coq-version}"
|
||||
|
|
@ -32,12 +38,14 @@ stdenv.mkDerivation rec {
|
|||
inherit (param) rev sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ coq.ocaml coq.camlp5 ];
|
||||
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
|
||||
propagatedBuildInputs = [ coq ssreflect ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
enableParallelBuilding = false;
|
||||
|
||||
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
|
||||
installPhase = ''
|
||||
make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = git://github.com/QuickChick/QuickChick.git;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
|
||||
|
||||
let param = {
|
||||
"8.7" = {
|
||||
version = "0.6.2";
|
||||
rev = "d76ddde37d918569945774733b7997e8b24daf51";
|
||||
sha256 = "04lnf4b25yarysj848cfl8pd3i3pr3818acyp9hgwdgd1rqmhjwm";
|
||||
};
|
||||
"8.6" = {
|
||||
version = "0.6.1";
|
||||
rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
|
||||
|
|
@ -22,7 +27,7 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ coq ]
|
||||
buildInputs = [ coq coq.camlp5 ]
|
||||
++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]);
|
||||
|
||||
preInstall = ''
|
||||
|
|
|
|||
45
pkgs/development/coq-modules/equations/default.nix
Normal file
45
pkgs/development/coq-modules/equations/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenv, fetchFromGitHub, coq }:
|
||||
|
||||
let param =
|
||||
{
|
||||
"8.6" = {
|
||||
version = "1.0-beta";
|
||||
rev = "v1.0-beta";
|
||||
sha256 = "00pzlh5ij7s2hmpvimq1hjq3fjf0nrk997l3dl51kigx5r5dnvxd";
|
||||
};
|
||||
|
||||
"8.7" = {
|
||||
version = "cdf8c53";
|
||||
rev = "cdf8c53f1f2274b29506f53bff476409ce717dc5";
|
||||
sha256 = "0ipjzmviwnp0ippbkn03ld4j4j0dkzmyidmj4dvpdvymrkv31ai1";
|
||||
};
|
||||
|
||||
}."${coq.coq-version}"
|
||||
; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "coq${coq.coq-version}-equations-${version}";
|
||||
version = "${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattam82";
|
||||
repo = "Coq-Equations";
|
||||
rev = "${param.rev}";
|
||||
sha256 = "${param.sha256}";
|
||||
};
|
||||
|
||||
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ];
|
||||
|
||||
preBuild = "coq_makefile -f _CoqProject -o Makefile";
|
||||
|
||||
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://mattam82.github.io/Coq-Equations/;
|
||||
description = "A plugin for Coq to add dependent pattern-matching";
|
||||
maintainers = with maintainers; [ jwiegley ];
|
||||
platforms = coq.meta.platforms;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }:
|
||||
{ stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp, bignums }:
|
||||
|
||||
let param =
|
||||
if stdenv.lib.versionAtLeast coq.coq-version "8.5"
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
buildInputs = [ coq ];
|
||||
buildInputs = [ coq bignums ];
|
||||
propagatedBuildInputs = [ coquelicot flocq mathcomp ];
|
||||
|
||||
configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Interval";
|
||||
|
|
|
|||
|
|
@ -2,10 +2,32 @@
|
|||
|
||||
let param =
|
||||
{
|
||||
version = "1.6.1";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
|
||||
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
|
||||
}; in
|
||||
"8.4" = {
|
||||
version = "1.6.1";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
|
||||
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
|
||||
};
|
||||
|
||||
"8.5" = {
|
||||
version = "1.6.1";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
|
||||
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
|
||||
};
|
||||
|
||||
"8.6" = {
|
||||
version = "1.6.4";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
|
||||
sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
|
||||
};
|
||||
|
||||
"8.7" = {
|
||||
version = "1.6.4";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
|
||||
sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
|
||||
};
|
||||
|
||||
}."${coq.coq-version}"
|
||||
; in
|
||||
|
||||
callPackage ./generic.nix {
|
||||
name = "coq${coq.coq-version}-mathcomp-${param.version}";
|
||||
|
|
|
|||
53
pkgs/development/coq-modules/metalib/default.nix
Normal file
53
pkgs/development/coq-modules/metalib/default.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ stdenv, fetchgit, coq, ocamlPackages, haskellPackages, which, ott
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "metalib-${coq.coq-version}-${version}";
|
||||
version = "20170713";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/plclub/metalib.git;
|
||||
rev = "44e40aa082452dd333fc1ca2d2cc55311519bd52";
|
||||
sha256 = "1pra0nvx69q8d4bvpcvh9ngic1cy6z1chi03x56nisfqnc61b6y9";
|
||||
};
|
||||
|
||||
# The 'lngen' command-line utility is built from Haskell sources
|
||||
lngen = with haskellPackages; mkDerivation {
|
||||
pname = "lngen";
|
||||
version = "0.0.1";
|
||||
src = fetchgit {
|
||||
url = https://github.com/plclub/lngen;
|
||||
rev = "ea73ad315de33afd25f87ca738c71f358f1cd51c";
|
||||
sha256 = "1a0sj8n3lmsl1wlnqfy176k9lb9s8rl422bvg3ihl2i70ql8wisd";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [ base containers mtl parsec syb ];
|
||||
executableHaskellDepends = [ base ];
|
||||
homepage = https://github.com/plclub/lngen;
|
||||
description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
};
|
||||
|
||||
buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott ]
|
||||
++ (with ocamlPackages; [ findlib ]);
|
||||
propagatedBuildInputs = [ coq ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildPhase = ''
|
||||
(cd Metalib; make)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
(cd Metalib; make -f CoqSrc.mk DSTROOT=/ COQLIB=$out/lib/coq/${coq.coq-version}/ install)
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/plclub/metalib;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jwiegley ];
|
||||
platforms = coq.meta.platforms;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -2,10 +2,32 @@
|
|||
|
||||
let param =
|
||||
{
|
||||
version = "1.6.1";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
|
||||
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
|
||||
}; in
|
||||
"8.4" = {
|
||||
version = "1.6.1";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
|
||||
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
|
||||
};
|
||||
|
||||
"8.5" = {
|
||||
version = "1.6.1";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
|
||||
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
|
||||
};
|
||||
|
||||
"8.6" = {
|
||||
version = "1.6.4";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
|
||||
sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
|
||||
};
|
||||
|
||||
"8.7" = {
|
||||
version = "1.6.4";
|
||||
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
|
||||
sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
|
||||
};
|
||||
|
||||
}."${coq.coq-version}"
|
||||
; in
|
||||
|
||||
callPackage ./generic.nix {
|
||||
name = "coq${coq.coq-version}-ssreflect-${param.version}";
|
||||
|
|
|
|||
|
|
@ -65,9 +65,6 @@ self: super: {
|
|||
options = dontCheck super.options;
|
||||
statistics = dontCheck super.statistics;
|
||||
|
||||
# segfault due to missing return: https://github.com/haskell/c2hs/pull/184
|
||||
c2hs = dontCheck super.c2hs;
|
||||
|
||||
# https://github.com/gilith/hol/pull/1
|
||||
hol = appendPatch (doJailbreak super.hol) (pkgs.fetchpatch {
|
||||
name = "hol.patch";
|
||||
|
|
@ -98,7 +95,7 @@ self: super: {
|
|||
name = "git-annex-${drv.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + drv.version;
|
||||
sha256 = "0iz0yz0bwkmpza5qahsxr9plg1ylmkv7znp1a8f0z65px7f300an";
|
||||
sha256 = "14449sllp81d23mnjwn1m658kzry5qvww2ykxkbkdcrlz6kl6dy0";
|
||||
};
|
||||
})).override {
|
||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||
|
|
@ -978,4 +975,17 @@ self: super: {
|
|||
|
||||
# missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4
|
||||
stack2nix = doJailbreak super.stack2nix;
|
||||
|
||||
# Hacks to work around https://github.com/haskell/c2hs/issues/192.
|
||||
c2hs = (overrideCabal super.c2hs {
|
||||
version = "0.26.2-28-g8b79823";
|
||||
doCheck = false;
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "deech";
|
||||
repo = "c2hs";
|
||||
rev = "8b79823c32e234c161baec67fdf7907952ca62b8";
|
||||
sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz";
|
||||
};
|
||||
}).override { language-c = self.language-c_0_7_0; };
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18022,8 +18022,8 @@ self: {
|
|||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
pname = "TypeNat";
|
||||
version = "0.4.0.1";
|
||||
sha256 = "1wq4fn4zbmkdg0vwy47j0mxf87z32c1q9rwzsn3h9jj3mlmz8bp6";
|
||||
version = "0.5.0.0";
|
||||
sha256 = "1css4pb2x514s396c35brghgn3pgysdps8k09k1wcx5k2qpg90cx";
|
||||
libraryHaskellDepends = [ base ];
|
||||
homepage = "https://github.com/avieth/TypeNat";
|
||||
description = "Some Nat-indexed types for GHC";
|
||||
|
|
@ -40984,15 +40984,15 @@ self: {
|
|||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"cassava-conduit_0_4_0_0" = callPackage
|
||||
"cassava-conduit_0_4_0_1" = callPackage
|
||||
({ mkDerivation, array, base, bifunctors, bytestring, cassava
|
||||
, conduit, conduit-extra, containers, criterion, mtl, QuickCheck
|
||||
, text
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cassava-conduit";
|
||||
version = "0.4.0.0";
|
||||
sha256 = "1pl3vbkyjvgz08ijm75rdxnxx5h27mya7bgzi9jpws7v2dwxlg22";
|
||||
version = "0.4.0.1";
|
||||
sha256 = "0y4zlr0k3hcwh8b9ly1aslpz4fbns7xw2h8jwghfl7zpi52zlj9y";
|
||||
libraryHaskellDepends = [
|
||||
array base bifunctors bytestring cassava conduit conduit-extra
|
||||
containers mtl text
|
||||
|
|
@ -49219,8 +49219,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "content-store";
|
||||
version = "0.1.0";
|
||||
sha256 = "1qimbnqfvnl7zhcpklnzp2n7s7swq5knif6li29fyvfb6ls1471c";
|
||||
version = "0.1.1";
|
||||
sha256 = "1rzapw039a2k4g5s0vlw4mm6hrq35xzj6iksp0qpq87150bzy6pp";
|
||||
libraryHaskellDepends = [
|
||||
aeson base bytestring cond conduit conduit-combinators
|
||||
conduit-extra cryptonite directory filepath htoml memory
|
||||
|
|
@ -57178,12 +57178,12 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "deiko-config";
|
||||
version = "0.5.0.0";
|
||||
sha256 = "0zhi173mm905aqh52fsw1c9y3hxk07yc1g2s0rrjr75cdl7ssljy";
|
||||
version = "0.5.0.1";
|
||||
sha256 = "0jcnidr4b52n12byx96y6k25949xwn3krby691la58jnvgmi22dr";
|
||||
libraryHaskellDepends = [
|
||||
array base containers exceptions mtl parsec text transformers
|
||||
];
|
||||
homepage = "http://github.com/YoEight/deiko-config";
|
||||
homepage = "https://github.com/YoEight/deiko-config";
|
||||
description = "Small and typesafe configuration library";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
|
|
@ -59464,13 +59464,13 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "diplomacy";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0ynq3khwxwiazqlfibd353cqbha5n55576picrx98w3lbnqv3g47";
|
||||
version = "0.2.0.0";
|
||||
sha256 = "0n0vqc65rjkbplamjhc3zx0ahlx6lf72yyqrkd2d7b03jzfmjvfq";
|
||||
libraryHaskellDepends = [
|
||||
base containers HUnit parsec transformers TypeNat
|
||||
];
|
||||
homepage = "https://github.com/avieth/diplomacy";
|
||||
description = "The board game Diplomacy, spoken in Haskell";
|
||||
description = "Diplomacy board game";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
|
@ -59988,8 +59988,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "diskhash";
|
||||
version = "0.0.2.3";
|
||||
sha256 = "08g484knhw96mlk5qa6cx1cm9kblxrz8979c9xcvmidgj44phb8z";
|
||||
version = "0.0.3.2";
|
||||
sha256 = "0sfm7x9pqfbd6p894ivq212ckd7sj2sgdgsdjv5dip2pb95x3i78";
|
||||
libraryHaskellDepends = [ base bytestring ];
|
||||
testHaskellDepends = [
|
||||
base bytestring directory HUnit QuickCheck test-framework
|
||||
|
|
@ -72283,8 +72283,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "fluid-idl";
|
||||
version = "0.0.2";
|
||||
sha256 = "1qcsdnjwz0gcn8z6ss27f3a687fi47cmm95a9rfag42gvvlwyr9z";
|
||||
version = "0.0.4";
|
||||
sha256 = "1kdiq6mw01dr85ii7vg7bsw8m260y6njjf5afx3p718hsxwiw4yr";
|
||||
libraryHaskellDepends = [
|
||||
aeson base bytestring containers errors exceptions lifted-async
|
||||
monad-control monad-logger mtl random safe-exceptions scientific
|
||||
|
|
@ -72968,8 +72968,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "forest-fire";
|
||||
version = "0.2.1";
|
||||
sha256 = "007jx5iylhfxjdq7x3ffn1cx27wy7201wvxw23w5nds48vfna6ia";
|
||||
version = "0.2.2";
|
||||
sha256 = "053gp1wmzfhn26gq0awhz3fas8vcjbx953cis4r4ahfzwvy71r7r";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
|
|
@ -77756,8 +77756,8 @@ self: {
|
|||
({ mkDerivation, base, process, shake, unordered-containers }:
|
||||
mkDerivation {
|
||||
pname = "ghc-make";
|
||||
version = "0.3.2";
|
||||
sha256 = "10vbibmgssb1ichxha92q5mqlaglhkcv4xxiikq4mh3l3bgzw6bj";
|
||||
version = "0.3.3";
|
||||
sha256 = "17rsj6x49iv4vk8vfgqw5y5vxk97lh1b5za07m2aijk4js7rqm75";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [
|
||||
|
|
@ -79800,8 +79800,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "git-annex";
|
||||
version = "6.20171026";
|
||||
sha256 = "0i44cfxp5wy6y527l9jbj83ilkxilp4jm7106q70czls0hnx6yij";
|
||||
version = "6.20171109";
|
||||
sha256 = "15fl5vazl38yfqi3iz9dqfqkav031wyd306rz1hlgxdqplayz3y5";
|
||||
configureFlags = [
|
||||
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
|
||||
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
|
||||
|
|
@ -100798,29 +100798,31 @@ self: {
|
|||
({ mkDerivation, aeson, aeson-pretty, attoparsec
|
||||
, attoparsec-iso8601, base, bytestring, conduit
|
||||
, conduit-combinators, conduit-extra, containers, criterion
|
||||
, directory, hspec, hspec-attoparsec, hspec-core
|
||||
, deepseq, directory, extra, hspec, hspec-attoparsec, hspec-core
|
||||
, hspec-expectations, ip, lifted-base, monad-control, monad-loops
|
||||
, monad-par, mtl, optparse-applicative, permute, random, resourcet
|
||||
, text, time, transformers-base, unix, unordered-containers, word8
|
||||
, yaml, zeromq4-conduit, zeromq4-haskell
|
||||
, stm-conduit, text, time, transformers-base, unix
|
||||
, unordered-containers, word8, yaml, zeromq4-conduit
|
||||
, zeromq4-haskell
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hnormalise";
|
||||
version = "0.4.8.0";
|
||||
sha256 = "1s4ilaw574xhvfhsl9afvb7khz50sg7bag6hckbfadf1h4mhblal";
|
||||
version = "0.5.0.0";
|
||||
sha256 = "01xiqkm94amm7kdwvdgcm3f4slylmvc04qxkbddh2xsm8wz4c9a2";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring
|
||||
containers directory ip permute resourcet text time
|
||||
unordered-containers yaml
|
||||
conduit containers deepseq directory ip monad-loops permute
|
||||
resourcet text time unordered-containers yaml zeromq4-conduit
|
||||
zeromq4-haskell
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring
|
||||
conduit conduit-combinators conduit-extra containers directory ip
|
||||
lifted-base monad-control monad-loops monad-par mtl
|
||||
optparse-applicative resourcet text time transformers-base unix
|
||||
word8 yaml zeromq4-conduit zeromq4-haskell
|
||||
conduit conduit-combinators conduit-extra containers deepseq
|
||||
directory extra ip lifted-base monad-control monad-loops monad-par
|
||||
mtl optparse-applicative resourcet stm-conduit text time
|
||||
transformers-base unix word8 yaml zeromq4-conduit zeromq4-haskell
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson attoparsec attoparsec-iso8601 base conduit-extra hspec
|
||||
|
|
@ -109849,8 +109851,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "hw-kafka-client";
|
||||
version = "2.1.2";
|
||||
sha256 = "0q6dclcax4r9mqy8kclz0ipsbgn5zsrgwz5ygl67xz2wbzbhb2n5";
|
||||
version = "2.1.3";
|
||||
sha256 = "006lkyjwjsn1npznzv9ysqsap2f7w3gsxn8rimlpv0manvk8h5bg";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
|
|
@ -113925,6 +113927,21 @@ self: {
|
|||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"inspection-testing" = callPackage
|
||||
({ mkDerivation, base, bytestring, containers, generic-lens, ghc
|
||||
, template-haskell, text
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "inspection-testing";
|
||||
version = "0.1";
|
||||
sha256 = "126nxs5q6n2swdgbsa2l7ai7m2ad3br8nh6maskd99cfpji24gjn";
|
||||
libraryHaskellDepends = [ base containers ghc template-haskell ];
|
||||
testHaskellDepends = [ base bytestring generic-lens text ];
|
||||
homepage = "https://github.com/nomeata/inspection-testing";
|
||||
description = "GHC plugin to do inspection esting";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"inspector-wrecker" = callPackage
|
||||
({ mkDerivation, aeson, base, bytestring, case-insensitive
|
||||
, connection, data-default, http-client, http-client-tls
|
||||
|
|
@ -127893,8 +127910,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "log-warper";
|
||||
version = "1.5.2";
|
||||
sha256 = "002b168wv9ij6401scqhya4b3syfrxpyv3ndzbb71snj4wb51hvf";
|
||||
version = "1.5.3";
|
||||
sha256 = "1rp9jarjp867j9fcqkbp9b4mv3f0hywskw738hl915608iijxc7c";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
|
|
@ -130008,6 +130025,37 @@ self: {
|
|||
license = stdenv.lib.licenses.publicDomain;
|
||||
}) {};
|
||||
|
||||
"magicbane_0_1_3" = callPackage
|
||||
({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude
|
||||
, conduit, conduit-combinators, data-default, data-has, either
|
||||
, ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data
|
||||
, http-client, http-client-tls, http-conduit, http-date
|
||||
, http-link-header, http-media, http-types, lifted-async
|
||||
, mime-types, monad-control, monad-logger, monad-metrics, mtl
|
||||
, network, network-uri, raw-strings-qq, refined, servant
|
||||
, servant-server, split, string-conversions, text, transformers
|
||||
, unordered-containers, wai, wai-cli, wai-middleware-metrics
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "magicbane";
|
||||
version = "0.1.3";
|
||||
sha256 = "164zljyc0wvisj8xb6q5j0xlhjhxw7068jl9s9y4rkd3x637j3as";
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-qq attoparsec base classy-prelude conduit
|
||||
conduit-combinators data-default data-has either ekg-core ekg-wai
|
||||
envy errors fast-logger http-api-data http-client http-client-tls
|
||||
http-conduit http-date http-link-header http-media http-types
|
||||
lifted-async mime-types monad-control monad-logger monad-metrics
|
||||
mtl network network-uri raw-strings-qq refined servant
|
||||
servant-server split string-conversions text transformers
|
||||
unordered-containers wai wai-cli wai-middleware-metrics
|
||||
];
|
||||
homepage = "https://github.com/myfreeweb/magicbane#readme";
|
||||
description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…";
|
||||
license = stdenv.lib.licenses.publicDomain;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"magico" = callPackage
|
||||
({ mkDerivation, base, hmatrix, transformers, utility-ht }:
|
||||
mkDerivation {
|
||||
|
|
@ -134954,17 +135002,17 @@ self: {
|
|||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"model_0_4_1" = callPackage
|
||||
"model_0_4_2" = callPackage
|
||||
({ mkDerivation, base, containers, convertible, deepseq, doctest
|
||||
, filemanip, ghc-prim, pretty, tasty, tasty-hunit, tasty-quickcheck
|
||||
, transformers
|
||||
, either, filemanip, ghc-prim, pretty, tasty, tasty-hunit
|
||||
, tasty-quickcheck, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "model";
|
||||
version = "0.4.1";
|
||||
sha256 = "115apma3mbvpskd5kbgccs4g4d1n9g5lj62bd9appd0d0i8rskf8";
|
||||
version = "0.4.2";
|
||||
sha256 = "0ynv6fwns4ix0nhz8b3aqsw6q9avn7n60spakhpa30lya9asinjb";
|
||||
libraryHaskellDepends = [
|
||||
base containers convertible deepseq pretty transformers
|
||||
base containers convertible deepseq either pretty transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base containers doctest filemanip ghc-prim pretty tasty tasty-hunit
|
||||
|
|
@ -135001,8 +135049,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "modern-uri";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "04k6v2mdkwdwvphfhhm7dwgy12n3kwxi02azkpzng0qa24vb1w1r";
|
||||
version = "0.1.1.0";
|
||||
sha256 = "0j2h4rh8ws4zcc47kcs0q8zr543aqnc1i6y4vkv2a8a5v2h2wzxr";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring containers contravariant deepseq exceptions
|
||||
megaparsec profunctors QuickCheck template-haskell text
|
||||
|
|
@ -136033,15 +136081,17 @@ self: {
|
|||
"monad-persist" = callPackage
|
||||
({ mkDerivation, base, exceptions, hspec, monad-control
|
||||
, monad-logger, mtl, persistent, persistent-sqlite
|
||||
, persistent-template, text, transformers-base
|
||||
, persistent-template, text, transformers, transformers-base
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "monad-persist";
|
||||
version = "0.0.1.4";
|
||||
sha256 = "032732piflwzx43rdndbjy757pmkm68p28bb6znz6dsj7r0xv349";
|
||||
version = "0.0.2.0";
|
||||
sha256 = "17jq41r7bmycnzz028pii14cm0qjvclj01z78aj6aj1h4mlwlbc1";
|
||||
revision = "1";
|
||||
editedCabalFile = "0sghbyfd7jpwi80hivzbh2z77zl9kpzlvablkfx2w0q70hnbbrvd";
|
||||
libraryHaskellDepends = [
|
||||
base exceptions monad-control monad-logger mtl persistent text
|
||||
transformers-base
|
||||
transformers transformers-base
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base hspec monad-control monad-logger persistent persistent-sqlite
|
||||
|
|
@ -145217,14 +145267,14 @@ self: {
|
|||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"opaleye-trans_0_4_0" = callPackage
|
||||
"opaleye-trans_0_4_1" = callPackage
|
||||
({ mkDerivation, base, mtl, opaleye, postgresql-simple
|
||||
, product-profunctors, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "opaleye-trans";
|
||||
version = "0.4.0";
|
||||
sha256 = "0zzz0b4af2p9r66hbxphsbmdg2524bghawqkkj5r3r4nsk97rnp9";
|
||||
version = "0.4.1";
|
||||
sha256 = "0k1nwx7m7mhc3wsh35zafgmgb71zyyych6nf90zrprh6hyy1ibvk";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
|
|
@ -159489,15 +159539,15 @@ self: {
|
|||
"ptr" = callPackage
|
||||
({ mkDerivation, base, base-prelude, bug, bytestring, contravariant
|
||||
, mtl, profunctors, quickcheck-instances, rerebase, semigroups
|
||||
, tasty, tasty-hunit, tasty-quickcheck, text, transformers
|
||||
, tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ptr";
|
||||
version = "0.15.6";
|
||||
sha256 = "183g0zw2k5zfdv3l8xb11zwzcdp20sp0v716s7hix01nsh34nz4k";
|
||||
version = "0.15.7";
|
||||
sha256 = "0zbyr8kzz47c1rfjpw8rk0kh4rys8qd8vihz69wmnxgy0fa4z7l4";
|
||||
libraryHaskellDepends = [
|
||||
base base-prelude bug bytestring contravariant mtl profunctors
|
||||
semigroups text transformers
|
||||
semigroups text time transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
bug quickcheck-instances rerebase tasty tasty-hunit
|
||||
|
|
@ -161485,6 +161535,19 @@ self: {
|
|||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"quickcheck-special_0_1_0_6" = callPackage
|
||||
({ mkDerivation, base, QuickCheck, special-values }:
|
||||
mkDerivation {
|
||||
pname = "quickcheck-special";
|
||||
version = "0.1.0.6";
|
||||
sha256 = "1dhwgy1jwglp4y3nbysr1i182415aibqlcsrvwxn2c5x162qjwwm";
|
||||
libraryHaskellDepends = [ base QuickCheck special-values ];
|
||||
homepage = "https://github.com/minad/quickcheck-special#readme";
|
||||
description = "Edge cases and special values for QuickCheck Arbitrary instances";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"quickcheck-state-machine" = callPackage
|
||||
({ mkDerivation, ansi-wl-pprint, async, base, containers
|
||||
, lifted-async, lifted-base, monad-control, mtl, QuickCheck
|
||||
|
|
@ -178416,6 +178479,22 @@ self: {
|
|||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"silvi" = callPackage
|
||||
({ mkDerivation, base, bytestring, chronos, http-types, ip
|
||||
, quantification, savage, text
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "silvi";
|
||||
version = "0.0.2";
|
||||
sha256 = "1rls25wifkgkz1fg4xw4bvpxa1807dp1h2q8kk7j7if7b66pj0cx";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring chronos http-types ip quantification savage text
|
||||
];
|
||||
homepage = "https://github.com/chessai/silvi#readme";
|
||||
description = "A generator for different kinds of logs";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"simd" = callPackage
|
||||
({ mkDerivation, base, ghc-prim, primitive, vector }:
|
||||
mkDerivation {
|
||||
|
|
@ -179556,6 +179635,30 @@ self: {
|
|||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"siren-json" = callPackage
|
||||
({ mkDerivation, aeson, base, bytestring, case-insensitive
|
||||
, containers, hspec, http-media, http-types, network-uri
|
||||
, QuickCheck, quickcheck-instances, test-invariant, text
|
||||
, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "siren-json";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "01z64vbqk06m500q83x42r3ki8k9a84ynz6gra4cw40v11559a7y";
|
||||
libraryHaskellDepends = [
|
||||
aeson base bytestring containers http-media http-types network-uri
|
||||
text unordered-containers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring case-insensitive containers hspec http-media
|
||||
http-types network-uri QuickCheck quickcheck-instances
|
||||
test-invariant text unordered-containers
|
||||
];
|
||||
homepage = "https://github.com/alunduil/siren-json.hs";
|
||||
description = "Siren Tools for Haskell";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"sirkel" = callPackage
|
||||
({ mkDerivation, base, binary, bytestring, containers, hashtables
|
||||
, haskell98, random, remote, SHA, transformers
|
||||
|
|
@ -183371,6 +183474,20 @@ self: {
|
|||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"special-values" = callPackage
|
||||
({ mkDerivation, base, bytestring, ieee754, scientific, text }:
|
||||
mkDerivation {
|
||||
pname = "special-values";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring ieee754 scientific text
|
||||
];
|
||||
homepage = "https://github.com/minad/special-values#readme";
|
||||
description = "Typeclass providing special values";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"specialize-th" = callPackage
|
||||
({ mkDerivation, base, checkers, composition, DebugTraceHelpers
|
||||
, derive, HUnit, MissingH, mtl, newtype, newtype-th, QuickCheck
|
||||
|
|
@ -185322,6 +185439,26 @@ self: {
|
|||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"stackage-query_0_1_2" = callPackage
|
||||
({ mkDerivation, base, Cabal, containers, directory, filepath
|
||||
, optparse-applicative, process, stackage-types, text, yaml
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "stackage-query";
|
||||
version = "0.1.2";
|
||||
sha256 = "0lxln46nwsz7646yc65c07biqg35vr75l1hdvb864ajv680wp2l0";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [
|
||||
base Cabal containers directory filepath optparse-applicative
|
||||
process stackage-types text yaml
|
||||
];
|
||||
homepage = "https://github.com/juhp/stackage-query";
|
||||
description = "Stackage package query";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"stackage-sandbox" = callPackage
|
||||
({ mkDerivation, attoparsec, base, bytestring, conduit-combinators
|
||||
, conduit-extra, directory, filepath, optparse-applicative, process
|
||||
|
|
@ -185523,8 +185660,8 @@ self: {
|
|||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
pname = "star";
|
||||
version = "0.0.0.1";
|
||||
sha256 = "0xlwbkgj4cp9z23jcsnb5k5nmhsavvsr2c4w2s72r5jpsmzkr5ba";
|
||||
version = "0.0.0.2";
|
||||
sha256 = "1xg1gfdkskhkvd1a2nlaxc9942xi1j406p58i4ycb15lqcz8nz27";
|
||||
libraryHaskellDepends = [ base ];
|
||||
homepage = "https://github.com/chessai/star#readme";
|
||||
description = "*-semirings";
|
||||
|
|
@ -188999,8 +189136,8 @@ self: {
|
|||
({ mkDerivation, base, Cabal, containers, directory, filepath }:
|
||||
mkDerivation {
|
||||
pname = "superdoc";
|
||||
version = "0.1.2.4";
|
||||
sha256 = "0l32y0g3dymamqkwr8x8syiwvkk1z19xlls9b4qskxzsxrx8w414";
|
||||
version = "0.1.2.5";
|
||||
sha256 = "0b0610pg2b9j5phc0mwsyk8rzp4w77453g4631p3j2wgrjiw425n";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
|
|
@ -192076,6 +192213,24 @@ self: {
|
|||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"tasty-fail-fast_0_0_3" = callPackage
|
||||
({ mkDerivation, base, containers, directory, stm, tagged, tasty
|
||||
, tasty-golden, tasty-hunit, tasty-tap
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "tasty-fail-fast";
|
||||
version = "0.0.3";
|
||||
sha256 = "1pkqa3b1jglmy6g2sx9pyw2f6dlsg2crmgvy039xiyldl985g9w4";
|
||||
libraryHaskellDepends = [ base containers stm tagged tasty ];
|
||||
testHaskellDepends = [
|
||||
base directory tasty tasty-golden tasty-hunit tasty-tap
|
||||
];
|
||||
homepage = "http://github.com/MichaelXavier/tasty-fail-fast#readme";
|
||||
description = "Adds the ability to fail a tasty test suite on first test failure";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"tasty-golden" = callPackage
|
||||
({ mkDerivation, async, base, bytestring, containers, deepseq
|
||||
, directory, filepath, mtl, optparse-applicative, process, tagged
|
||||
|
|
@ -198619,8 +198774,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "tomlcheck";
|
||||
version = "0.1.0.17";
|
||||
sha256 = "0yfy0453j3s5sskz529rd50dbjxhr411a4g5803dsw06kibij05s";
|
||||
version = "0.1.0.18";
|
||||
sha256 = "1csnwkxkj9wwcwf20ij66a4nz6cn9rsyy69h51qn8pmlzxn7hgyk";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
|
|
@ -201778,8 +201933,8 @@ self: {
|
|||
({ mkDerivation, base, ghc-prim }:
|
||||
mkDerivation {
|
||||
pname = "type-level-sets";
|
||||
version = "0.8.0.0";
|
||||
sha256 = "0kxp9faby0zph9bkccvw5hrxq3m3ps9hg22aymqcah57sd8zlg92";
|
||||
version = "0.8.5.0";
|
||||
sha256 = "1ahfrwrlbdh61w6vh2v5j2ammkvcjxvw53d28pgqy296mpxikwvz";
|
||||
libraryHaskellDepends = [ base ghc-prim ];
|
||||
description = "Type-level sets and finite maps (with value-level counterparts)";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
|
|
@ -220057,6 +220212,30 @@ self: {
|
|||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"zm_0_3" = callPackage
|
||||
({ mkDerivation, base, bytestring, containers, convertible
|
||||
, cryptonite, deepseq, doctest, either, filemanip, flat, memory
|
||||
, model, mtl, pretty, tasty, tasty-hunit, tasty-quickcheck, text
|
||||
, timeit, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "zm";
|
||||
version = "0.3";
|
||||
sha256 = "1v2h66ahd3bpgyc59xj6ggzxfmzs0zgf4d5pgsz3by07iz5jk5ig";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring containers convertible cryptonite deepseq either
|
||||
flat memory model mtl pretty text transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base bytestring containers doctest filemanip flat model pretty
|
||||
tasty tasty-hunit tasty-quickcheck text timeit
|
||||
];
|
||||
homepage = "http://github.com/tittoassini/zm";
|
||||
description = "Language independent, reproducible, absolute types";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"zmcat" = callPackage
|
||||
({ mkDerivation, base, bytestring, zeromq3-haskell }:
|
||||
mkDerivation {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ SDL ] ;
|
||||
|
||||
configureFlags = [ "--disable-mmx" ];
|
||||
configureFlags = [ "--disable-mmx" ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SDL graphics drawing primitives and support functions";
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ SDL libogg libvorbis fluidsynth smpeg ];
|
||||
|
||||
configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl";
|
||||
configureFlags = [ "--disable-music-ogg-shared" ]
|
||||
++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl"
|
||||
++ lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SDL multi-channel audio mixer library";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
|
||||
};
|
||||
|
||||
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
propagatedBuildInputs = [ SDL ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ SDL freetype ];
|
||||
|
||||
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SDL TrueType library";
|
||||
license = licenses.zlib;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
url http://botan.randombit.net/download.html
|
||||
version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$'
|
||||
url https://botan.randombit.net/
|
||||
version_link 'Botan-[0-9]+([.][0-9]+)*[.](tgz|tbz|tbz2|tar[.]bz2)$'
|
||||
ensure_version
|
||||
attribute_name botan2
|
||||
do_overwrite(){
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
runCommand "dbus-1"
|
||||
{
|
||||
inherit serviceDirectories suidHelper;
|
||||
preferLocalBuild = true;
|
||||
XML_CATALOG_FILES = writeText "dbus-catalog.xml" ''
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
description = "A configuration parser library";
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
homepage = http://www.azzit.de/dotconf/;
|
||||
homepage = https://github.com/williamh/dotconf;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,23 +3,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "folly-${version}";
|
||||
version = "2017.07.24.00";
|
||||
version = "2017.11.06.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "folly";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cmqrm9yjxrw4xr1kcgzl0s7vcvp125wcgb0cz7whssgj11mf169";
|
||||
sha256 = "11sn4gwqw94ygc2s4bzqy5k67v3rr20gy375brdcrl5rv0r2hhc0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compilation
|
||||
(fetchpatch {
|
||||
url = "https://github.com/facebook/folly/commit/9fc87c83d93f092859823ec32289ed1b6abeb683.patch";
|
||||
sha256 = "0ix0grqlzm16hwa4rjbajjck8kr9lksh6c3gn7p3ihbbchsmlhvl";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook python pkgconfig ];
|
||||
buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="gtdialog";
|
||||
version="1.3";
|
||||
version="1.4";
|
||||
name="${baseName}-${version}";
|
||||
hash="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq";
|
||||
url="http://foicica.com/gtdialog/download/gtdialog_1.3.zip";
|
||||
sha256="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq";
|
||||
hash="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
|
||||
url="http://foicica.com/gtdialog/download/gtdialog_1.4.zip";
|
||||
sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
url https://github.com/ivmai/libatomic_ops/wiki/Download
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, gettext }:
|
||||
{ stdenv, fetchurl, fetchpatch, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libexif-0.6.21";
|
||||
|
|
@ -8,6 +8,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-7544.patch";
|
||||
url = https://sourceforge.net/p/libexif/bugs/_discuss/thread/fc394c4b/489a/attachment/xx.pat;
|
||||
sha256 = "1qgk8hgnxr8d63jsc4vljxz9yg33mbml280dq4a6050rmk9wq4la";
|
||||
})
|
||||
];
|
||||
patchFlags = "-p0";
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
|
|||
assert videoSupport -> ffmpeg != null && libmpeg2 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libextractor-1.4";
|
||||
name = "libextractor-1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libextractor/${name}.tar.gz";
|
||||
sha256 = "0v7ns5jhsyp1wzvbaydfgxnva5zd63gkzm9djhckmam9liq824l4";
|
||||
sha256 = "17gnpgspdhfgcr27j8sn9105vb4lw22yqdrhic62l79q5v5avm16";
|
||||
};
|
||||
|
||||
preConfigure =
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
url http://sourceforge.net/projects/gphoto/files/libgphoto/
|
||||
SF_version_dir
|
||||
version_link '[.]tar[.]bz2/download$'
|
||||
SF_redirect
|
||||
do_overwrite () {
|
||||
ensure_hash
|
||||
set_var_value version "$CURRENT_VERSION"
|
||||
set_var_value sha256 "$CURRENT_HASH"
|
||||
}
|
||||
|
|
@ -1,27 +1,34 @@
|
|||
{stdenv, fetchurl, libtool}:
|
||||
{ stdenv, fetchurl, libtool }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libtomcrypt-1.17";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtomcrypt-${version}";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libtom/libtomcrypt/releases/download/1.17/crypt-1.17.tar.bz2";
|
||||
sha256 = "e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116";
|
||||
url = "https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz";
|
||||
sha256 = "0ymqi0zf5gzn8pq4mnylwgg6pskml2v1p9rsjrqspyja65mgb7fs";
|
||||
};
|
||||
|
||||
buildInputs = [libtool];
|
||||
nativeBuildInputs = [ libtool ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray=(LIBPATH=$out/lib INCPATH=$out/include \
|
||||
DATAPATH=$out/share/doc/libtomcrypt/pdf \
|
||||
makeFlagsArray=(PREFIX=$out \
|
||||
INSTALL_GROUP=$(id -g) \
|
||||
INSTALL_USER=$(id -u))
|
||||
'';
|
||||
|
||||
makefile = "makefile.shared";
|
||||
|
||||
meta = {
|
||||
homepage = http://libtom.org/?page=features&newsitems=5&whatfile=crypt;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.libtom.net/LibTomCrypt/;
|
||||
description = "A fairly comprehensive, modular and portable cryptographic toolkit";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = with licenses; [ publicDomain wtfpl ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,35 @@
|
|||
{stdenv, fetchurl, libtool}:
|
||||
{ stdenv, fetchurl, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtommath-${version}";
|
||||
version = "1.0.1";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libtommath-1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://github.com/libtom/libtommath/releases/download/v1.0/ltm-1.0.tar.xz;
|
||||
sha256 = "0v5mpd8zqjfs2hr900w1mxifz23xylyjdqyx1i1wl7q9xvwpsflr";
|
||||
url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz";
|
||||
sha256 = "0sbccdwbkfc680id2fi0x067j23biqcjqilwkk7y9339knrjy0s7";
|
||||
};
|
||||
|
||||
buildInputs = [libtool];
|
||||
nativeBuildInputs = [ libtool ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool"
|
||||
substituteInPlace makefile_include.mk --replace "shell arch" "shell uname -m"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray=(LIBPATH=$out/lib INCPATH=$out/include \
|
||||
DATAPATH=$out/share/doc/libtommath/pdf \
|
||||
makeFlagsArray=(PREFIX=$out \
|
||||
INSTALL_GROUP=$(id -g) \
|
||||
INSTALL_USER=$(id -u))
|
||||
'';
|
||||
|
||||
makefile = "makefile.shared";
|
||||
|
||||
meta = {
|
||||
homepage = http://math.libtomcrypt.com/;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.libtom.net/LibTomMath/;
|
||||
description = "A library for integer-based number-theoretic applications";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = with licenses; [ publicDomain wtfpl ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.phreedom ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, fetchurl, pcre, zlib, perl }:
|
||||
{ stdenv, fetchurl, libjpeg, zlib, perl }:
|
||||
|
||||
let version = "6.0.0";
|
||||
let version = "7.0.0";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qpdf-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
|
||||
sha256 = "0csj2p2gkxrc0rk8ykymlsdgfas96vzf1dip3y1x7z1q9plwgzd9";
|
||||
sha256 = "0py6p27fx4qrwq9mvcybna42b0bdi359x38lzmggxl5a9khqvl7y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
buildInputs = [ pcre zlib ];
|
||||
buildInputs = [ zlib libjpeg ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs qpdf/fix-qdf
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
homepage = http://qpdf.sourceforge.net/;
|
||||
description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
|
||||
license = licenses.artistic2;
|
||||
license = licenses.asl20; # as of 7.0.0, people may stay at artistic2
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="asdf";
|
||||
version="3.2.0";
|
||||
version="3.3.0";
|
||||
name="${baseName}-${version}";
|
||||
hash="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a";
|
||||
url="http://common-lisp.net/project/asdf/archives/asdf-3.2.0.tar.gz";
|
||||
sha256="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a";
|
||||
hash="16qphj2ilds4plzr36jbnrxxl5s21q53m9vasv3208gb5wjwcnv8";
|
||||
url="http://common-lisp.net/project/asdf/archives/asdf-3.3.0.tar.gz";
|
||||
sha256="16qphj2ilds4plzr36jbnrxxl5s21q53m9vasv3208gb5wjwcnv8";
|
||||
};
|
||||
buildInputs = [
|
||||
texinfo texLive perl
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ parasitic systems will be tracked."
|
|||
(source-file (asdf:system-source-file asdf-system)))
|
||||
(cond
|
||||
(source-file
|
||||
(loop :for system-name :being :the :hash-keys :of asdf/find-system:*defined-systems* :do
|
||||
(loop :for system-name :being :the :hash-keys :of asdf/find-system::*registered-systems* :do
|
||||
(when (and (parasitic-relationship-p system system-name)
|
||||
(not (blacklisted-parasite-p system-name)))
|
||||
(found-new-parasite system-name)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }:
|
||||
{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib }:
|
||||
|
||||
let param =
|
||||
if stdenv.lib.versionAtLeast ocaml.version "4.03"
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild ];
|
||||
buildInputs = [ ocaml findlib ocamlbuild ];
|
||||
propagatedBuildInputs = [ result cstruct ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, cppo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
name = "ocaml${ocaml.version}-camomile-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yoriyuki";
|
||||
repo = "camomile";
|
||||
rev = "rel-${version}";
|
||||
sha256 = "1jq1xhaikczk6lbvas7c35aa04q0kjaqd8m54c4jivpj80yvg4x9";
|
||||
sha256 = "0rh58nl5jrnx01hf0yqbdcc2ncx107pq29zblchww82ci0x1xwsf";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib jbuilder cppo ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result
|
||||
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, cppo, gen, sequence, qtest, ounit, result
|
||||
, qcheck }:
|
||||
|
||||
let
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "1gjs9d6759zpgp68djv296zwmvhdc6dqfb27aip7dhj6ic2bwgil";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ];
|
||||
buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit qcheck ];
|
||||
|
||||
propagatedBuildInputs = [ result ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-fileutils-0.5.2";
|
||||
name = "ocaml${ocaml.version}-fileutils-0.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz;
|
||||
sha256 = "06l8hva3jmb2b7n4aa84dhhh1lr2mj8632gz4q83glc00khkn1vv";
|
||||
url = https://forge.ocamlcore.org/frs/download.php/1728/ocaml-fileutils-0.5.3.tar.gz;
|
||||
sha256 = "1rc4cqlvdhbs55i85zfbfhz938fsy4fj6kwlkfm3ra7bpwn8bmpd";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ounit ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
|
||||
|
||||
let version = "0.4.0.1"; in
|
||||
let version = "0.5"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-gen-${version}";
|
||||
|
|
@ -9,11 +9,18 @@ stdenv.mkDerivation {
|
|||
owner = "c-cube";
|
||||
repo = "gen";
|
||||
rev = "${version}";
|
||||
sha256 = "0gg94f5l899rni3r7s7wq8plgazmbsaw498xckp25kkgpmkk61ml";
|
||||
sha256 = "14b8vg914nb0yp1hgxzm29bg692m0gqncjj43b599s98s1cwl92h";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild qtest ounit ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-tests"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg
|
||||
, cpuid, ocb-stubblr
|
||||
, cstruct, zarith, ocaml_oasis, ppx_sexp_conv, sexplib
|
||||
, cstruct, zarith, ppx_sexp_conv, sexplib
|
||||
, lwt ? null
|
||||
}:
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild topkg opam cpuid ocb-stubblr
|
||||
buildInputs = [ ocaml findlib ocamlbuild topkg opam cpuid ocb-stubblr
|
||||
ppx_sexp_conv ];
|
||||
propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, camlp4, ounit, gettext, fileutils, camomile }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml-gettext-${version}";
|
||||
version = "0.3.5";
|
||||
name = "ocaml${ocaml.version}-gettext-${version}";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://forge.ocamlcore.org/frs/download.php/1433/ocaml-gettext-${version}.tar.gz";
|
||||
sha256 = "0s625h7y9xxqvzk4bnw45k4wvl4fn8gblv56bp47il0lgsx8956i";
|
||||
url = "https://forge.ocamlcore.org/frs/download.php/1678/ocaml-gettext-${version}.tar.gz";
|
||||
sha256 = "1zhvzc9x3j57xf2mzg5rshgp14cb4dsqbnj52jjv1qnja97plyjp";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ gettext fileutils camomile ];
|
||||
|
|
|
|||
|
|
@ -9,32 +9,27 @@
|
|||
, jinja2
|
||||
, branca
|
||||
, six
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "folium";
|
||||
version = "0.5.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "748944521146d85c6cd6230acf234e885864cd0f42fea3758d655488517e5e6e";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Causes trouble because a certain file cannot be found
|
||||
rm tests/notebooks/test_notebooks.py
|
||||
'';
|
||||
|
||||
checkInputs = [ pytest numpy nbconvert pandas mock ];
|
||||
propagatedBuildInputs = [ jinja2 branca six ];
|
||||
propagatedBuildInputs = [ jinja2 branca six requests ];
|
||||
|
||||
#
|
||||
# doCheck = false;
|
||||
# No tests in archive
|
||||
doCheck = false;
|
||||
|
||||
# checkPhase = ''
|
||||
# py.test -k 'not test_notebooks'
|
||||
# '';
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Make beautiful maps with Leaflet.js & Python";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libnacl";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saltstack";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0iaql3mrj3hf48km8177bi6nmjdar26kmqjc3jw8mrjc940v99fk";
|
||||
sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,16 @@
|
|||
{ buildPythonPackage, stdenv, fetchFromGitHub, six, python-axolotl, pytest }:
|
||||
{ buildPythonPackage, stdenv, fetchFromGitHub, six, python-axolotl, pytest
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "yowsup";
|
||||
version = "2.5.2";
|
||||
|
||||
# python2 is currently incompatible with yowsup:
|
||||
# https://github.com/tgalal/yowsup/issues/2325#issuecomment-343516519
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tgalal";
|
||||
repo = "yowsup";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchFromGitHub, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
|
||||
{stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
|
||||
gtk2 ? null, vte ? null, gtkdialog ? null,
|
||||
python ? null,
|
||||
ruby ? null,
|
||||
|
|
@ -13,16 +13,24 @@ let
|
|||
inherit (stdenv.lib) optional;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
name = "radare2-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = version;
|
||||
sha256 = "1ahai9x6jc15wjzdbdkri3rc88ark2i5s8nv2pxcp0wwldvawlzi";
|
||||
sha256 = "031ndvinsypagpkdszxjq0hj91ijq9zx4dzk53sz7il7s3zn65c7";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-15385.patch";
|
||||
url = https://github.com/radare/radare2/commit/21a6f570ba33fa9f52f1bba87f07acc4e8c178f4.patch;
|
||||
sha256 = "19qg5j9yr5r62nrq2b6mscxsz0wyyfah2z5jz8dvj9kqxq186d43";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = let
|
||||
cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile
|
||||
capstone = fetchurl {
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="luarocks";
|
||||
version="2.4.2";
|
||||
version="2.4.3";
|
||||
name="${baseName}-${version}";
|
||||
hash="1rfjfjgnafjxs1zrd1gy0ga5lw28sf5lrdmgzgh6bcp1hd2w67hf";
|
||||
url="http://luarocks.org/releases/luarocks-2.4.2.tar.gz";
|
||||
sha256="1rfjfjgnafjxs1zrd1gy0ga5lw28sf5lrdmgzgh6bcp1hd2w67hf";
|
||||
hash="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad";
|
||||
url="http://luarocks.org/releases/luarocks-2.4.3.tar.gz";
|
||||
sha256="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad";
|
||||
};
|
||||
buildInputs = [
|
||||
lua curl makeWrapper which unzip
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ let
|
|||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.complang.org/ragel;
|
||||
homepage = https://www.colm.net/open-source/ragel/;
|
||||
description = "State machine compiler";
|
||||
inherit license;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
28
pkgs/games/braincurses/default.nix
Normal file
28
pkgs/games/braincurses/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchFromGitHub, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "braincurses-${version}";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bderrly";
|
||||
repo = "braincurses";
|
||||
rev = version;
|
||||
sha256 = "0gpny9wrb0zj3lr7iarlgn9j4367awj09v3hhxz9r9a6yhk4anf5";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
# There is no install target in the Makefile
|
||||
installPhase = ''
|
||||
install -Dt $out/bin braincurses
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/bderrly/braincurses;
|
||||
description = "A version of the classic game Mastermind";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
67
pkgs/games/cataclysm-dda/git.nix
Normal file
67
pkgs/games/cataclysm-dda/git.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{ fetchFromGitHub, stdenv, makeWrapper, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf,
|
||||
SDL2_mixer, freetype, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2017-07-12";
|
||||
name = "cataclysm-dda-git-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CleverRaven";
|
||||
repo = "Cataclysm-DDA";
|
||||
rev = "2d7aa8c";
|
||||
sha256 = "0xx7si4k5ivyb5gv98fzlcghrg3w0dfblri547x7x4is7fj5ffjd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
||||
|
||||
buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
sed -i Makefile \
|
||||
-e 's,-Werror,,g' \
|
||||
-e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g'
|
||||
|
||||
sed '1i#include <cmath>' \
|
||||
-i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp
|
||||
'';
|
||||
|
||||
makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1";
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cataclysm-tiles \
|
||||
--add-flags "--datadir $out/share/cataclysm-dda/"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A free, post apocalyptic, zombie infested rogue-like";
|
||||
longDescription = ''
|
||||
Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world.
|
||||
Surviving is difficult: you have been thrown, ill-equipped, into a
|
||||
landscape now riddled with monstrosities of which flesh eating zombies are
|
||||
neither the strangest nor the deadliest.
|
||||
|
||||
Yet with care and a little luck, many things are possible. You may try to
|
||||
eke out an existence in the forests silently executing threats and
|
||||
providing sustenance with your longbow. You can ride into town in a
|
||||
jerry-rigged vehicle, all guns blazing, to settle matters in a fug of
|
||||
smoke from your molotovs. You could take a more measured approach and
|
||||
construct an impregnable fortress, surrounded by traps to protect you from
|
||||
the horrors without. The longer you survive, the more skilled and adapted
|
||||
you will get and the better equipped and armed to deal with the threats
|
||||
you are presented with.
|
||||
|
||||
In the course of your ordeal there will be opportunities and temptations
|
||||
to improve or change your very nature. There are tales of survivors fitted
|
||||
with extraordinary cybernetics giving great power and stories too of
|
||||
gravely mutated survivors who, warped by their ingestion of exotic
|
||||
substances or radiation, now more closely resemble insects, birds or fish
|
||||
than their original form.
|
||||
'';
|
||||
homepage = http://en.cataclysmdda.com/;
|
||||
license = licenses.cc-by-sa-30;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sgt-puzzles-r${version}";
|
||||
version = "20170228.1f613ba";
|
||||
version = "20171029.69773d8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
|
||||
sha256 = "02nqc18fhvxr545wgk55ly61fi0a06q61ljzwadprqxa1n0g0fz5";
|
||||
sha256 = "0m1gaa802jyih9hcwpvb05zrzprgj6akafgvbsnq321s0sqzaxf0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -37,6 +37,20 @@ let
|
|||
++ lib.optional withPrimus primus
|
||||
++ extraPkgs pkgs;
|
||||
|
||||
ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs
|
||||
++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs);
|
||||
|
||||
runSh = writeScript "run.sh" ''
|
||||
#!${stdenv.shell}
|
||||
runtime_paths="${lib.concatStringsSep ":" ldPath}"
|
||||
if [ "$1" == "--print-steam-runtime-library-paths" ]; then
|
||||
echo "$runtime_paths"
|
||||
exit 0
|
||||
fi
|
||||
export LD_LIBRARY_PATH="$runtime_paths:$LD_LIBRARY_PATH"
|
||||
exec "$@"
|
||||
'';
|
||||
|
||||
in buildFHSUserEnv rec {
|
||||
name = "steam";
|
||||
|
||||
|
|
@ -74,6 +88,7 @@ in buildFHSUserEnv rec {
|
|||
${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
|
||||
ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch}
|
||||
''}
|
||||
ln -s ${runSh} steamrt/run.sh
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
|
|
@ -96,19 +111,16 @@ in buildFHSUserEnv rec {
|
|||
targetPkgs = commonTargetPkgs;
|
||||
inherit multiPkgs extraBuildCommands;
|
||||
|
||||
runScript =
|
||||
let ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs
|
||||
++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs);
|
||||
in writeScript "steam-run" ''
|
||||
#!${stdenv.shell}
|
||||
run="$1"
|
||||
if [ "$run" = "" ]; then
|
||||
echo "Usage: steam-run command-to-run args..." >&2
|
||||
exit 1
|
||||
fi
|
||||
shift
|
||||
export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
|
||||
exec "$run" "$@"
|
||||
'';
|
||||
runScript = writeScript "steam-run" ''
|
||||
#!${stdenv.shell}
|
||||
run="$1"
|
||||
if [ "$run" = "" ]; then
|
||||
echo "Usage: steam-run command-to-run args..." >&2
|
||||
exit 1
|
||||
fi
|
||||
shift
|
||||
export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
|
||||
exec "$run" "$@"
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Screen locker for the X Window System";
|
||||
homepage = http://www.tux.org/~bagleyd/xlockmore.html;
|
||||
homepage = http://sillycycle.com/xlockmore.html;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.36";
|
||||
version = "5.37";
|
||||
name = "xscreensaver-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
|
||||
sha256 = "0v60mdhvv42jla5hljp77igng11kxpah5fs9j7ci65kz0hw552vb";
|
||||
sha256 = "1ng5ddzb4k2h1w54pvk9hzxvnxxmc54bc4a2ibk974nzjjjaxivs";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, buildPackages, fetchurl
|
||||
{ stdenv, lib, buildPackages, fetchurl, fetchpatch
|
||||
, enableStatic ? false
|
||||
, enableMinimal ? false
|
||||
, useMusl ? false, musl
|
||||
|
|
@ -39,7 +39,19 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
|
||||
|
||||
patches = [ ./busybox-in-store.patch ];
|
||||
patches = [
|
||||
./busybox-in-store.patch
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-15873.patch";
|
||||
url = "https://git.busybox.net/busybox/patch/?id=0402cb32df015d9372578e3db27db47b33d5c7b0";
|
||||
sha256 = "1s3xqifd0dww19mbnzrks0i1az0qwd884sxjzrx33d6a9jxv4dzn";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-15874.patch";
|
||||
url = "https://git.busybox.net/busybox/patch/?id=9ac42c500586fa5f10a1f6d22c3f797df11b1f6b";
|
||||
sha256 = "0169p4ylz9zd14ghhb39yfjvbdca2kb21pphylfh9ny7i484ahql";
|
||||
})
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
export KCONFIG_NOTIMESTAMP=1
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena";
|
||||
version = "3.2.0";
|
||||
version = "3.5.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
sha256 = "0n15mx8lnamkf3a1wlgx5slh6615m14wclv8fzkbb1xqq001c3j4";
|
||||
sha256 = "08hfn359l9s4lckba9xgghkn32r12gqzjjr5s5hn3fzkbsig7njy";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena-fuseki";
|
||||
version = "2.5.0";
|
||||
version = "3.5.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "0qkdpifv30138y7d6vj0dksk4fbgcnwl26dqm89q0d66sc0czfbv";
|
||||
sha256 = "0pdq103vqpkbwi84yyigw4dy60ch7xzazaj3gfcbipg73v81wpvp";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, lua }:
|
||||
{ stdenv, fetchurl, fetchpatch, lua }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.0.2";
|
||||
|
|
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "04s8cgvwjj1979s3hg8zkwc9pyn3jkjpz5zidp87kfcipifr385i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-15047.patch";
|
||||
url = https://github.com/antirez/redis/commit/ffcf7d5ab1e98d84c28af9bea7be76c6737820ad.patch;
|
||||
sha256 = "0cgx3lm0n7jxhsly8v9hdvy6vlamj3ck2jsid4fwyapz6907h64l";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ lua ];
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "groonga-${version}";
|
||||
version = "7.0.3";
|
||||
version = "7.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
|
||||
sha256 = "17pp4sbfa6wpiiiqvdbnvd1qxrchmj7zh27zdrmmnbvwpyc5g2n6";
|
||||
sha256 = "1j5biji86dicm8whbqjgjmyycxsfl5qfyxqfc4bxaspd6w18vj87";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
|
|
|||
26
pkgs/shells/nix-bash-completions/default.nix
Normal file
26
pkgs/shells/nix-bash-completions/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.2";
|
||||
name = "nix-bash-completions-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hedning";
|
||||
repo = "nix-bash-completions";
|
||||
rev = "v${version}";
|
||||
sha256 = "0clr3c0zf73pnabab4n5b5x8cd2yilksvvlp4i0rj0cfbr1pzxgr";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/bash-completion/completions
|
||||
cp _nix $out/share/bash-completion/completions
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://github.com/hedning/nix-bash-completions;
|
||||
description = "Bash completions for Nix, NixOS, and NixOps";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ hedning ];
|
||||
};
|
||||
}
|
||||
|
|
@ -216,7 +216,7 @@ rec {
|
|||
$CXX -v -o $out/bin/bar bar.cc
|
||||
$out/bin/bar
|
||||
|
||||
tar xvf ${hello.src}
|
||||
tar xvf ${hello.srcTarball}
|
||||
cd hello-*
|
||||
./configure --prefix=$out
|
||||
make
|
||||
|
|
|
|||
|
|
@ -11,11 +11,12 @@ with lib;
|
|||
let
|
||||
inherit (python2Packages) python cython buildPythonApplication;
|
||||
in buildPythonApplication rec {
|
||||
name = "xpra-2.0.2";
|
||||
namePrefix = "";
|
||||
name = "xpra-${version}";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://xpra.org/src/${name}.tar.xz";
|
||||
sha256 = "09hzgbsj9v5qyh41rbz968ipi7016jk66b60vm6piryna9kbnha3";
|
||||
sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
@ -50,7 +51,7 @@ in buildPythonApplication rec {
|
|||
|
||||
preBuild = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
|
||||
substituteInPlace xpra/server/auth/pam.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
|
||||
substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
|
||||
'';
|
||||
setupPyBuildFlags = ["--with-Xdummy" "--without-strict"];
|
||||
|
||||
|
|
@ -74,6 +75,8 @@ in buildPythonApplication rec {
|
|||
|
||||
meta = {
|
||||
homepage = http://xpra.org/;
|
||||
downloadPage = "https://xpra.org/src/";
|
||||
downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
|
||||
description = "Persistent remote applications for X";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ tstrobel offline ];
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection
|
||||
, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
|
||||
, ffmpeg, x264, libvpx, libwebp
|
||||
, libfakeXinerama }:
|
||||
, libfakeXinerama, pam }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
name = "xpra-0.16.2";
|
||||
namePrefix = "";
|
||||
name = "xpra-${version}";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://xpra.org/src/${name}.tar.xz";
|
||||
sha256 = "0h55rv46byzv2g8g77bm0a0py8jpz3gbr5fhr5jy9sisyr0vk6ff";
|
||||
sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
@ -31,6 +31,8 @@ buildPythonApplication rec {
|
|||
ffmpeg libvpx x264 libwebp
|
||||
|
||||
makeWrapper
|
||||
|
||||
pam
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -39,6 +41,7 @@ buildPythonApplication rec {
|
|||
|
||||
preBuild = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)"
|
||||
substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
|
||||
'';
|
||||
setupPyBuildFlags = [ "--without-strict" "--with-gtk3" "--without-gtk2" "--with-Xdummy" ];
|
||||
|
||||
|
|
@ -67,6 +70,8 @@ buildPythonApplication rec {
|
|||
|
||||
meta = {
|
||||
homepage = http://xpra.org/;
|
||||
downloadPage = "https://xpra.org/src/";
|
||||
downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
|
||||
description = "Persistent remote applications for X";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bubblewrap-${version}";
|
||||
version = "0.1.8";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
|
||||
sha256 = "1gyy7paqwdrfgxamxya991588ryj9q9c3rhdh31qldqyh9qpy72c";
|
||||
sha256 = "0ahw30ngpclk3ssa81cb7ydc6a4xc5dpqn6kmxfpc9xr30vimdnc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libcap libxslt docbook_xsl ];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "partclone-${version}";
|
||||
version = "0.2.89";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Thomas-Tsai";
|
||||
repo = "partclone";
|
||||
rev = version;
|
||||
sha256 = "0gw47pchqshhm00yf34qgxh6bh2jfryv0sm7ghwn77bv5gzwr481";
|
||||
sha256 = "0bv15i0gxym4dv48rgaavh8p94waryn1l6viis6qh5zm9cd08skg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, bzip2}:
|
||||
{stdenv, fetchurl, fetchpatch, bzip2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rzip-2.1";
|
||||
|
|
@ -8,6 +8,14 @@ stdenv.mkDerivation {
|
|||
};
|
||||
buildInputs = [ bzip2 ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-8364-fill-buffer.patch";
|
||||
url = https://sources.debian.net/data/main/r/rzip/2.1-4.1/debian/patches/80-CVE-2017-8364-fill-buffer.patch;
|
||||
sha256 = "0jcjlx9ksdvxvjyxmyzscx9ar9992iy5icw0sc3n0p09qi4d6x1r";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://rzip.samba.org/;
|
||||
description = "Compression program";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "disorderfs-${version}";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
|
||||
sha256 = "0nnxk0qqww16ra52mi5giw50zpssvan62nkig5dcxvgcvv51akik";
|
||||
url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2";
|
||||
sha256 = "0jdadb1ppd5qrnngpjv14az32gwslag2wwv1k8rs29iqlfy38cjf";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig asciidoc ];
|
||||
|
||||
buildInputs = [ fuse attr ];
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
url http://download.gluster.org/pub/gluster/glusterfs/
|
||||
version_link '/[0-9.]+/$'
|
||||
version_link '/[0-9.]+/$'
|
||||
version_link 'glusterfs-[0-9.]+[.]tar[.]'
|
||||
minimize_overwrite
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, fetchurl, libuuid, libselinux }:
|
||||
let
|
||||
sourceInfo = rec {
|
||||
version = "2.2.6";
|
||||
version = "2.2.7";
|
||||
url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2";
|
||||
sha256 = "1rjj6pv7yx5wm7b3w6hv88v6r53jqaam5nrnkw2and4ifhsprf3y";
|
||||
sha256 = "01f09bvjk2crx65pxmxiw362wkkl3v2v144dfn3i7bk5gz253xic";
|
||||
baseName = "nilfs-utils";
|
||||
name = "${baseName}-${version}";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Ncurses disk usage analyzer";
|
||||
homepage = http://dev.yorhel.nl/ncdu;
|
||||
homepage = https://dev.yorhel.nl/ncdu;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://oss.oetiker.ch/rrdtool/;
|
||||
homepage = https://oss.oetiker.ch/rrdtool/;
|
||||
description = "High performance logging in Round Robin Databases";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://sjeng.org/vorbisgain.html;
|
||||
homepage = https://sjeng.org/vorbisgain.html;
|
||||
description = "A utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchurl, python2Packages }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
version = "4.54.0";
|
||||
version = "5.4";
|
||||
name = "getmail-${version}";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
|
||||
sha256 = "0r9s91zrdm6xklnj1fwzz74cxhkbmrgrrp86n62qgijkafa5fmnl";
|
||||
sha256 = "1iwss9z94p165gxr2yw7s9q12a0bn71fcdbikzkykr5s7xxnz2ds";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lftp-${version}";
|
||||
version = "4.8.2";
|
||||
version = "4.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://lftp.tech/ftp/${name}.tar.bz2"
|
||||
"ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.bz2"
|
||||
"http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
|
||||
"https://lftp.tech/ftp/${name}.tar.xz"
|
||||
"https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz"
|
||||
"http://lftp.yar.ru/ftp/${name}.tar.xz"
|
||||
];
|
||||
sha256 = "0a4sp9khqgny1md0b2c9vvg4c7sz0g31w3sfdslxw7dsvijin3mn";
|
||||
sha256 = "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A file transfer program supporting a number of network protocols";
|
||||
homepage = http://lftp.tech/;
|
||||
homepage = https://lftp.tech/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.6.0";
|
||||
version = "3.6.3";
|
||||
name = "yara-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = "yara";
|
||||
rev = "v${version}";
|
||||
sha256 = "05nadqpvihdyxym11mn6n02rzv2ng8ga7j9l0g5gnjx366gcai42";
|
||||
sha256 = "13znbdwin9lvql43wpms5hh13h8rk5x5wajgmphz18rxwp8h7j78";
|
||||
};
|
||||
|
||||
# FIXME: this is probably not the right way to make it work
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, autoconf }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.99.5";
|
||||
version = "1.99.7";
|
||||
name = "dd_rescue-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "0db94piwcdyqhnlhgfs0bfp0gp2mqyrcr2l5nljapgni31qk4p8j";
|
||||
sha256 = "0d318i1i5d7hbj06wmb3xag14x542cv7fpkh5zjf5ccm64nyzir4";
|
||||
url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
baseName = "ipmiutil";
|
||||
version = "3.0.5";
|
||||
version = "3.0.7";
|
||||
name = "${baseName}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
|
||||
sha256 = "0ppfxh04c0aj9dxpkzj3xv1kylc17k1kvqabp8r7h70k6ljzgmxj";
|
||||
sha256 = "0bsl4czbwmz1f42b15y0fabys50bbfll4z73nm9xk161i2njzz6y";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -5315,6 +5315,8 @@ with pkgs;
|
|||
|
||||
bash-completion = callPackage ../shells/bash-completion { };
|
||||
|
||||
nix-bash-completions = callPackage ../shells/nix-bash-completions { };
|
||||
|
||||
dash = callPackage ../shells/dash { };
|
||||
|
||||
es = callPackage ../shells/es { };
|
||||
|
|
@ -6690,7 +6692,12 @@ with pkgs;
|
|||
|
||||
pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { };
|
||||
|
||||
racket = callPackage ../development/interpreters/racket { };
|
||||
racket = callPackage ../development/interpreters/racket {
|
||||
# racket 6.11 doesn't build with gcc6 + recent glibc:
|
||||
# https://github.com/racket/racket/pull/1886
|
||||
# https://github.com/NixOS/nixpkgs/pull/31017#issuecomment-343574769
|
||||
stdenv = overrideCC stdenv gcc7;
|
||||
};
|
||||
|
||||
rakudo = callPackage ../development/interpreters/rakudo {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
|
||||
|
|
@ -13730,7 +13737,7 @@ with pkgs;
|
|||
|
||||
amsn = callPackage ../applications/networking/instant-messengers/amsn { };
|
||||
|
||||
androidStudioPackages = callPackage ../applications/editors/android-studio/packages.nix {};
|
||||
androidStudioPackages = callPackage ../applications/editors/android-studio { };
|
||||
android-studio = androidStudioPackages.stable;
|
||||
android-studio-preview = androidStudioPackages.preview;
|
||||
|
||||
|
|
@ -17671,6 +17678,8 @@ with pkgs;
|
|||
|
||||
blobby = callPackage ../games/blobby { };
|
||||
|
||||
braincurses = callPackage ../games/braincurses { };
|
||||
|
||||
brogue = callPackage ../games/brogue { };
|
||||
|
||||
bsdgames = callPackage ../games/bsdgames { };
|
||||
|
|
@ -17681,6 +17690,8 @@ with pkgs;
|
|||
|
||||
cataclysm-dda = callPackage ../games/cataclysm-dda { };
|
||||
|
||||
cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix { };
|
||||
|
||||
chessdb = callPackage ../games/chessdb { };
|
||||
|
||||
chessx = libsForQt5.callPackage ../games/chessx { };
|
||||
|
|
@ -18705,6 +18716,7 @@ with pkgs;
|
|||
HoTT = callPackage ../development/coq-modules/HoTT {};
|
||||
interval = callPackage ../development/coq-modules/interval {};
|
||||
mathcomp = callPackage ../development/coq-modules/mathcomp { };
|
||||
metalib = callPackage ../development/coq-modules/metalib { };
|
||||
paco = callPackage ../development/coq-modules/paco {};
|
||||
ssreflect = callPackage ../development/coq-modules/ssreflect { };
|
||||
QuickChick = callPackage ../development/coq-modules/QuickChick {};
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ let
|
|||
|
||||
camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
|
||||
camomile =
|
||||
if lib.versionOlder "4.03" ocaml.version
|
||||
if lib.versionOlder "4.02" ocaml.version
|
||||
then callPackage ../development/ocaml-modules/camomile { }
|
||||
else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { };
|
||||
|
||||
|
|
|
|||
|
|
@ -2308,15 +2308,16 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
};
|
||||
|
||||
ConfigGrammar = buildPerlPackage {
|
||||
name = "Config-Grammar-1.11";
|
||||
ConfigGrammar = buildPerlPackage rec {
|
||||
name = "Config-Grammar-1.12";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.11.tar.gz;
|
||||
sha256 = "dd819f89b19c51e9fac6965360cd9db54436e1328968c802416ac34188ca65ee";
|
||||
url = "mirror://cpan/authors/id/D/DS/DSCHWEI/${name}.tar.gz";
|
||||
sha256 = "7a52a3657d96e6f1f529caaa09ec3bf7dd6a245b47875382c323902f6d9590b0";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/schweikert/Config-Grammar;
|
||||
description = "A grammar-based, user-friendly config parser";
|
||||
license = "unknown";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -4812,14 +4813,14 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
};
|
||||
|
||||
Encode = buildPerlPackage {
|
||||
name = "Encode-2.78";
|
||||
Encode = buildPerlPackage rec {
|
||||
name = "Encode-2.93";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.78.tar.gz;
|
||||
sha256 = "1fc8d5c0e75ef85beeac71d1fe4a3bfcb8207755a46b32f783a3a6682672762a";
|
||||
url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
|
||||
sha256 = "2d06b0375c84a75cf3762685e6d94c3aef25833fd0427daa0ae87b04ae6f739c";
|
||||
};
|
||||
meta = {
|
||||
description = "Unknown";
|
||||
description = "Character encodings in Perl";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
|
@ -5104,6 +5105,19 @@ let self = _self // overrides; _self = with self; {
|
|||
buildInputs = [ PerlOSType ];
|
||||
};
|
||||
|
||||
ExtUtilsCChecker = buildPerlPackage rec {
|
||||
name = "ExtUtils-CChecker-0.10";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/P/PE/PEVANS/${name}.tar.gz";
|
||||
sha256 = "50bfe76870fc1510f56bae4fa2dce0165d9ac4af4e7320d6b8fda14dfea4be0b";
|
||||
};
|
||||
buildInputs = [ ModuleBuild TestFatal ];
|
||||
meta = {
|
||||
description = "Configure-time utilities for using C headers,";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
ExtUtilsConfig = buildPerlPackage {
|
||||
name = "ExtUtils-Config-0.007";
|
||||
src = fetchurl {
|
||||
|
|
@ -5540,6 +5554,19 @@ let self = _self // overrides; _self = with self; {
|
|||
propagatedBuildInputs = [ CryptRijndael ];
|
||||
};
|
||||
|
||||
Filelchown = buildPerlPackage rec {
|
||||
name = "File-lchown-0.02";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/P/PE/PEVANS/${name}.tar.gz";
|
||||
sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec";
|
||||
};
|
||||
buildInputs = [ ExtUtilsCChecker ModuleBuild ];
|
||||
meta = {
|
||||
description = "Modify attributes of symlinks without dereferencing them";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
FileLibMagic = buildPerlPackage rec {
|
||||
name = "File-LibMagic-1.16";
|
||||
src = fetchurl {
|
||||
|
|
@ -8154,6 +8181,19 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
};
|
||||
|
||||
LWPAuthenOAuth = buildPerlPackage rec {
|
||||
name = "LWP-Authen-OAuth-1.02";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/T/TI/TIMBRODY/${name}.tar.gz";
|
||||
sha256 = "e78e0bd7de8002cfb4760073258d555ef55b2c27c07a94b3d8a2166a17fd96bc";
|
||||
};
|
||||
propagatedBuildInputs = [ LWP URI ];
|
||||
meta = {
|
||||
description = "Generate signed OAuth requests";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
LWPMediaTypes = buildPerlPackage {
|
||||
name = "LWP-MediaTypes-6.02";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -9082,7 +9082,7 @@ in {
|
|||
|
||||
meta = {
|
||||
description = "A command-line tool that helps you clean up Git branches";
|
||||
homepage = http://lab.arc90.com/2012/04/03/git-sweep/;
|
||||
homepage = https://github.com/arc90/git-sweep;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue