swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Shea Levy 2016-11-04 22:57:07 -04:00
parent 1c6b3bdc35 85cf3b7418
commit ca4b43d180
180 changed files with 11862 additions and 7832 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View file

@ -9,7 +9,7 @@
on non-NixOS)
- Built on platform(s)
- [ ] NixOS
- [ ] OS X
- [ ] macOS
- [ ] Linux
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)

2
lib/maintainers.nix
View file

@ -187,7 +187,6 @@
hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
hce = "Hans-Christian Esperer <hc@hcesperer.org>";
henrytill = "Henry Till <henrytill@gmail.com>";
hiberno = "Christian Lask <hiberno@hiberno.net>";
hinton = "Tom Hinton <t@larkery.com>";
hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
iand675 = "Ian Duncan <ian@iankduncan.com>";
@ -360,6 +359,7 @@
rardiol = "Ricardo Ardissone <ricardo.ardissone@gmail.com>";
rasendubi = "Alexey Shmalko <rasen.dubi@gmail.com>";
raskin = "Michael Raskin <7c6f434c@mail.ru>";
rbasso = "Rafael Basso <rbasso@sharpgeeks.net>";
redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
redvers = "Redvers Davies <red@infect.me>";
refnil = "Martin Lavoie <broemartino@gmail.com>";

1
nixos/modules/module-list.nix
View file

@ -61,6 +61,7 @@
./misc/nixpkgs.nix
./misc/passthru.nix
./misc/version.nix
./programs/adb.nix
./programs/atop.nix
./programs/bash/bash.nix
./programs/blcr.nix

30
nixos/modules/programs/adb.nix Normal file
View file

@ -0,0 +1,30 @@
{ config, lib, pkgs, ... }:
with lib;
{
meta.maintainers = [ maintainers.mic92 ];
###### interface
options = {
programs.adb = {
enable = mkOption {
default = false;
example = true;
type = types.bool;
description = ''
Whether to configure system to use Android Debug Bridge (adb).
To grant access to a user, it must be part of adbusers group:
<code>users.extraUsers.alice.extraGroups = ["adbusers"];</code>
'';
};
};
};
###### implementation
config = mkIf config.programs.adb.enable {
services.udev.packages = [ pkgs.android-udev-rules ];
environment.systemPackages = [ pkgs.androidenv.platformTools ];
users.extraGroups.adbusers = {};
};
}

30
nixos/modules/services/misc/matrix-synapse.nix
View file

@ -9,11 +9,15 @@ let
mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${fromBool l.tls}, x_forwarded: ${fromBool l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}'';
fromBool = x: if x then "true" else "false";
configFile = pkgs.writeText "homeserver.yaml" ''
${optionalString (cfg.tls_certificate_path != null) ''
tls_certificate_path: "${cfg.tls_certificate_path}"
''}
${optionalString (cfg.tls_private_key_path != null) ''
tls_private_key_path: "${cfg.tls_private_key_path}"
''}
${optionalString (cfg.tls_dh_params_path != null) ''
tls_dh_params_path: "${cfg.tls_dh_params_path}"
''}
no_tls: ${fromBool cfg.no_tls}
${optionalString (cfg.bind_port != null) ''
bind_port: ${toString cfg.bind_port}
@ -146,8 +150,9 @@ in {
'';
};
tls_certificate_path = mkOption {
type = types.str;
default = "/var/lib/matrix-synapse/homeserver.tls.crt";
type = types.nullOr types.str;
default = null;
example = "/var/lib/matrix-synapse/homeserver.tls.crt";
description = ''
PEM encoded X509 certificate for TLS.
You can replace the self-signed certificate that synapse
@ -158,16 +163,17 @@ in {
};
tls_private_key_path = mkOption {
type = types.nullOr types.str;
default = "/var/lib/matrix-synapse/homeserver.tls.key";
example = null;
default = null;
example = "/var/lib/matrix-synapse/homeserver.tls.key";
description = ''
PEM encoded private key for TLS. Specify null if synapse is not
speaking TLS directly.
'';
};
tls_dh_params_path = mkOption {
type = types.str;
default = "/var/lib/matrix-synapse/homeserver.tls.dh";
type = types.nullOr types.str;
default = null;
example = "/var/lib/matrix-synapse/homeserver.tls.dh";
description = ''
PEM dh parameters for ephemeral keys
'';
@ -557,12 +563,10 @@ in {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
if ! test -e /var/lib/matrix-synapse; then
mkdir -p /var/lib/matrix-synapse
chmod 700 /var/lib/matrix-synapse
chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse
${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse/ --generate-keys
fi
${cfg.package}/bin/homeserver \
--config-path ${configFile} \
--keys-directory /var/lib/matrix-synapse \
--generate-keys
'';
serviceConfig = {
Type = "simple";
@ -570,7 +574,7 @@ in {
Group = "matrix-synapse";
WorkingDirectory = "/var/lib/matrix-synapse";
PermissionsStartOnly = true;
ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile}";
ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse";
};
};
};

3
nixos/modules/services/misc/parsoid.nix
View file

@ -91,7 +91,8 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/api/server.js -c ${confFile} -n ${toString cfg.workers}";
User = "nobody";
ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}";
};
};

7
nixos/modules/services/networking/cjdns.nix
View file

@ -36,7 +36,7 @@ let
echo \'\'
${concatStringsSep "\n" (mapAttrsToList (k: v:
optionalString (v.hostname != "")
"echo $(${pkgs.cjdns}/bin/publictoip6 ${x.key}) ${x.host}")
"echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}")
(cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
echo \'\'
'');
@ -245,7 +245,10 @@ in
serviceConfig = {
Type = "forking";
Restart = "on-failure";
CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW";
ProtectSystem = "full";
MemoryDenyWriteExecute = true;
ProtectHome = true;
PrivateTmp = true;
};

11
nixos/modules/services/networking/quassel.nix
View file

@ -3,8 +3,8 @@
with lib;
let
quassel = pkgs.kde4.quasselDaemon;
cfg = config.services.quassel;
quassel = cfg.package;
user = if cfg.user != null then cfg.user else "quassel";
in
@ -23,6 +23,15 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.kde4.quasselDaemon;
description = ''
The package of the quassel daemon.
'';
example = pkgs.quasselDaemon;
};
interfaces = mkOption {
default = [ "127.0.0.1" ];
description = ''

4
nixos/modules/services/networking/smokeping.nix
View file

@ -221,7 +221,7 @@ in
type = types.string;
default = ''
+ FPing
binary = ${pkgs.fping}/bin/fping
binary = ${config.security.wrapperDir}/fping
'';
description = "Probe configuration";
};
@ -284,10 +284,10 @@ in
mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
rm -f ${smokepingHome}/cropper
ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper
chown -R ${cfg.user} ${smokepingHome}
cp ${cgiHome} ${smokepingHome}/smokeping.fcgi
${cfg.package}/bin/smokeping --check --config=${configPath}
${cfg.package}/bin/smokeping --static --config=${configPath}
chown -R ${cfg.user} ${smokepingHome}
'';
script = ''${cfg.package}/bin/smokeping --config=${configPath} --nodaemon'';
};

11
nixos/modules/services/networking/vsftpd.nix
View file

@ -100,6 +100,10 @@ let
seccomp_sandbox=NO
''}
anon_umask=${cfg.anonymousUmask}
${optionalString cfg.anonymousUser ''
anon_root=${cfg.anonymousUserHome}
''}
${cfg.extraConfig}
'';
in
@ -163,6 +167,13 @@ in
description = "Anonymous write umask.";
};
extraConfig = mkOption {
type = types.lines;
default = "";
example = "ftpd_banner=Hello";
description = "Extra configuration to add at the bottom of the generated configuration file.";
};
} // (listToAttrs (catAttrs "nixosOption" optionDescription));
};

3
nixos/modules/services/networking/znc.nix
View file

@ -208,11 +208,10 @@ in
networks = mkOption {
default = { };
type = types.loaOf types.optionSet;
type = with types; loaOf (submodule networkOpts);
description = ''
IRC networks to connect the user to.
'';
options = [ networkOpts ];
example = {
"freenode" = {
server = "chat.freenode.net";

2
nixos/modules/virtualisation/libvirtd.nix
View file

@ -123,7 +123,7 @@ in {
# config file. But this path can unfortunately be garbage collected
# while still being used by the virtual machine. So update the
# emulator path on each startup to something valid (re-scan $PATH).
for file in /etc/libvirt/qemu/*.xml /etc/libvirt/lxc/*.xml; do
for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do
test -f "$file" || continue
# get (old) emulator path from config file
emulator=$(grep "^[[:space:]]*<emulator>" "$file" | sed 's,^[[:space:]]*<emulator>\(.*\)</emulator>.*,\1,')

1
nixos/tests/cjdns.nix
View file

@ -57,6 +57,7 @@ import ./make-test.nix ({ pkgs, ...} : {
connectTo."192.168.0.1:1024}" =
{ password = carolPassword;
publicKey = carolPubKey;
hostname = "carol";
};
};
};

4
nixos/tests/hibernate.nix
View file

@ -13,7 +13,7 @@ import ./make-test.nix (pkgs: {
networking.firewall.allowedTCPPorts = [ 4444 ];
systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l -p 4444";
systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444";
};
probe = { config, lib, pkgs, ...}: {
@ -36,7 +36,7 @@ import ./make-test.nix (pkgs: {
$machine->waitForShutdown;
$machine->start;
$probe->waitForUnit("network.target");
$probe->waitUntilSucceeds("echo test | nc -c machine 4444");
$probe->waitUntilSucceeds("echo test | nc machine 4444");
'';
})

41
nixos/tests/mpich.nix
View file

@ -1,41 +0,0 @@
# Simple example to showcase distributed tests using NixOS VMs.
import ./make-test.nix ({ pkgs, ...} : {
name = "mpich";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
nodes = {
master =
{ config, pkgs, ... }: {
environment.systemPackages = [ gcc mpich2 ];
#boot.kernelPackages = pkgs.kernelPackages_2_6_29;
};
slave =
{ config, pkgs, ... }: {
environment.systemPackages = [ gcc mpich2 ];
};
};
# Start master/slave MPI daemons and compile/run a program that uses both
# nodes.
testScript =
''
startAll;
$master->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
$master->succeed("chmod 600 /etc/mpd.conf");
$master->succeed("mpd --daemon --ifhn=master --listenport=4444");
$slave->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
$slave->succeed("chmod 600 /etc/mpd.conf");
$slave->succeed("mpd --daemon --host=master --port=4444");
$master->succeed("mpicc -o example -Wall ${./mpich-example.c}");
$slave->succeed("mpicc -o example -Wall ${./mpich-example.c}");
$master->succeed("mpiexec -n 2 ./example >&2");
'';
})

14
nixos/tests/test-config-examples.sh
View file

@ -1,14 +0,0 @@
#!/bin/sh
# This script try to evaluate all configurations which are stored in
# doc/config-examples. This script is useful to ensure that examples are
# working with the current system.
pwd=$(pwd)
set -xe
for i in ../doc/config-examples/*.nix; do
NIXOS_CONFIG="$pwd/$i" nix-instantiate \
--eval-only --xml --strict > /dev/null 2>&1 \
../default.nix -A system
done
set +xe

12
nixos/tests/virtualbox.nix
View file

@ -299,9 +299,9 @@ let
-pf /run/dhclient.pid \
-v eth0 eth1
otherIP="$(${pkgs.netcat}/bin/netcat -clp 1234 || :)"
otherIP="$(${pkgs.netcat}/bin/nc -l 1234 || :)"
${pkgs.iputils}/bin/ping -I eth1 -c1 "$otherIP"
echo "$otherIP reachable" | ${pkgs.netcat}/bin/netcat -clp 5678 || :
echo "$otherIP reachable" | ${pkgs.netcat}/bin/nc -l 5678 || :
'';
sysdDetectVirt = pkgs: ''
@ -461,11 +461,11 @@ in mapAttrs mkVBoxTest {
my $test1IP = waitForIP_test1 1;
my $test2IP = waitForIP_test2 1;
$machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234");
$machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234");
$machine->succeed("echo '$test2IP' | nc '$test1IP' 1234");
$machine->succeed("echo '$test1IP' | nc '$test2IP' 1234");
$machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2");
$machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2");
$machine->waitUntilSucceeds("nc '$test1IP' 5678 >&2");
$machine->waitUntilSucceeds("nc '$test2IP' 5678 >&2");
shutdownVM_test1;
shutdownVM_test2;

4
pkgs/applications/altcoins/bitcoin.nix
View file

@ -6,14 +6,14 @@ with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
core_version = "0.13.0";
core_version = "0.13.1";
version = core_version;
src = fetchurl {
urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz"
"mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
];
sha256 = "0c7d7049689bb17f4256f1e5ec20777f42acef61814d434b38e6c17091161cda";
sha256 = "d8edbd797ff1c8266113e54d851a85def46ab82389abe7d7bd0d2827e74cecd7";
};
buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib

7
pkgs/applications/audio/airwave/default.nix
View file

@ -4,13 +4,13 @@
let
version = "1.3.2";
version = "1.3.3";
airwave-src = fetchFromGitHub {
owner = "phantom-code";
repo = "airwave";
rev = version;
sha256 = "053kkx5yq1vas0qisidkgq0h6hzfwy3677jprjkcrwc4hp2i2v12";
sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s";
};
stdenv_multi = overrideCC stdenv gcc_multi;
@ -60,6 +60,9 @@ stdenv_multi.mkDerivation {
# shrinking.
dontPatchELF = true;
# Cf. https://github.com/phantom-code/airwave/issues/57
hardeningDisable = [ "format" ];
cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}";
postInstall = ''

2
pkgs/applications/audio/ardour/default.nix
View file

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
patchShebangs ./tools/
'';
configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out";
configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa,dummy --prefix=$out";
buildPhase = "${python2.interpreter} waf";

1
pkgs/applications/audio/caudec/default.nix
View file

@ -34,6 +34,5 @@ stdenv.mkDerivation rec {
description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)";
license = licenses.gpl3;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ hiberno ];
};
}

4
pkgs/applications/audio/drumgizmo/default.nix
View file

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "0.9.10";
version = "0.9.11";
name = "drumgizmo-${version}";
src = fetchurl {
url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
sha256 = "142si734lsyywxhn7msiz053ir96kl5im3h1jql3vhcb4807f3d1";
sha256 = "04hf3nhccwr98n2081rrvfccz50nly6k3gbk9zxccp1522qz5xvf";
};
configureFlags = [ "--enable-lv2" ];

8
pkgs/applications/audio/drumkv1/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, libjack2, libsndfile, lv2, qt4 }:
{ stdenv, fetchurl, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
version = "0.7.1";
version = "0.7.6";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "0mpf8akqaakg7vbn8gba0ns64hzhn5xzh1qxqpchcv32swn21cq4";
sha256 = "0cl1rbj26nsbvg9wzsh2j8xlx69xjxn29x46ypmy3939zbk81bi6";
};
buildInputs = [ libjack2 libsndfile lv2 qt4 ];
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
meta = with stdenv.lib; {
description = "An old-school drum-kit sampler synthesizer with stereo fx";

4
pkgs/applications/audio/eq10q/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }:
stdenv.mkDerivation rec {
name = "eq10q-${version}";
version = "2.0";
version = "2.1";
src = fetchurl {
url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h";
sha256 = "0brrr6ydsppi4zzn3vcgl0zgq5r8jmlcap1hpr3k43yvlwggb880";
};
buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];

48
pkgs/applications/audio/fmsynth/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }:
stdenv.mkDerivation rec {
name = "fmsynth-unstable-${version}";
version = "2015-02-07";
src = fetchFromGitHub {
owner = "Themaister";
repo = "libfmsynth";
rev = "9ffa1d2fea287f1209b210d2dbde2f0f60f37176";
sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q";
};
buildInputs = [ gtkmm2 lv2 lvtk pkgconfig ];
buildPhase = ''
cd lv2
substituteInPlace GNUmakefile --replace "/usr/lib/lv2" "$out/lib/lv2"
make
'';
preInstall = "mkdir -p $out/lib/lv2";
meta = {
description = "a flexible 8 operator FM synthesizer for LV2";
longDescription = ''
The synth core supports:
- Arbitrary amounts of polyphony
- 8 operators
- No fixed "algorithms"
- Arbitrary modulation, every operator can modulate any other operator, even itself
- Arbitrary carrier selection, every operator can be a carrier
- Sine LFO, separate LFO per voice, modulates amplitude and frequency of operators
- Envelope per operator
- Carrier stereo panning
- Velocity sensitivity per operator
- Mod wheel sensitivity per operator
- Pitch bend
- Keyboard scaling
- Sustain, sustained keys can overlap each other for a very rich sound
- Full floating point implementation optimized for SIMD
- Hard real-time constraints
'';
homepage = https://github.com/Themaister/libfmsynth;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/applications/audio/guitarix/default.nix
View file

@ -12,11 +12,11 @@ in
stdenv.mkDerivation rec {
name = "guitarix-${version}";
version = "0.35.1";
version = "0.35.2";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
sha256 = "066qva1zk63qw60s0vbi9g9jh22ljw67p91pk82kv11gw24h3vg6";
sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p";
};
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ];

30
pkgs/applications/audio/helm/default.nix
View file

@ -1,15 +1,16 @@
{ stdenv, fetchurl, xorg, freetype, alsaLib, libjack2
{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, libjack2
, lv2, pkgconfig, mesa }:
stdenv.mkDerivation rec {
version = "0.6.1";
version = "0.8.6";
name = "helm-${version}";
src = fetchurl {
url = "https://github.com/mtytel/helm/archive/v${version}.tar.gz";
sha256 = "18d7zx6r7har47zj6x1f2z91x796mxnix7w3x1yilmqnyqc56r3w";
};
src = fetchFromGitHub {
owner = "mtytel";
repo = "helm";
rev = "19f86e6b4db83c1c6b143fc27883592ac4e43489";
sha256 = "0a46wnbfqkns8l136v79rr9gv4hhba065igjwkjddf045c9l94l8";
};
buildInputs = [
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
@ -17,11 +18,18 @@
freetype alsaLib libjack2 pkgconfig mesa lv2
];
CXXFLAGS = "-DHAVE_LROUND";
patchPhase = ''
sed -i 's|usr/||g' Makefile
'';
buildPhase = ''
make lv2
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/lib/lv2
cp -a standalone/builds/linux/build/* $out/bin
cp -a builds/linux/LV2/* $out/lib/lv2/
make DESTDIR="$out" install
'';
meta = with stdenv.lib; {

2
pkgs/applications/audio/ncmpc/default.nix
View file

@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
description = "Curses-based interface for MPD (music player daemon)";
homepage = http://www.musicpd.org/clients/ncmpc/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ hiberno ];
platforms = platforms.all;
};
}

1
pkgs/applications/audio/pamixer/default.nix
View file

@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/cdemoulins/pamixer;
license = licenses.gpl3;
maintainers = with maintainers; [ hiberno ];
platforms = platforms.linux;
};
}

10
pkgs/applications/audio/qjackctl/default.nix
View file

@ -1,22 +1,22 @@
{ stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }:
stdenv.mkDerivation rec {
version = "0.4.2";
version = "0.4.3";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
sha256 = "0pmgkqgkapbma42zqb5if4ngmj183rxl8bhjm7mhyhgq4bzll76g";
sha256 = "01wyyynxy21kim0gplzvfij7275a1jz68hdx837d2j1w5x2w7zbb";
};
buildInputs = [
buildInputs = [
qt5.full
qt5.qtx11extras
alsaLib
alsaLib
libjack2
dbus
dbus
];
configureFlags = "--enable-jack-version";

8
pkgs/applications/audio/samplv1/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, libjack2, libsndfile, lv2, qt4 }:
{ stdenv, fetchurl, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
stdenv.mkDerivation rec {
name = "samplv1-${version}";
version = "0.7.1";
version = "0.7.6";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
sha256 = "0494w1xhhadwzvdr0v4gg5pzr2w2ah2vk896znj59j1y9gn3gilq";
sha256 = "071j7mi2cwhx0ml5hq8izmjb0s4yhbkscqaxfdg56xfpfsqsa63l";
};
buildInputs = [ libjack2 libsndfile lv2 qt4 ];
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
meta = with stdenv.lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";

12
pkgs/applications/audio/swh-lv2/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }:
{ stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "swh-lv2-git-2013-05-17";
name = "swh-lv2-v${version}";
version = "1.0.16";
src = fetchgit {
url = "https://github.com/swh/lv2.git";
rev = "978d5d8f549fd22048157a6d044af0faeaacbd7f";
sha256 = "10jj8sp67caxvmzjxwyzapc34jpry5nrkkp49kyyvyk5dgkpbsjw";
src = fetchurl {
url = "https://github.com/swh/lv2/archive/v${version}.tar.gz";
sha256 = "0j1mih0lp4fds07knp5i32in515sh0df1qi6694pmyz2wqnm295w";
};
patchPhase = ''

8
pkgs/applications/audio/synthv1/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, qt4, libjack2, lv2 }:
{ stdenv, fetchurl, qt5, libjack2, alsaLib, liblo, lv2 }:
stdenv.mkDerivation rec {
name = "synthv1-${version}";
version = "0.7.1";
version = "0.7.6";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
sha256 = "0asjhz0xj1kwysvsj9q54r8j8fy7cnr408ygfpdhg7yn24rv67hh";
sha256 = "03vnmmiyq92p2gh4zax1vg2lx6y57bsxch936pzbiwx649x53wi9";
};
buildInputs = [ qt4 libjack2 lv2 ];
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
meta = with stdenv.lib; {
description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";

36
pkgs/applications/audio/x42-plugins/default.nix
View file

@ -1,32 +1,30 @@
{ stdenv, fetchurl, pkgconfig, fetchgit
{ stdenv, fetchurl, pkgconfig
, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2
, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
version = "20160619";
version = "20160825";
name = "x42-plugins-${version}";
src = fetchurl {
url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz";
sha256 = "1ald0c5xbfkdq6g5xwyy8wmbi636m3k3gqrq16kbh46g0kld1as9";
sha256 = "13ln5ccmrrc07ykfp040389av60dlgqz1kh6vfjkga6sq7z51msr";
};
buildInputs = [
mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate
lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver
];
buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver];
makeFlags = [
"PREFIX=$(out)"
"FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf"
"LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h"
];
makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
meta = with stdenv.lib; {
description = "Collection of LV2 plugins by Robin Gareus";
homepage = https://github.com/x42/x42-plugins;
maintainers = with maintainers; [ magnetophon ];
license = licenses.gpl2;
platforms = platforms.linux;
};
patchPhase = ''
patchShebangs ./stepseq.lv2/gridgen.sh
sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile
'';
meta = with stdenv.lib;
{ description = "Collection of LV2 plugins by Robin Gareus";
homepage = https://github.com/x42/x42-plugins;
maintainers = with maintainers; [ magnetophon ];
license = licenses.gpl2;
platforms = platforms.linux;
};
}

4
pkgs/applications/audio/yoshimi/default.nix
View file

@ -6,11 +6,11 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "yoshimi-${version}";
version = "1.3.8.2";
version = "1.4.1";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
sha256 = "0wl4ln6v1nkkx56kfah23chyrhga2vi93i82g0s200c4s4184xr8";
sha256 = "133sx42wb66g803pcrgdwph40wh94knvab3yfqkgm0001jv4v14y";
};
buildInputs = [

64
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View file

@ -28,10 +28,10 @@
ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
elpaBuild {
pname = "ada-mode";
version = "5.2.0";
version = "5.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ada-mode-5.2.0.tar";
sha256 = "1j4f94bmykz5j6kyyg5x81k0yjai609c1qzs8sig8v267hydkpqr";
url = "https://elpa.gnu.org/packages/ada-mode-5.2.1.tar";
sha256 = "099c8vm6jvwypff981vbs77y6hqq31fn6s8gwqkmncq04mk3vw34";
};
packageRequires = [ cl-lib emacs wisi ];
meta = {
@ -471,10 +471,10 @@
debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
elpaBuild {
pname = "debbugs";
version = "0.11";
version = "0.12";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.11.tar";
sha256 = "10v9s7ayvfzd6j6hqfc9zihxgmsc2j0xhxrgy3ah30qkqn6z8w6n";
url = "https://elpa.gnu.org/packages/debbugs-0.12.tar";
sha256 = "1swi4d7fhahimid9j12cypmkz7dlqgffrnhfxy5ra44y3j2b35ph";
};
packageRequires = [ cl-lib soap-client ];
meta = {
@ -833,6 +833,20 @@
license = lib.licenses.free;
};
}) {};
highlight-escape-sequences = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "highlight-escape-sequences";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.3.el";
sha256 = "0q54h0zdaflr2sk4mwgm2ix8cdq4rm4pz03ln430qxc1zm8pz6gy";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html";
license = lib.licenses.free;
};
}) {};
html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "html5-schema";
version = "0.1";
@ -1337,10 +1351,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20161024";
version = "20161031";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20161024.tar";
sha256 = "1rg9hl8vghx72prc6m1c29p5crns0i70hh7lffbhqzjixq6jqvlj";
url = "https://elpa.gnu.org/packages/org-20161031.tar";
sha256 = "0b4dzdimdkp7116cyyq80n4h71qc477akiblbabnpb8sg87qqg7r";
};
packageRequires = [];
meta = {
@ -1388,6 +1402,20 @@
license = lib.licenses.free;
};
}) {};
parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "parsec";
version = "0.1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar";
sha256 = "032m9iks5a05vbc4159dfs9b7shmqm6mk05jgbs9ndvy400drwd6";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/parsec.html";
license = lib.licenses.free;
};
}) {};
pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "pinentry";
version = "0.1";
@ -1569,10 +1597,10 @@
}) {};
seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "seq";
version = "2.16";
version = "2.19";
src = fetchurl {
url = "https://elpa.gnu.org/packages/seq-2.16.tar";
sha256 = "1fc1cjbb3lrxgkhzvg4bkpxr408hhg8kqa07n0jfalrdzaa3bika";
url = "https://elpa.gnu.org/packages/seq-2.19.tar";
sha256 = "11hb7is6a4h1lscjcfrzh576j0g3m5yjydn16s6x5bxp5gsr6zha";
};
packageRequires = [];
meta = {
@ -1981,10 +2009,10 @@
wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "wisi";
version = "1.1.3";
version = "1.1.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/wisi-1.1.3.tar";
sha256 = "1vhligxyg73gvr68767pjgiqxah00a920h6i37kip8xmhlkgp9ak";
url = "https://elpa.gnu.org/packages/wisi-1.1.4.tar";
sha256 = "1n0bq77vspbxpzs54r0rigb2fhj5a5vm8qxwgdnqdawanmq72l4r";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -2048,10 +2076,10 @@
yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "yasnippet";
version = "0.10.0";
version = "0.11.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/yasnippet-0.10.0.tar";
sha256 = "0vh70i73rknaxzglr4nragassgpjy2lj5mca2x6wqiqmv7mc8xdv";
url = "https://elpa.gnu.org/packages/yasnippet-0.11.0.tar";
sha256 = "1m0hchhianl69sb1iqa8av513qvz6krjg4b5ppwfx1sjlai9xj2y";
};
packageRequires = [ cl-lib ];
meta = {

1526
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View file

File diff suppressed because it is too large Load diff

373
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View file

@ -1624,6 +1624,27 @@
license = lib.licenses.free;
};
}) {};
atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
melpaBuild {
pname = "atomic-chrome";
version = "0.1.0";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "atomic-chrome";
rev = "6fe75d409323554d4c4f35ac0e90963fe90d3a43";
sha256 = "0lc0j6ffd6cpqnpfvpqm7rfxblj34pg9vw3zs1hkg15g7qw0nh5c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9";
name = "atomic-chrome";
};
packageRequires = [ emacs let-alist websocket ];
meta = {
homepage = "https://melpa.org/#/atomic-chrome";
license = lib.licenses.free;
};
}) {};
auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auctex-latexmk";
@ -3082,12 +3103,12 @@
cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
melpaBuild {
pname = "cask";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
rev = "f5b828ef4ff6c367f87181a5b998aa78e42c2f24";
sha256 = "0kmm1dlyf4f8b7dy2v2n7nf6620v6cq70ndlv5607dibhmaa8ksr";
rev = "58f641960bcb152b33fcd27d41111291702e2da6";
sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@ -3205,6 +3226,27 @@
license = lib.licenses.free;
};
}) {};
cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "cdnjs";
version = "0.2.1";
src = fetchFromGitHub {
owner = "yasuyk";
repo = "cdnjs.el";
rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908";
sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs";
sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
name = "cdnjs";
};
packageRequires = [ dash deferred f pkg-info ];
meta = {
homepage = "https://melpa.org/#/cdnjs";
license = lib.licenses.free;
};
}) {};
celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "celery";
@ -3376,12 +3418,12 @@
chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
melpaBuild {
pname = "chinese-pyim";
version = "0.5";
version = "1.0";
src = fetchFromGitHub {
owner = "tumashu";
repo = "chinese-pyim";
rev = "915f77912f0f8cfe064c6872cae5c0709e4e094e";
sha256 = "004xnn6j4jc607h5qcl9jr0dqvhvqvgm77wrbdmdxpwd6hwp2sf4";
rev = "43931dbb96c3aa5df8dda030503f1458dc6ca1c5";
sha256 = "0kn3nsdlsgd6hlq7c32kp29bhh9zych727sbx028w1bidjsvjlly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@ -4077,27 +4119,6 @@
license = lib.licenses.free;
};
}) {};
colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "colorsarenice-theme";
version = "1.0.20";
src = fetchFromGitHub {
owner = "Fanael";
repo = "colorsarenice-theme";
rev = "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6";
sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3ac373bc7d1c4d3e49523d587d279968995e164c/recipes/colorsarenice-theme";
sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
name = "colorsarenice-theme";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/colorsarenice-theme";
license = lib.licenses.free;
};
}) {};
commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "commander";
@ -4716,12 +4737,12 @@
composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
melpaBuild {
pname = "composer";
version = "0.0.6";
version = "0.0.7";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "composer.el";
rev = "d955d9dd39b3bd0ba04ade648108ddb805bac4bc";
sha256 = "1yxywibs7zdhc4kgl372rl49r1ivl96adnapz2k58kggjybjk778";
rev = "47d840e03412da5db13ae2b962576f0166517581";
sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
@ -5007,6 +5028,27 @@
license = lib.licenses.free;
};
}) {};
creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "creamsody-theme";
version = "0.1.3";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-creamsody";
rev = "41164f285735383848aba1bfef4282bca4e9a8e8";
sha256 = "0inql6g8f1nhx0k781ahm26fjpmpqq1cm3i7bf64ib9g5izjf91d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7";
name = "creamsody-theme";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/creamsody-theme";
license = lib.licenses.free;
};
}) {};
creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "creds";
@ -5239,12 +5281,12 @@
cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyberpunk-theme";
version = "1.17";
version = "1.18";
src = fetchFromGitHub {
owner = "n3mo";
repo = "cyberpunk-theme.el";
rev = "4ffdaee0a32b8e235bf44c0daedde66eaf7b1b33";
sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
rev = "bec963abce7a208ec192a8349ed0b8e1ac3b3041";
sha256 = "1adbws88113lfm5ljahms12aji1swip732l7pamxwibfywhgpn2f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@ -5281,12 +5323,12 @@
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cython-mode";
version = "0.24.1";
version = "0.25.1";
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
rev = "27d7795ce424cd710431c47ab4cb29111f1a3e9c";
sha256 = "0kddvsnc4a2ass4zfzrqp26jlbnqsgbv0dy9rmj3p2n61wqkw4wk";
rev = "278a567621d586af74a1c845de0a1426b686c72e";
sha256 = "0wqnjcspdysn0fd4ckd49wbvi4x2gbl91asgrmijac1lq6k9vj2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@ -5927,22 +5969,22 @@
license = lib.licenses.free;
};
}) {};
dired-icon = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild }:
dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-icon";
version = "0.2";
version = "0.3";
src = fetchFromGitLab {
owner = "xuhdev";
repo = "dired-icon";
rev = "68b7b7cf593e4e511eb78cdf83fefdb77ba4ebde";
sha256 = "0a7j40rw5wpxlw822ishgbcx7lk1pr4v6qqg4b5y1v5xvwaj7ciy";
rev = "7fc95de6d7722b304124a890e4fb577e16897b1f";
sha256 = "079vcbdgn4fgbi1kkcf3na3cwmkm41mx43f4gkbzk8hv4vzgr4kb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na";
name = "dired-icon";
};
packageRequires = [ cl-lib ];
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/dired-icon";
license = lib.licenses.free;
@ -6265,12 +6307,12 @@
docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
melpaBuild {
pname = "docker";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
rev = "1ee7b78d22807326bb30e45137bc36cb2ccef93f";
sha256 = "03cbcmyqyrsafml9x497h8c4pw5rj5g02rr97ch87nbkzrih1kal";
rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c";
sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@ -6776,12 +6818,12 @@
easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-kill-extras";
version = "0.9.4";
version = "0.9.4.1";
src = fetchFromGitHub {
owner = "knu";
repo = "easy-kill-extras.el";
rev = "242844bc95b9015396405d84c4335338037968c3";
sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0";
rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd";
sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras";
@ -6860,12 +6902,12 @@
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
melpaBuild {
pname = "ebib";
version = "2.7.2";
version = "2.8.1";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
rev = "212b6a594d13ffcc5683f9bcfd274682abff2b05";
sha256 = "1d19qw9980iq4idmcdr8ri42pdmyig6c1nwpxijqvdnd0zxfbnph";
rev = "219665ba1c9aad885cee6e9914448139be7f7299";
sha256 = "0s9hyyhjzf7ldr67znhmhl5k1q6qacnlnqw20cdc0iihidj2fg2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@ -7194,12 +7236,12 @@
ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
melpaBuild {
pname = "ein";
version = "0.10.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e";
sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m";
rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449";
sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@ -7467,12 +7509,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
rev = "0fd363d09150ad101edafca667dac82ffaec5adf";
sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0";
rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@ -7488,12 +7530,12 @@
elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
melpaBuild {
pname = "elfeed-web";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
rev = "0fd363d09150ad101edafca667dac82ffaec5adf";
sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0";
rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@ -7572,12 +7614,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
version = "0.19.6";
version = "0.19.9";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16";
sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b";
rev = "a842d54348846746ef249a87ac7961a9a787947f";
sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@ -7698,12 +7740,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
melpaBuild {
pname = "elpy";
version = "1.12.0";
version = "1.13.0";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
rev = "c9487a14e9cb21b531660de7e648086e270ab08f";
sha256 = "1x4asq5zqv8wbp034gzcrza9y2nbbwx1nrwi4jnwak0x0yn3c2dj";
rev = "5c900ff6b5524e216247f52ed4085734d815dacb";
sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
@ -9418,12 +9460,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-nerd-commenter";
version = "2.3";
version = "2.3.1";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-nerd-commenter";
rev = "981c80bb53384f93987d03c1b307767f2a68791a";
sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
rev = "54c618aada776bfda0742819ff9e91845a91e095";
sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@ -9859,12 +9901,12 @@
eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eyebrowse";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "eyebrowse";
rev = "eb7dac9dba845cd73b57b9046761804969adec11";
sha256 = "0ynd4mq2vckyczfblw3r92lcbn4518jh3mzv5r11drlra9sdjnl8";
rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc";
sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@ -10132,12 +10174,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
version = "5.2.4";
version = "5.2.5";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
rev = "b69411d15902d9d1cbb0184885f726270de0b98c";
sha256 = "1jlggfk9qx6gi8ifzvjn9hpbqgs8dc7hmss8aflnzf3gn4202svp";
rev = "2b7e35e5121beba73309acd8e9586987e8e2b8a6";
sha256 = "0wm2ddv1198wmgppigk68n3g6qcfcj446xcpf2fy7s29ck71scm1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@ -10790,12 +10832,12 @@
flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-rebar3";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "joedevivo";
repo = "flycheck-rebar3";
rev = "534df87b0c2197fa15057f1e1a19763411c59220";
sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3";
rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6";
sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3";
@ -11690,22 +11732,30 @@
license = lib.licenses.free;
};
}) {};
fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
melpaBuild {
pname = "fsharp-mode";
version = "1.8.1";
version = "1.9.3";
src = fetchFromGitHub {
owner = "rneatherway";
repo = "emacs-fsharp-mode-bin";
rev = "51bad86059528f1ce87ef12e1657531aa11a386d";
sha256 = "00api7q86mrfv8z2g7skh34mhlkxwymf4gfpxa6zcvirhlpglyxr";
rev = "d5b9fde6dec186972f6ea457582504ca813b8778";
sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
name = "fsharp-mode";
};
packageRequires = [ company company-quickhelp dash popup pos-tip s ];
packageRequires = [
company
company-quickhelp
dash
flycheck
popup
pos-tip
s
];
meta = {
homepage = "https://melpa.org/#/fsharp-mode";
license = lib.licenses.free;
@ -13056,12 +13106,12 @@
godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "godoctor";
version = "0.0.5";
version = "0.0.7";
src = fetchFromGitHub {
owner = "microamp";
repo = "godoctor.el";
rev = "de7f838af320c87f10cba17619492e072000c47e";
sha256 = "1f9xfpyza23763pamknnpcvcxm7dcwk8dpj5a1mm7brg764yis2z";
rev = "3482c9b119aeb3d81c1a07876bde5cdafe933ede";
sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
@ -13245,12 +13295,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
version = "0.10.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
rev = "bb498f73762deb009468da8c3bd93b7c6002a63e";
sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg";
rev = "1a7df5e3b156e6f9a3da8402147b0bb32dc3a185";
sha256 = "0f14z2yzf76shkwjwfypbdgdrll6mn4m9fm7r15bwrdzm5f72d9k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@ -16568,6 +16618,27 @@
license = lib.licenses.free;
};
}) {};
import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "import-js";
version = "0.1.0";
src = fetchFromGitHub {
owner = "galooshi";
repo = "emacs-import-js";
rev = "5726c33b8d8c43974d4b367348962025c6df56b9";
sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js";
sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha";
name = "import-js";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/import-js";
license = lib.licenses.free;
};
}) {};
import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
melpaBuild {
pname = "import-popwin";
@ -16885,12 +16956,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
version = "0.1.18";
version = "0.1.19";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
rev = "5378bb637c76c48eca64ccda0c855f7557aecb60";
sha256 = "1vgmbs790l8z90bk8sib3xvli06p1nkrjnnvlnhsjzkkpxynf2nf";
rev = "fe0b045aadef5590eb33e03c1512430e5d52d639";
sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@ -17492,12 +17563,12 @@
js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
melpaBuild {
pname = "js2-refactor";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
rev = "ac3da94a33b714d44d4f0adc670a829fdc522e34";
sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
rev = "bd73f03fc5f0d1ca1dce29e28bb43f78af483a38";
sha256 = "1q2c61bhbr6b4a1wgqsbwxywymsxy7h3wc9fkcy3ryip3xd88b7b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@ -19540,27 +19611,6 @@
license = lib.licenses.free;
};
}) {};
marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }:
melpaBuild {
pname = "marmalade";
version = "0.0.4";
src = fetchFromGitHub {
owner = "nex3";
repo = "marmalade";
rev = "01d6ddf5f0e822d6df393aa4546b069b2d6545d7";
sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82a61911de111f6ef3a99fef0a0f93ab549ab261/recipes/marmalade";
sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
name = "marmalade";
};
packageRequires = [ furl ];
meta = {
homepage = "https://melpa.org/#/marmalade";
license = lib.licenses.free;
};
}) {};
marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "marshal";
@ -23364,12 +23414,12 @@
pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "pandoc-mode";
version = "2.19";
version = "2.20";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "pandoc-mode";
rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2";
sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0";
rev = "f0fd4fe8b6cd368cab077177c3eb8be092856b49";
sha256 = "069crk0xdm061m4jipkgwh1n4845cpa9j7dvg8ngqzrd4j2f243x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@ -23572,12 +23622,12 @@
parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parsec";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "parsec.el";
rev = "34521c605fe525cc9b8f7b0e4ca991ca1eb25218";
sha256 = "1fylcg7m95naz377ia2g9iyysaj64zd2x0warqdzs8isbpwj3cmc";
rev = "8f0c266d8b9b0ee5fcf9b80c518644b2849ff3b3";
sha256 = "1zwdh3dwqvw9z79mxgf9kf1l2c0pb32sknhrs7ppca613nk9c58j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@ -25982,12 +26032,12 @@
refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "refine";
version = "0.2";
version = "0.3";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refine";
rev = "b59764e181990ddd3ab441cdc290b5fe178860f4";
sha256 = "1x5r6cb430hfbdqq3samlfkaawy49i1gi6mzai2061r780h7w4fx";
rev = "9760e56ab849a4827e6c9425fdef6f5a7784c967";
sha256 = "1b4n0mfplh6vj87p3124c2fw24fj0vm9jvcaxrvccfq3sida4sf3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@ -26882,6 +26932,26 @@
license = lib.licenses.free;
};
}) {};
schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "schrute";
version = "0.2";
src = fetchgit {
url = "https://bitbucket.org/shackra/dwight-k.-schrute";
rev = "99857394886e516d5ebd63fedff200bceaef1d4d";
sha256 = "0z1cnmyn7r0l93ivl5hr4illmrm9wdyza8822l175a62n9pr8hv6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute";
sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy";
name = "schrute";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/schrute";
license = lib.licenses.free;
};
}) {};
scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
melpaBuild {
pname = "scpaste";
@ -28666,27 +28736,6 @@
license = lib.licenses.free;
};
}) {};
stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stekene-theme";
version = "1.0.15";
src = fetchFromGitHub {
owner = "Fanael";
repo = "stekene-theme";
rev = "5a5ed0aed5c6c6c56aa1e59516a40c697b04a673";
sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4be17a072d4e878c510e3ef2c73bad166375195/recipes/stekene-theme";
sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
name = "stekene-theme";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/stekene-theme";
license = lib.licenses.free;
};
}) {};
stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "stgit";
version = "0.17.1";
@ -31148,12 +31197,12 @@
wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wc-mode";
version = "1.0";
version = "1.3";
src = fetchFromGitHub {
owner = "bnbeckwith";
repo = "wc-mode";
rev = "eb0b23e0de8bcf21c61c1edacd9fe89b2e6888d0";
sha256 = "0kzs256ymhdrqzva32j215q9fl66n9571prb7mi6syx1vpk7m3lw";
rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69";
sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode";
@ -31462,12 +31511,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
version = "1.1.15";
version = "1.2.0";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
rev = "1eace34a1f5b780a30797976d0cfec5936048b7b";
sha256 = "0sgisdgid6xw6pggdi42i07wmar8bbxg9wk1b7jvyi7i7q94s843";
rev = "fc7482e4a2063697738a405686ebc62d87697ab8";
sha256 = "1a52pc4iwr2mmby6h16vl436cm0psxnfgd3lhkqbq86sw3p78bx8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@ -31717,8 +31766,8 @@
version = "0.9.1";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
rev = "b9e861ccb52d";
sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2";
rev = "9f38303df3b7";
sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@ -31986,12 +32035,12 @@
x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "x86-lookup";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "skeeto";
repo = "x86-lookup";
rev = "7a2f43908985590ab8b904004cd4c41e341216be";
sha256 = "0fks0bnil7m4m56k267f0awqnyq3vr2ywd81rsmbk1154g3acndc";
rev = "208810ea93214491e6e2329cdbf81de85437939a";
sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup";
@ -32280,12 +32329,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
rev = "dc3e4ca3454e8ffcd9a9eae312dba5b3657f9b11";
sha256 = "16akdsqb74b4lriywidszmyyc8irq5dws8ya3mcja87kvih76148";
rev = "e6b865127783f498b61fa99ad0f5413200ac09d0";
sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@ -32301,12 +32350,12 @@
yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yatemplate";
version = "1.0";
version = "2.0";
src = fetchFromGitHub {
owner = "mineo";
repo = "yatemplate";
rev = "a49a218b6fcfbbf6e51021be78aee6d3b220e3f6";
sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8";
rev = "90c14d2e2b8247eeba464a52560af484f8542558";
sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View file

@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20161024";
version = "20161031";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20161024.tar";
sha256 = "0yph2wiwl426wn1vgbwxgnh8lr6x40swbpzzl87vfzfh5wjx4l1h";
url = "http://orgmode.org/elpa/org-20161031.tar";
sha256 = "1nabn8kj50bxvm3b429j73xipq557kx5j4nr7s5bwxs85i89133q";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20161024";
version = "20161031";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20161024.tar";
sha256 = "1pr4mnf8mrxnlnn61y3w1jkwf1d7wlf9v8j65vvs1c26rbnzms85";
url = "http://orgmode.org/elpa/org-plus-contrib-20161031.tar";
sha256 = "1j0mwqmdyslvdfhd3x9c9li8s41wsaxk81qzfizdwxl9csdf9ki4";
};
packageRequires = [];
meta = {

8
pkgs/applications/editors/idea/default.nix
View file

@ -204,12 +204,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2016.2.4";
version = "2016.2.5";
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "14c1afkmny78vj434y46nja3v9smzcqsfdkhr83bqic1a0h4g84w";
sha256 = "1rncnm5dvhpfb7l5p2k0hs4yqzp8n1c4rvz9vldlf5k7mvwggp7p";
};
wmClass = "jetbrains-rubymine";
};
@ -264,12 +264,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2016.2.1";
version = "2016.2.2";
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "0vgr0ds6z0y8qw2v55nr3pi5zb5x0n6pxm13hcp44iradns5kmbp";
sha256 = "0np0ypqga1xx9zq0qwpxiw9xdkr7k0jcdv1w790aafjar7a5qbyz";
};
wmClass = "jetbrains-phpstorm";
};

19
pkgs/applications/editors/kdevelop5/kdevelop.nix
View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
, qtquickcontrols, qtwebkit
, qtquickcontrols, qtwebkit, qttools
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
, threadweaver, kxmlgui, kwindowsystem
, threadweaver, kxmlgui, kwindowsystem, grantlee
, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info
, libksysguard, llvmPackages
, libksysguard, llvmPackages, makeWrapper
}:
let
pname = "kdevelop";
version = "5.0";
dirVersion = "5.0.0";
version = "5.0.2";
dirVersion = "5.0.2";
in
stdenv.mkDerivation rec {
@ -18,22 +18,25 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";
sha256 = "5e034b8670f4ba13ccb2948c28efa0b54df346e85b648078698cca8974ea811c";
sha256 = "9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666";
};
nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
nativeBuildInputs = [
cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper
];
buildInputs = [
qtquickcontrols qtwebkit
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
threadweaver kxmlgui kwindowsystem plasma-framework krunner
threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
kdevplatform kdevelop-pg-qt shared_mime_info libksysguard
llvmPackages.llvm llvmPackages.clang-unwrapped
];
postInstall = ''
wrapQtProgram "$out/bin/kdevelop"
wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin"
'';
meta = with stdenv.lib; {

6
pkgs/applications/editors/kdevelop5/kdevplatform.nix
View file

@ -6,8 +6,8 @@
let
pname = "kdevplatform";
version = "5.0";
dirVersion = "5.0.0";
version = "5.0.2";
dirVersion = "5.0.2";
in
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz";
sha256 = "4085b355ab8d599d902afbc11027e1aefb22afe30d63ed54ea5fe02f24edfd10";
sha256 = "a7f311198bb72f5fee064d99055e8df39ecf4e9066fe5c0ff901ee8c24d960ec";
};
nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];

6
pkgs/applications/editors/kile/frameworks.nix
View file

@ -24,12 +24,12 @@ let
unwrapped =
kdeDerivation rec {
name = "kile-${version}";
version = "2016-07-25";
version = "2016-10-24";
src = fetchgit {
url = git://anongit.kde.org/kile.git;
rev = "9cad4757df2493a6099b89114340493c6b436d0b";
sha256 = "0kikrkssfd7bj580iwsipirbz2klxvk0f7nfg5y9mkv0pnchx2mj";
rev = "e005e2ac140881aa7610bd363d181cf306f91f80";
sha256 = "1labv8jagsfk0k7nvxh90in9464avzdabgs215y1h658zjh1wpy4";
};

4
pkgs/applications/editors/texstudio/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "texstudio";
version = "2.11.0";
version = "2.11.2";
name = "${pname}-${version}";
altname="Texstudio";
src = fetchurl {
url = "mirror://sourceforge/texstudio/${name}.tar.gz";
sha256 = "170e6d68952251e8c64589b0d147cb7692005e135cc6fc14579c6fd593f54307";
sha256 = "1p6ja5y5902y814f3f5mafh0y8vj682ghrarx1pbm4r5ap8x9z82";
};
buildInputs = [ qt4 qmake4Hook poppler_qt4 zlib pkgconfig ];

12
pkgs/applications/graphics/graphicsmagick/default.nix
View file

@ -26,6 +26,18 @@ stdenv.mkDerivation {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part2.patch";
sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8682.patch";
sha256 = "1wfirw2yi5y72657kvnbgjs0f9b3rs9nvk8gjbwhb9a03z9ws0y5";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8683.patch";
sha256 = "102252zb34nj6alk1nhh1wbn3apd2v9rzk7clmm237332yj72vif";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch";
sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy";
})
];
configureFlags = [

6
pkgs/applications/graphics/imv/default.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "imv-${version}";
version = "2.1.2";
version = "2.1.3";
src = fetchgit {
url = "https://github.com/eXeC64/imv.git";
rev = "3e6402456b00e29f659baf26ced10f3d7205cf63";
sha256 = "0fhc944g7b61jrkd4wn1piq6dkpabsbxpm80pifx9dqmj16sf0pf";
rev = "e59d0e9e120f1dbde9ab068748a190e93978e5b7";
sha256 = "0j48dk1bcbh5541522qkn487637wcx104zckrnxa5g3nirfqa7r7";
};
buildInputs = [ SDL2 SDL2_ttf freeimage fontconfig ];

4
pkgs/applications/misc/blender/default.nix
View file

@ -11,11 +11,11 @@
with lib;
stdenv.mkDerivation rec {
name = "blender-2.78";
name = "blender-2.78a";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "0hfl7q6phydlk8mbkksnqxj004qqad99xkrp5n9wrz9vrcf3x1hp";
sha256 = "1byf1klrvm8fdw2libx7wldz2i6lblp9nih6y58ydh00paqi8jh1";
};
buildInputs =

23
pkgs/applications/misc/exercism/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "exercism-${version}";
version = "2.3.0";
goPackagePath = "github.com/exercism/cli";
src = fetchFromGitHub {
owner = "exercism";
repo = "cli";
rev = "v${version}";
sha256 = "1zhvvmsh5kw739kylk0bqj1wa6vjyahz43dlxdpv42h8gfiiksf5";
};
meta = with stdenv.lib; {
description = "A Go based command line tool for exercism.io";
homepage = http://exercism.io/cli;
license = licenses.mit;
maintainers = [ maintainers.rbasso ];
platforms = platforms.linux;
};
}

4
pkgs/applications/misc/playonlinux/default.nix
View file

@ -7,7 +7,7 @@
, gnupg1compat
, icoutils
, imagemagick
, netcat
, netcat-gnu
, p7zip
, python2Packages
, unzip
@ -34,7 +34,7 @@ let
gnupg1compat
icoutils
imagemagick
netcat
netcat-gnu
p7zip
unzip
wget

11
pkgs/applications/misc/styx/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "styx-${version}";
version = "0.2.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "styx-static";
repo = "styx";
rev = "v${version}";
sha256 = "1bcd0ss628mhchrl85fy6acxcxqvm1d3qywfaxhikahl1r7inpwg";
sha256 = "0wyibdyi4ld0kfhng5ldb2rlgjrci014fahxn7nnchlg7dvcc5ni";
};
server = caddy.bin;
@ -19,13 +19,14 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir $out
install -D -m 777 $sourceRoot/styx.sh $out/bin/styx
install -D -m 777 styx.sh $out/bin/styx
mkdir -p $out/share/styx
cp -r $sourceRoot/sample $out/share/styx
cp -r lib $out/share/styx
cp -r scaffold $out/share/styx
mkdir -p $out/share/doc/styx
asciidoctor $sourceRoot/doc/manual.doc -o $out/share/doc/styx/index.html
asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html
substituteAllInPlace $out/bin/styx
substituteAllInPlace $out/share/doc/styx/index.html

1
pkgs/applications/networking/browsers/qutebrowser/default.nix
View file

@ -72,7 +72,6 @@ in buildPythonApplication rec {
'';
postFixup = ''
wrapPythonPrograms
mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser

4
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "terraform-${version}";
version = "0.7.7";
version = "0.7.8";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/terraform";
@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "hashicorp";
repo = "terraform";
sha256 = "0wza5ladh406lf8hd4fbh4ri82qbcf91lif82357ldy78ghsi5g7";
sha256 = "0b42qji85h49aabzlb21vkcfpykrf8g4k2a51jhz9y28ywpbx5n4";
};
postInstall = ''

6
pkgs/applications/networking/dropbox/default.nix
View file

@ -23,11 +23,11 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
version = "12.4.22";
version = "13.4.21";
sha256 =
{
"x86_64-linux" = "1vmaddk19w9b9lg03v2jr532qpk6miw24rrprx6x6md9ll9asv8y";
"i686-linux" = "1pzxsdsi37fvk0gr69m2sa61q7afy5gcz8p78nsdr4i0gga1gxfr";
"x86_64-linux" = "0ckinjrnnijs2wx80c0bqdlcsw5zhx64rsh3bylcjfbpvyli96q4";
"i686-linux" = "08lhj4hlhvxm4zp9jai01f8cydfgfkl91l4ydd85yccl9ii4flh5";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =

4
pkgs/applications/networking/irc/konversation/1.6.nix
View file

@ -30,13 +30,13 @@
let
unwrapped = let
pname = "konversation";
version = "1.6.1";
version = "1.6.2";
in kdeDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "28346d6629261a5328c43ffa09c12e37743b3ef4f4bc4c411d39bc19f7bf06c6";
sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
};
buildInputs = [

2
pkgs/applications/networking/mailreaders/neomutt/default.nix
View file

@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = http://www.neomutt.org;
license = stdenv.lib.licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ hiberno cstrahan vrthra ];
maintainers = with maintainers; [ cstrahan vrthra ];
};
}

21
pkgs/applications/networking/syncthing/inotify-deps.nix
View file

@ -4,17 +4,8 @@
fetch = {
type = "git";
url = "https://github.com/cenkalti/backoff";
rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6";
sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh";
};
}
{
goPackagePath = "github.com/gobwas/glob";
fetch = {
type = "git";
url = "https://github.com/gobwas/glob";
rev = "ce6abff51712df5da11095fb41dd4b0353559797";
sha256 = "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m";
rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3";
sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc";
};
}
{
@ -22,8 +13,8 @@
fetch = {
type = "git";
url = "https://github.com/syncthing/syncthing";
rev = "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8";
sha256 = "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9";
rev = "7fba8cf759a3b48cfc1507a8c32355865500a571";
sha256 = "1s8l528fqq661ks70cna5cx1bawpv7szcx88z33bs4gkaq2fbws5";
};
}
{
@ -31,8 +22,8 @@
fetch = {
type = "git";
url = "https://github.com/zillode/notify";
rev = "2da5cc9881e8f16bab76b63129c7781898f97d16";
sha256 = "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40";
rev = "df33c1a773b462f936a149c36696c018c047eaa9";
sha256 = "0ncfqnj5kvbyw630xsxqkxy3y6jv5hp89fqi9mzra3lr4zckiv3s";
};
}
]

6
pkgs/applications/networking/syncthing/inotify.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "syncthing-inotify-${version}";
version = "0.8.3";
version = "0.8.4";
goPackagePath = "github.com/syncthing/syncthing-inotify";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "syncthing";
repo = "syncthing-inotify";
rev = "v${version}";
sha256 = "194pbz9zzxaz0vri93czpbsxl85znlba2gy61mjgyr0dm2h4s6yw";
sha256 = "0iix4gd5zh2ydn429jmcf0pr1pxxd1wq1vp5ciq9bavhvnim9clw";
};
goDeps = ./inotify-deps.nix;
@ -25,6 +25,8 @@ buildGoPackage rec {
substitute $src/etc/linux-systemd/user/syncthing-inotify.service \
$bin/etc/systemd/user/syncthing-inotify.service \
--replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
'' + stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify
'';
meta = with stdenv.lib; {

4
pkgs/applications/office/skrooge/2.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "skrooge-${version}";
version = "2.4.0";
version = "2.5.0";
src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
sha256 = "132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe";
sha256 = "03ayrrr7rrj1jl1qh3sgn56hbi44wn4ldgcj08b93mqw7wdvpglp";
};
nativeBuildInputs = [ cmake ecm makeQtWrapper ];

2
pkgs/applications/office/zotero/default.nix
View file

@ -77,6 +77,6 @@ stdenv.mkDerivation {
description = "Collect, organize, cite, and share your research sources";
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ ttuegel ];
broken = true; # probably; see #20049
};
}

25
pkgs/applications/science/logic/coq/8.5.nix
View file

@ -2,11 +2,22 @@
# - The csdp program used for the Micromega tactic is statically referenced.
# However, coq can build without csdp by setting it to null.
# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
# - The patch-level version can be specified through the `pl` argument to
# the derivation; it defaults to the greatest.
{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
{ stdenv, fetchurl, writeText, pkgconfig
, ocaml, findlib, camlp5, ncurses
, lablgtk ? null, csdp ? null
, pl ? "3"
}:
let
version = "8.5pl2";
version = "8.5pl${pl}";
sha256 = {
"1" = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb";
"2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3";
"3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh";
}."${pl}";
coq-version = "8.5";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
@ -24,7 +35,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
sha256 = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3";
inherit sha256;
};
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
@ -34,7 +45,7 @@ stdenv.mkDerivation {
RM=$(type -tp rm)
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
substituteInPlace configure.ml --replace "if arch = \"Darwin\" || arch = \"FreeBSD\" then \"md5" "if arch = \"Darwinx\" then \"md5"
substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"'
${csdpPatch}
'';
@ -57,7 +68,11 @@ stdenv.mkDerivation {
prefixKey = "-prefix ";
buildFlags = "revision coq coqide";
buildFlags = "revision coq coqide bin/votour";
postInstall = ''
cp bin/votour $out/bin/
'';
meta = with stdenv.lib; {
description = "Coq proof assistant";

2
pkgs/applications/version-management/gitlab/Gemfile
View file

@ -103,7 +103,7 @@ gem 'seed-fu', '~> 2.3.5'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
gem 'github-markup', '~> 1.4'
gem 'gitlab-markup', '~> 1.5.0'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~>3.6'

3
pkgs/applications/version-management/gitlab/Gemfile.lock
View file

@ -281,6 +281,7 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
gitlab-markup (1.5.0)
gitlab_git (10.6.6)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
@ -868,8 +869,8 @@ DEPENDENCIES
gemnasium-gitlab-service (~> 0.2)
gemojione (~> 3.0)
github-linguist (~> 4.7.0)
github-markup (~> 1.4)
gitlab-flowdock-git-hook (~> 1.0.1)
github-markup (~> 1.5.0)
gitlab_git (~> 10.6.6)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)

4
pkgs/applications/version-management/gitlab/default.nix
View file

@ -24,7 +24,7 @@ in
stdenv.mkDerivation rec {
name = "gitlab-${version}";
version = "8.12.6";
version = "8.12.8";
buildInputs = [ env ruby bundler tzdata git nodejs procps ];
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
sha256 = "14dbr8a1il75xz83hkdjm3yq49168mkn62l86bi36n5pfw44kcvh";
sha256 = "1l2r3mjyra53wpq724d974zv9ax5hb1qrdsz4071b2p34s70gbl3";
};
patches = [

11
pkgs/applications/version-management/gitlab/gemset.nix
View file

@ -937,6 +937,7 @@
type = "gem";
};
version = "1.4.0";
meta.priority = 10; # lower priority, exectuable conflicts with gitlab-markdown
};
gitlab-flowdock-git-hook = {
dependencies = ["flowdock" "gitlab-grit" "multi_json"];
@ -955,6 +956,14 @@
};
version = "2.8.1";
};
gitlab-markup = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yxwp4q0dwiykxv24x2yhvnn59wmw1jv0vz3d8hjw44nn9jxn25a";
type = "gem";
};
version = "1.5.0";
};
gitlab_git = {
source = {
remotes = ["https://rubygems.org"];
@ -2821,4 +2830,4 @@
};
version = "2.0.0";
};
}
}

3
pkgs/applications/video/mpv/default.nix
View file

@ -31,6 +31,7 @@
, libpngSupport ? true, libpng ? null
, youtubeSupport ? true, youtube-dl ? null
, vaapiSupport ? true, libva ? null
, drmSupport ? true, libdrm ? null
, vapoursynthSupport ? false, vapoursynth ? null
, jackaudioSupport ? false, libjack2 ? null
@ -65,6 +66,7 @@ assert youtubeSupport -> available youtube-dl;
assert vapoursynthSupport -> available vapoursynth;
assert jackaudioSupport -> available libjack2;
assert vaapiSupport -> available libva;
assert drmSupport -> available libdrm;
let
# Purity: Waf is normally downloaded by bootstrap.py, but
@ -133,6 +135,7 @@ in stdenv.mkDerivation rec {
++ optional sdl2Support SDL2
++ optional cacaSupport libcaca
++ optional vaapiSupport libva
++ optional drmSupport libdrm
++ optional vapoursynthSupport vapoursynth
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]

12
pkgs/applications/virtualization/qemu/CVE-2016-9102.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index d938427..7557a7d 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -3261,6 +3261,7 @@
xattr_fidp->fs.xattr.flags = flags;
v9fs_string_init(&xattr_fidp->fs.xattr.name);
v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name);
+ g_free(xattr_fidp->fs.xattr.value);
xattr_fidp->fs.xattr.value = g_malloc0(size);
err = offset;
put_fid(pdu, file_fidp);

71
pkgs/applications/virtualization/qemu/default.nix
View file

@ -47,6 +47,77 @@ stdenv.mkDerivation rec {
patches = [
./no-etc-install.patch
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/net-vmxnet-initialise-local-tx-descriptor-CVE-2016-6836.patch";
sha256 = "1i01vsxsdwrb5r7i9dmrshal4fvpj2j01cmvfkl5wz3ssq5z02wc";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-an-assert-expression-CVE-2016-7157.patch";
sha256 = "1wqf9k79wdr1k25siyhhybz1bpb0iyshv6fvsf55pgk5p0dg1970";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-misuse-of-MPTSAS_CONFIG_PACK-CVE-2016-7157.patch";
sha256 = "0l78fcbq8mywlgax234dh4226kxzbdgmarz1yrssaaiipkzq4xgw";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptsas-use-g_new0-to-allocate-MPTSASRequest-obj-CVE-2016-7423.patch";
sha256 = "14l8w40zjjhpmzz4rkh69h5na8d4did7v99ng7nzrychakd5l29h";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-check-page-count-while-initialising-descriptor-rings-CVE-2016-7155.patch";
sha256 = "1dwkci5mqgx3xz2q69kbcn48l8vwql9g3qaza2jxi402xdgc07zn";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-loop-to-fetch-SG-list-CVE-2016-7156.patch";
sha256 = "1r5xm4m9g39p89smsia4i9jbs32nq9gdkpx6wgd91vmswggcbqsi";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-process-IO-loop-to-ring-size-CVE-2016-7421.patch";
sha256 = "07661d1kd0ddkmzsrjph7jnhz2qbfavkxamnvs3axaqpp52kx6ga";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/usb-xhci-fix-memory-leak-in-usb_xhci_exit-CVE-2016-7466.patch";
sha256 = "0nckwzn9k6369vni12s8hhjn73gbk6ns0mazns0dlgcq546q2fjj";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/virtio-add-check-for-descriptor-s-mapped-address-CVE-2016-7422.patch";
sha256 = "1f1ilpzlxfjqvwmv9h0mzygwl5l8zd690f32vxfv9g6rfbr5h72k";
})
(fetchpatch {
name = "qemu-CVE-2016-8909.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=0c0fc2b5fd534786051889459848764edd798050";
sha256 = "0mavkajxchfacpl4gpg7dhppbnhs1bbqn2rwqwiwkl0m5h19d9fv";
})
(fetchpatch {
name = "qemu-CVE-2016-8910.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=c7c35916692fe010fef25ac338443d3fe40be225";
sha256 = "10qmlggifdmvj5hg3brs712agjq6ppnslm0n5d5jfgjl7599wxml";
})
(fetchpatch {
name = "qemu-CVE-2016-9103.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=eb687602853b4ae656e9236ee4222609f3a6887d";
sha256 = "0j20n4z1wzybx8m7pn1zsxmz4rbl8z14mbalfabcjdgz8sx8g90d";
})
(fetchpatch {
name = "qemu-CVE-2016-9104.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=7e55d65c56a03dcd2c5d7c49d37c5a74b55d4bd6";
sha256 = "1l99sf70098l6v05dq4x7p2glxx1l4nq1l8l3711ykp9vxkp91qs";
})
(fetchpatch {
name = "qemu-CVE-2016-9105.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4c1586787ff43c9acd18a56c12d720e3e6be9f7c";
sha256 = "0b2w5myw2vjqk81wm8dz373xfhfkx3hgy7bxr94l060snxcl7ar4";
})
(fetchpatch {
name = "qemu-CVE-2016-9106.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fdfcc9aeea1492f4b819a24c94dfb678145b1bf9";
sha256 = "0npi3fag52icq7xr799h5zi11xscbakdhqmdab0kyl6q331cc32z";
})
# FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html
# from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06
./CVE-2016-9102.patch
];
hardeningDisable = [ "stackprotector" ];

1
pkgs/applications/window-managers/lemonbar/xft.nix
View file

@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
meta = {
description = "A lightweight xcb based bar with XFT-support";
homepage = https://github.com/krypt-n/bar;
maintainers = [ stdenv.lib.maintainers.hiberno ];
license = "Custom";
platforms = stdenv.lib.platforms.linux;
};

2
pkgs/applications/window-managers/stumpwm/default.nix
View file

@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
description = "A tiling window manager for X11";
homepage = https://github.com/stumpwm/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ hiberno the-kenny ];
maintainers = with maintainers; [ the-kenny ];
platforms = platforms.linux;
};
}

1
pkgs/applications/window-managers/yabar/default.nix
View file

@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A modern and lightweight status bar for X window managers";
homepage = "https://github.com/geommer/yabar";
maintainers = [ maintainers.hiberno ];
license = licenses.mit;
platforms = platforms.linux;
};

12
pkgs/build-support/docker/default.nix
View file

@ -395,10 +395,14 @@ rec {
layer =
if runAsRoot == null
then mkPureLayer { inherit name baseJson contents extraCommands; }
else mkRootLayer { inherit name baseJson fromImage fromImageName
fromImageTag contents runAsRoot diskSize
extraCommands; };
then mkPureLayer {
name = baseName;
inherit baseJson contents extraCommands;
} else mkRootLayer {
name = baseName;
inherit baseJson fromImage fromImageName fromImageTag
contents runAsRoot diskSize extraCommands;
};
result = runCommand "docker-image-${baseName}.tar.gz" {
buildInputs = [ jshon pigz coreutils findutils ];
imageName = name;

2
pkgs/build-support/gcc-cross-wrapper/builder.sh
View file

@ -8,7 +8,7 @@ mkdir $out/nix-support
cflagsCompile="-B$out/bin/"
if test -z "$nativeLibc" -a -n "$libc"; then
cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc/include"
cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc_dev/include"
ldflags="$ldflags -L$libc/lib"
# Get the proper dynamic linker for glibc and uclibc.
dlinker=`eval 'echo $libc/lib/ld*.so.?'`

4
pkgs/build-support/vm/windows/bootstrap.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd
, python, perl, coreutils, dosfstools, gzip, mtools, netcat, openssh, qemu
, python, perl, coreutils, dosfstools, gzip, mtools, netcat-gnu, openssh, qemu
, samba, socat, vde2, cdrkit, pathsFromGraph, gnugrep
}:
@ -10,7 +10,7 @@ with stdenv.lib;
let
controller = import ./controller {
inherit stdenv writeScript vmTools makeInitrd;
inherit samba vde2 openssh socat netcat coreutils gzip gnugrep;
inherit samba vde2 openssh socat netcat-gnu coreutils gzip gnugrep;
};
mkCygwinImage = import ./cygwin-iso {

6
pkgs/build-support/vm/windows/controller/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, writeScript, vmTools, makeInitrd
, samba, vde2, openssh, socat, netcat, coreutils, gnugrep, gzip
, samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip
}:
{ sshKey
@ -79,7 +79,7 @@ let
${coreutils}/bin/chmod 600 /ssh.key
'' + (if installMode then ''
echo -n "Waiting for Windows installation to finish..."
while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do
echo -n .
# Print a dot every 10 seconds only to shorten line length.
${coreutils}/bin/sleep 10
@ -118,7 +118,7 @@ let
${samba}/sbin/smbd -D
echo -n "Waiting for Windows VM to become available..."
while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do
echo -n .
${coreutils}/bin/sleep 1
done

2
pkgs/build-support/vm/windows/default.nix
View file

@ -3,7 +3,7 @@ pkgs:
let
bootstrapper = import ./bootstrap.nix {
inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd;
inherit (pkgs) coreutils dosfstools gzip mtools netcat openssh qemu samba;
inherit (pkgs) coreutils dosfstools gzip mtools netcat-gnu openssh qemu samba;
inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph;
inherit (pkgs) gnugrep;
};

1
pkgs/data/fonts/mononoki/default.nix
View file

@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/madmalik/mononoki;
description = "A font for programming and code review";
license = licenses.ofl;
maintainers = [ maintainers.hiberno ];
platforms = platforms.all;
};
}

11
pkgs/data/misc/hackage/default.nix Normal file
View file

@ -0,0 +1,11 @@
{ fetchFromGitHub }:
# Use builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"
# instead if you want the latest Hackage automatically at the price of frequent re-downloads.
fetchFromGitHub {
owner = "commercialhaskell";
repo = "all-cabal-hashes";
rev = "ee101d34ff8bd59897aa2eb0a124bcd3fb47ceec";
sha256 = "1hky0s2c1rv1srfnhbyi3ny14rnfnnp2j9fsr4ylz76xyxgjf5wm";
}

2
pkgs/desktops/kde-5/plasma/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.2/ -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.3/ -A '*.tar.xz' )

4
pkgs/desktops/kde-5/plasma/ksysguard.nix
View file

@ -1,6 +1,6 @@
{ plasmaPackage, ecm, kdoctools, kconfig
, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
, kiconthemes, libksysguard
, kiconthemes, libksysguard, qtwebkit
}:
plasmaPackage {
@ -8,6 +8,6 @@ plasmaPackage {
nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
kdelibs4support ki18n
kdelibs4support ki18n qtwebkit
];
}

320
pkgs/desktops/kde-5/plasma/srcs.nix
View file

@ -3,323 +3,323 @@
{
bluedevil = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/bluedevil-5.8.2.tar.xz";
sha256 = "1m8bhvh27af8hwqyicsrqbxsfl6mmwlyc9y9cv5fh4rkf0lkcsnd";
name = "bluedevil-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/bluedevil-5.8.3.tar.xz";
sha256 = "1d05bzy1za7s9mlsh1drhlgjbb7z78jayhqml3zym05igs517la6";
name = "bluedevil-5.8.3.tar.xz";
};
};
breeze = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/breeze-5.8.2.tar.xz";
sha256 = "1n87n2vaxgb7wpg5jmb6x6l1z6gwl8jh9kjrgaq0blm1qkhac3k8";
name = "breeze-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/breeze-5.8.3.tar.xz";
sha256 = "0apim1byibkbqkxb1f5ra53wfr4cwmrkdsx4ls7mph4iknr5wdwp";
name = "breeze-5.8.3.tar.xz";
};
};
breeze-grub = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/breeze-grub-5.8.2.tar.xz";
sha256 = "1q4i87xvxajz67lkdf9k9z6vy6l0wlirz31n043fyy32gw0mrmf1";
name = "breeze-grub-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/breeze-grub-5.8.3.tar.xz";
sha256 = "01yyhwccxrkmxi95rsg9645fd0i2ca97j425q0pxci9fg93bwl8k";
name = "breeze-grub-5.8.3.tar.xz";
};
};
breeze-gtk = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/breeze-gtk-5.8.2.tar.xz";
sha256 = "1vdn7nh1vn8cjxd6cvaj12imd523g7qjc7rlhih6q76ly6h9hv7k";
name = "breeze-gtk-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/breeze-gtk-5.8.3.tar.xz";
sha256 = "1wm8v4fav9crk3wn3azsylymvcg67cgncv4zx1fy8rmblikp080g";
name = "breeze-gtk-5.8.3.tar.xz";
};
};
breeze-plymouth = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/breeze-plymouth-5.8.2.tar.xz";
sha256 = "1dkp0h3idzpfbvwrmjzn5sbq0077ndr36qh087yyhdjwj1mlk98r";
name = "breeze-plymouth-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/breeze-plymouth-5.8.3.tar.xz";
sha256 = "0gdl603kjxfrvcardinfq710j5gzzc6ky8ypzmr7myk5kl4i9gf3";
name = "breeze-plymouth-5.8.3.tar.xz";
};
};
discover = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/discover-5.8.2.tar.xz";
sha256 = "00zmdr6di37rcqncss4z51557a8zzli7n01imjjv8h784vkn0p04";
name = "discover-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/discover-5.8.3.tar.xz";
sha256 = "18fqr15jw3hfbpq6ma3md89lqzmlilfbic6zd0pm9mvpmwawbjxh";
name = "discover-5.8.3.tar.xz";
};
};
kactivitymanagerd = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kactivitymanagerd-5.8.2.tar.xz";
sha256 = "1dgdxpdxkdz0l498sadgfbp21by8d73r11ibb6mvxwmrba6q4lsc";
name = "kactivitymanagerd-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kactivitymanagerd-5.8.3.tar.xz";
sha256 = "18nkg64i7znyk29km8clcmpg5wrd60a0nbgdb6n0cnjjyra2ljfj";
name = "kactivitymanagerd-5.8.3.tar.xz";
};
};
kde-cli-tools = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kde-cli-tools-5.8.2.tar.xz";
sha256 = "1gwp6hkpfaijxxc1v4km6kcwrzvwagkn5dgl181xghra26ar0bca";
name = "kde-cli-tools-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kde-cli-tools-5.8.3.tar.xz";
sha256 = "02sa4l6mx6bfys44wcaf9mpfk3vrw65zzd1jx466xy0dda43kw9b";
name = "kde-cli-tools-5.8.3.tar.xz";
};
};
kdecoration = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kdecoration-5.8.2.tar.xz";
sha256 = "0wbi6z3k9s18fi1vc7larnhwcdzrxrc13plpcnl365la8zrnp766";
name = "kdecoration-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kdecoration-5.8.3.tar.xz";
sha256 = "0d7q16ms3vrsrwc7fql3ly7hmbyx0v35llj9z8h1k642j3ci8jca";
name = "kdecoration-5.8.3.tar.xz";
};
};
kde-gtk-config = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kde-gtk-config-5.8.2.tar.xz";
sha256 = "16kn6wy71x1zjpfppiwpmj6skw97ni5pyg2b2af733spfbkx0ca7";
name = "kde-gtk-config-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kde-gtk-config-5.8.3.tar.xz";
sha256 = "0y3xykz8db3y92mnhbwld2wcsh4sqxacnmx899ig5xy08chqym3d";
name = "kde-gtk-config-5.8.3.tar.xz";
};
};
kdeplasma-addons = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kdeplasma-addons-5.8.2.tar.xz";
sha256 = "18d9a2iwvr4klgm10yvsjjhszkc6zk26kmsay4c2q4pqbsvq7nqq";
name = "kdeplasma-addons-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kdeplasma-addons-5.8.3.tar.xz";
sha256 = "1ssk70rvfzi3a9mx514qsh5hld2v12kz3m4n7vpl9sq1fc5hq8k3";
name = "kdeplasma-addons-5.8.3.tar.xz";
};
};
kgamma5 = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kgamma5-5.8.2.tar.xz";
sha256 = "0l73w2arpvv7x4yawp044j781pwmwpijr23mwhfcmnw7bmc7g5vn";
name = "kgamma5-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kgamma5-5.8.3.tar.xz";
sha256 = "038i3dm6lxvlb5s6faxr5h6cw6xhymq71fnbphhbcbc1v08sa065";
name = "kgamma5-5.8.3.tar.xz";
};
};
khotkeys = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/khotkeys-5.8.2.tar.xz";
sha256 = "17cmlny98ip0ckdafhlqm97p0rkrr9w2d18xf0hdxcypj13q4ba5";
name = "khotkeys-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/khotkeys-5.8.3.tar.xz";
sha256 = "0lqwsdbr38qhz79sgdg3m3wx70f6ys4bv8mhnczfs06mchzm6zy9";
name = "khotkeys-5.8.3.tar.xz";
};
};
kinfocenter = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kinfocenter-5.8.2.tar.xz";
sha256 = "1j1l3fczw7sy43dff0mcwpvyvfz4r7ja7zg7x8vq5v2hi3c3f865";
name = "kinfocenter-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kinfocenter-5.8.3.tar.xz";
sha256 = "1hs9yg15rhhm2lra472wq9f1ca7aj6wsd6drb538mdma53mz21pv";
name = "kinfocenter-5.8.3.tar.xz";
};
};
kmenuedit = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kmenuedit-5.8.2.tar.xz";
sha256 = "0r214s2pqm925l1mpzj4cwk73xvsf00wbm4g495dc63kwxpamx21";
name = "kmenuedit-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kmenuedit-5.8.3.tar.xz";
sha256 = "06zji52iw8d18nda87xh54d7q94aqddrfgp3i9lsir50bgabqnc7";
name = "kmenuedit-5.8.3.tar.xz";
};
};
kscreen = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kscreen-5.8.2.tar.xz";
sha256 = "03i2zwpalq4d1y38bkwacvkqfanzdsdpafpqw17qjcan3jgxkkwr";
name = "kscreen-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kscreen-5.8.3.tar.xz";
sha256 = "07mldxxxna1y8ngam8l2h3bs1plvfgqhzj95ryprsfypls7pj1ny";
name = "kscreen-5.8.3.tar.xz";
};
};
kscreenlocker = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kscreenlocker-5.8.2.tar.xz";
sha256 = "0may2h54yamzzd3jfv50skcxsws2liw36vb4smvyv9j8nvqvwyp1";
name = "kscreenlocker-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kscreenlocker-5.8.3.tar.xz";
sha256 = "039i01c48g3grfm6vn5zmgaazlv4lln8w3rx8d107rlfqslfq4gv";
name = "kscreenlocker-5.8.3.tar.xz";
};
};
ksshaskpass = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/ksshaskpass-5.8.2.tar.xz";
sha256 = "1wk8jrwlr7lndsbhngkffvpjrqwi88x19vrxivb18gcr28m6403s";
name = "ksshaskpass-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/ksshaskpass-5.8.3.tar.xz";
sha256 = "0kvfnzbq6y9vs1a9yn3hf0cxbwdfs0mw440gsgjgbpmamnv4xpkj";
name = "ksshaskpass-5.8.3.tar.xz";
};
};
ksysguard = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/ksysguard-5.8.2.tar.xz";
sha256 = "1myg260bn7bjv18wadwzfwns9jc63r5plk3psdf6w727hcmizvnn";
name = "ksysguard-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/ksysguard-5.8.3.tar.xz";
sha256 = "0a1mfm0gfsi1b79c7m62rk8pp6fsbvrqhv5b07rasapn53zwr6zd";
name = "ksysguard-5.8.3.tar.xz";
};
};
kwallet-pam = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kwallet-pam-5.8.2.tar.xz";
sha256 = "1iw8cyr44kwjfqhf1ybnjy0pjv4yk87w3vir8j91an4mxhdcc2sb";
name = "kwallet-pam-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kwallet-pam-5.8.3.tar.xz";
sha256 = "1lbmzi0pimp2pw4g0dmrw0vpb2mmm64akzjzv0l72i6f4sylsqpd";
name = "kwallet-pam-5.8.3.tar.xz";
};
};
kwayland-integration = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kwayland-integration-5.8.2.tar.xz";
sha256 = "12zmf11117y5zp307ymfy5gsjpcf97sqw1n3nzk55p9kzlfln1pa";
name = "kwayland-integration-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kwayland-integration-5.8.3.tar.xz";
sha256 = "1w717601ivpnfvjprlyh0qvcj61m8nh9qpsqmhsy7993jvm8wal4";
name = "kwayland-integration-5.8.3.tar.xz";
};
};
kwin = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kwin-5.8.2.tar.xz";
sha256 = "04c9bvbd487pgf4l7a7vxaydjr9hwdjg149mzcxzm5y1nx7ll08y";
name = "kwin-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kwin-5.8.3.tar.xz";
sha256 = "0a3z17f1ma6yspbs4wyj1cp17hglf4xj1pmwya6nbf08d6gbxq1w";
name = "kwin-5.8.3.tar.xz";
};
};
kwrited = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/kwrited-5.8.2.tar.xz";
sha256 = "1659783rca0hcisrhxz1bnimn0q17825sbs6zlwxlwsh2qq8fq23";
name = "kwrited-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/kwrited-5.8.3.tar.xz";
sha256 = "0s2fsxyw6x664pirbvkd5zf0zazhx9yxzv2xk8d8cb8gfbj32cc9";
name = "kwrited-5.8.3.tar.xz";
};
};
libkscreen = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/libkscreen-5.8.2.tar.xz";
sha256 = "0p2nhgvr3cxq0js6zkcnhglwqffnrnws8vdi7lyl069y9r8lvp7c";
name = "libkscreen-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/libkscreen-5.8.3.tar.xz";
sha256 = "09jakk3yrnp0vf2dihalm08lndcvp18c6c4qjr1bg65cjij9fvx7";
name = "libkscreen-5.8.3.tar.xz";
};
};
libksysguard = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/libksysguard-5.8.2.tar.xz";
sha256 = "158n30wbpsgbw3axhhsc58hnwhwdd02j3zc9hhcybmnbkfl5c96l";
name = "libksysguard-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/libksysguard-5.8.3.tar.xz";
sha256 = "11601hlrm6lm0vrw2icx2778g6yzd9fsgpa8s8rdwr0qw9i0wacy";
name = "libksysguard-5.8.3.tar.xz";
};
};
milou = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/milou-5.8.2.tar.xz";
sha256 = "0ikba2xk2d4v66rhdln97d89avrkbhpjh1zir5ds3s103yyrj4q9";
name = "milou-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/milou-5.8.3.tar.xz";
sha256 = "03vr8ndr14ak111gq0hwlq4b5g1hwhbh3vk5b3xrk13bhxg6nfsl";
name = "milou-5.8.3.tar.xz";
};
};
oxygen = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/oxygen-5.8.2.tar.xz";
sha256 = "1n0gfgn7m0953dd69nvl0ikp97zmcn3hjm01s43nxjma3gp8pqar";
name = "oxygen-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/oxygen-5.8.3.tar.xz";
sha256 = "0ircd8v5khgmpigazxy7pykiqk8maah28ypsh3z66aim0ni4h3jg";
name = "oxygen-5.8.3.tar.xz";
};
};
plasma-desktop = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/plasma-desktop-5.8.2.tar.xz";
sha256 = "0023wb3fnk0cap7v2zwig6h3vqvykrwwq9vyl0xbsj5vzx3f8yqj";
name = "plasma-desktop-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/plasma-desktop-5.8.3.tar.xz";
sha256 = "0pkjkhwqgin203dkl5clnvc9l9jnk7dqaxh7h7rbc8d5bfjiwzg7";
name = "plasma-desktop-5.8.3.tar.xz";
};
};
plasma-integration = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/plasma-integration-5.8.2.tar.xz";
sha256 = "1z7pd5j7llac1iv4w4q4r9wysqi4shc65fcg6bh637gxqjgyq4rf";
name = "plasma-integration-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/plasma-integration-5.8.3.tar.xz";
sha256 = "196gxymfbrdjravgqk2ia2fpanim4l08a0vh5r13ppm7q7vzwz23";
name = "plasma-integration-5.8.3.tar.xz";
};
};
plasma-nm = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/plasma-nm-5.8.2.tar.xz";
sha256 = "035nhs8z977gp3d041ywnam1y4vk7458mx81f2qrx2bv8g6znq22";
name = "plasma-nm-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/plasma-nm-5.8.3.tar.xz";
sha256 = "1rsj0gl9plza7ykkp161ipvxlax67vdvns0fnq34sk9hg7s5ckb7";
name = "plasma-nm-5.8.3.tar.xz";
};
};
plasma-pa = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/plasma-pa-5.8.2.tar.xz";
sha256 = "1j55q4brjh77i1imr7pb9gp9a8vaynnr2ljdsm4jqsijwcjj1yhi";
name = "plasma-pa-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/plasma-pa-5.8.3.tar.xz";
sha256 = "1l3xdcrkvjpmmbzvyhqrs6y8xhkz5k1xkxlm3d3bx4x0mn24qmq4";
name = "plasma-pa-5.8.3.tar.xz";
};
};
plasma-sdk = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/plasma-sdk-5.8.2.tar.xz";
sha256 = "0h6393qxwms0xdq69nyzs18kbyl6amzff26l20fqpp49xrqpq95y";
name = "plasma-sdk-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/plasma-sdk-5.8.3.tar.xz";
sha256 = "1jgv6yf7m9x2869cprbg2r9ka56ypmprvvznagb4zrjnjfdnqrm7";
name = "plasma-sdk-5.8.3.tar.xz";
};
};
plasma-tests = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/plasma-tests-5.8.2.tar.xz";
sha256 = "0ls8mxabvw39xb8nrl89n1jn0bkgykzx7hcv45q17aw5jm8s0wy5";
name = "plasma-tests-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/plasma-tests-5.8.3.tar.xz";
sha256 = "1aidrc3wi3z7lap5m193xqcahl0p2pdg9hddygzq6dr46r1ipbi4";
name = "plasma-tests-5.8.3.tar.xz";
};
};
plasma-workspace = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-5.8.2.tar.xz";
sha256 = "1dxvxz9qvkg1h79j997qgs573l730w1g0n1dy78n344bnvn8zx44";
name = "plasma-workspace-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-5.8.3.tar.xz";
sha256 = "16h5flf346lwrdl35clkq0qv3i0fa4clxyyn3dvpsp9mvxdlabwb";
name = "plasma-workspace-5.8.3.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-wallpapers-5.8.2.tar.xz";
sha256 = "0wkkpl1n6ggicgj6lszmb661wrmddhq9wx3djr3hyvvi5r586rxi";
name = "plasma-workspace-wallpapers-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-wallpapers-5.8.3.tar.xz";
sha256 = "0dy3w60d4wbm571kbv6qshmrqf6r30j53hz92kkyiwgqja18ysg2";
name = "plasma-workspace-wallpapers-5.8.3.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.8.2";
version = "1-5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/polkit-kde-agent-1-5.8.2.tar.xz";
sha256 = "1ipli3xq4dc8lnyamqfzsjcfh3808gbw3qaaqksng2ki0i84aw8f";
name = "polkit-kde-agent-1-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/polkit-kde-agent-1-5.8.3.tar.xz";
sha256 = "04llryjkjzkzccfjwdhwcbkvp8wfgjfw4yabbq4kl1i2girimw0z";
name = "polkit-kde-agent-1-5.8.3.tar.xz";
};
};
powerdevil = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/powerdevil-5.8.2.tar.xz";
sha256 = "0bjk08f3bliy4cz3pcs77qhsc3l82fqk3q0djiwgmsr77ksabj7x";
name = "powerdevil-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/powerdevil-5.8.3.tar.xz";
sha256 = "1im9sxzb4c3cplplzizfxdlyg1knm94y2hj9ssllxfggy5d38ps1";
name = "powerdevil-5.8.3.tar.xz";
};
};
sddm-kcm = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/sddm-kcm-5.8.2.tar.xz";
sha256 = "1n3r2hjwrsxiwzzgkpf4xgp2645kzzdl49i91qcsqznhiqp7kjx3";
name = "sddm-kcm-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/sddm-kcm-5.8.3.tar.xz";
sha256 = "1cs29rb259zz06qwfhnjxzy2xzzqvfwpphz4whbyl5kn07bzah8d";
name = "sddm-kcm-5.8.3.tar.xz";
};
};
systemsettings = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/systemsettings-5.8.2.tar.xz";
sha256 = "157knafprh4b689jjr8w4bqrh9kp92ggvf40s4ny8cfyjr2bzcvi";
name = "systemsettings-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/systemsettings-5.8.3.tar.xz";
sha256 = "0shac5659h928p2kq053kllw66j3sw6a06kczgck5lq28kxwh3mm";
name = "systemsettings-5.8.3.tar.xz";
};
};
user-manager = {
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.2/user-manager-5.8.2.tar.xz";
sha256 = "1344qvzrlswc69wvnaqic300wxra6ix6w6iczj29sprxsa5ycf91";
name = "user-manager-5.8.2.tar.xz";
url = "${mirror}/stable/plasma/5.8.3/user-manager-5.8.3.tar.xz";
sha256 = "0kh9knr2rfrhakzdyf94cap19v21ciglammdp4svyql7drwfvq8v";
name = "user-manager-5.8.3.tar.xz";
};
};
}

6
pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui,
libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat
libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat-gnu
}:
stdenv.mkDerivation rec {
@ -26,14 +26,14 @@ stdenv.mkDerivation rec {
libnotify
lm_sensors
hddtemp
netcat
netcat-gnu
];
enableParallelBuilding = true;
configureFlags = [
"--with-pathhddtemp=${hddtemp}/bin/hddtemp"
"--with-pathnetcat=${netcat}/bin/netcat"
"--with-pathnetcat=${netcat-gnu}/bin/netcat"
];
meta = {

1
pkgs/development/compilers/compcert/default.nix
View file

@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configurePhase = ''
substituteInPlace ./configure --replace pl2 pl3
substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
./configure -prefix $out -toolprefix ${tools}/bin/ '' +
(if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");

6
pkgs/development/compilers/cudatoolkit/default.nix
View file

@ -116,5 +116,11 @@ in {
sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88";
};
cudatoolkit8 = common {
version = "8.0.44";
url = https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run;
sha256 = "1w5xmjf40kkis42dqs8dva4xjq7wr5y6vi1m0xlhs6i6cyw4mp34";
};
}

178
pkgs/development/compilers/ghcjs/head.nix Normal file
View file

@ -0,0 +1,178 @@
{ mkDerivation
, test-framework
, test-framework-hunit
, test-framework-quickcheck2
, data-default
, ghc-paths
, haskell-src-exts
, haskell-src-meta
, optparse-applicative
, system-fileio
, system-filepath
, text-binary
, unordered-containers
, cabal-install
, wl-pprint-text
, base16-bytestring
, executable-path
, transformers-compat
, haddock-api
, regex-posix
, callPackage
, bootPkgs, gmp
, jailbreak-cabal
, runCommand
, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
, time
, zlib, aeson, attoparsec, bzlib, hashable
, lens
, parallel, safe, shelly, split, stringsearch, syb
, tar, terminfo
, vector, yaml, fetchgit, fetchFromGitHub, Cabal
, alex, happy, git, gnumake, autoconf, patch
, automake, libtool
, cryptohash
, haddock, hspec, xhtml, primitive, cacert, pkgs
, coreutils
, libiconv
, ghcjsBootSrc ? fetchgit {
url = git://github.com/ghcjs/ghcjs-boot.git;
rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8";
sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq";
fetchSubmodules = true;
}
, ghcjsBoot ? import ./ghcjs-boot.nix {
inherit runCommand;
src = ghcjsBootSrc;
}
, shims ? import ./head_shims.nix { inherit fetchFromGitHub; }
}:
let
inherit (bootPkgs) ghc;
version = "0.2.020161101";
in mkDerivation (rec {
pname = "ghcjs";
inherit version;
src = fetchFromGitHub {
owner = "ghcjs";
repo = "ghcjs";
rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4";
sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6";
};
isLibrary = true;
isExecutable = true;
jailbreak = true;
doHaddock = false;
doCheck = false;
buildDepends = [
filepath HTTP mtl network random stm time zlib aeson attoparsec
bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
lens optparse-applicative parallel safe shelly split
stringsearch syb system-fileio system-filepath tar terminfo text-binary
unordered-containers vector wl-pprint-text yaml
alex happy git gnumake autoconf automake libtool patch gmp
base16-bytestring cryptohash executable-path haddock-api
transformers-compat QuickCheck haddock hspec xhtml
regex-posix libiconv
];
buildTools = [ nodejs git ];
testDepends = [
HUnit test-framework test-framework-hunit
];
patches = [ ./ghcjs.patch ];
postPatch = ''
substituteInPlace Setup.hs \
--replace "/usr/bin/env" "${coreutils}/bin/env"
substituteInPlace src/Compiler/Info.hs \
--replace "@PREFIX@" "$out" \
--replace "@VERSION@" "${version}"
substituteInPlace src-bin/Boot.hs \
--replace "@PREFIX@" "$out" \
--replace "@CC@" "${stdenv.cc}/bin/cc"
'';
preBuild = ''
export HOME="$TMP"
local topDir=$out/lib/ghcjs-${version}
mkdir -p $topDir
cp -r ${ghcjsBoot} $topDir/ghcjs-boot
chmod -R u+w $topDir/ghcjs-boot
cp -r ${shims} $topDir/shims
chmod -R u+w $topDir/shims
# Make the patches be relative their corresponding package's directory.
# See: https://github.com/ghcjs/ghcjs-boot/pull/12
for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
echo "fixing patch: $patch"
sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
done
'';
# We build with --quick so we can build stage 2 packages separately.
# This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
# Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
postInstall = ''
PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
--dev \
--quick \
--with-cabal ${cabal-install}/bin/cabal \
--with-gmp-includes ${gmp.dev}/include \
--with-gmp-libraries ${gmp.out}/lib
'';
passthru = let
ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
generated = ./node-packages-generated.nix;
self = ghcjsNodePkgs;
};
in {
inherit bootPkgs;
isCross = true;
isGhcjs = true;
inherit nodejs ghcjsBoot;
inherit (ghcjsNodePkgs) "socket.io";
# This is the list of the Stage 1 packages that are built into a booted ghcjs installation
# It can be generated with the command:
# nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'"
stage1Packages = [
"array"
"base"
"binary"
"rts"
"bytestring"
"containers"
"deepseq"
"directory"
"filepath"
"ghc-prim"
"ghcjs-prim"
"integer-gmp"
"old-locale"
"pretty"
"primitive"
"process"
"template-haskell"
"time"
"transformers"
"unix"
];
mkStage2 = import ./stage2.nix {
inherit ghcjsBoot;
};
};
homepage = "https://github.com/ghcjs/ghcjs";
description = "A Haskell to JavaScript compiler that uses the GHC API";
license = stdenv.lib.licenses.bsd3;
platforms = ghc.meta.platforms;
maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
})

7
pkgs/development/compilers/ghcjs/head_shims.nix Normal file
View file

@ -0,0 +1,7 @@
{ fetchFromGitHub }:
fetchFromGitHub {
owner = "ghcjs";
repo = "shims";
rev = "1f555d3ca072c61862cc35f92f5ac05f3b938a37";
sha256 = "1pciyrlrp5i9s4s8ai4dvhihcahazva6fg0graxxxkjdvnl789ws";
}

2
pkgs/development/compilers/scala/default.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
sha256 = "148wmk7gjiyfms9lrwgiky7vw78pwnvpnx71rg4l30zd6jfiknp9";
sha256 = "085k7zl9v3vxaqwq0r0yyj53cb6syvq2safn4fgz3w00ks2fyxw2";
};
propagatedBuildInputs = [ jre ] ;

6
pkgs/development/compilers/solc/default.nix
View file

@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, boost, cmake, jsoncpp }:
stdenv.mkDerivation rec {
version = "0.4.2";
version = "0.4.4";
name = "solc-${version}";
src = fetchFromGitHub {
owner = "ethereum";
repo = "solidity";
rev = "v${version}";
sha256 = "1d5x3psz8a9z9jnm30aspfvrpd9kblr14cn5vyl21p27x2vdlzr4";
sha256 = "150prr7m0jnx3vhq0wy3avzsijxd3pn7c8jxdvf6jkcc408dgn6z";
};
patchPhase = ''
echo >commit_hash.txt af6afb0415761b53721f89c7f65064807f41cbd3
echo >commit_hash.txt 4633f3def897db0f91237f98cf46e5d84fb05e61
'';
buildInputs = [ boost cmake jsoncpp ];

35
pkgs/development/coq-modules/fiat/HEAD.nix Normal file
View file

@ -0,0 +1,35 @@
{stdenv, fetchgit, coq, python27}:
stdenv.mkDerivation rec {
name = "coq-fiat-${coq.coq-version}-${version}";
version = "20161024";
src = fetchgit {
url = "https://github.com/mit-plv/fiat.git";
rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
};
buildInputs = [ coq.ocaml coq.camlp5 python27 ];
propagatedBuildInputs = [ coq ];
doCheck = false;
enableParallelBuilding = false;
buildPhase = "make -j$NIX_BUILD_CORES";
installPhase = ''
COQLIB=$out/lib/coq/${coq.coq-version}/
mkdir -p $COQLIB/user-contrib/Fiat
cp -pR src/* $COQLIB/user-contrib/Fiat
'';
meta = with stdenv.lib; {
homepage = http://plv.csail.mit.edu/fiat/;
description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications";
maintainers = with maintainers; [ jwiegley ];
platforms = coq.meta.platforms;
};
}

42
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -43,7 +43,7 @@ self: super: {
src = pkgs.fetchFromGitHub {
owner = "joeyh";
repo = "git-annex";
sha256 = "1nd1q5c4jr9s6xczyv464zq4y10rk8c1av22nfb28abrskxagcjc";
sha256 = "1np1v2x5n9dl39cbwlqbjap1j5120q4n8p18cm1884vdxidbkc01";
rev = drv.version;
};
})).overrideScope (self: super: {
@ -142,13 +142,13 @@ self: super: {
HDBC-odbc = dontHaddock super.HDBC-odbc;
hoodle-core = dontHaddock super.hoodle-core;
hsc3-db = dontHaddock super.hsc3-db;
hspec-discover = dontHaddock super.hspec-discover;
http-client-conduit = dontHaddock super.http-client-conduit;
http-client-multipart = dontHaddock super.http-client-multipart;
markdown-unlit = dontHaddock super.markdown-unlit;
network-conduit = dontHaddock super.network-conduit;
shakespeare-js = dontHaddock super.shakespeare-js;
shakespeare-text = dontHaddock super.shakespeare-text;
swagger = dontHaddock super.swagger; # http://hydra.cryp.to/build/2035868/nixlog/1/raw
wai-test = dontHaddock super.wai-test;
zlib-conduit = dontHaddock super.zlib-conduit;
@ -298,7 +298,6 @@ self: super: {
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql
hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw
mongoDB = dontCheck super.mongoDB;
network-transport-tcp = dontCheck super.network-transport-tcp;
@ -801,7 +800,7 @@ self: super: {
ln -s $lispdir $out/share/emacs/site-lisp
'';
})).override {
haskell-src-exts = self.haskell-src-exts_1_18_2;
haskell-src-exts = self.haskell-src-exts_1_19_0;
};
# # Make elisp files available at a location where people expect it.
@ -983,6 +982,9 @@ self: super: {
criterion = super.criterion.override { inherit (super) optparse-applicative; };
});
# The latest Hoogle needs versions not yet in LTS Haskell 7.x.
hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
# Test suite fails a QuickCheck property.
optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;
@ -1015,15 +1017,26 @@ self: super: {
doCheck = false;
});
# http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version
# is hard because of transitive dependencies, so we just disable tests.
http-api-data_0_3_2 = dontCheck super.http-api-data_0_3_2;
# Fix build for latest versions of servant and servant-client.
servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: {
http-api-data = self.http-api-data_0_3_2;
});
servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: {
http-api-data = self.http-api-data_0_3_2;
servant-server = self.servant-server_0_9_1_1;
servant = self.servant_0_9_1_1;
});
# https://github.com/pontarius/pontarius-xmpp/issues/105
pontarius-xmpp = dontCheck super.pontarius-xmpp;
# https://github.com/fpco/store/issues/77
store = dontCheck super.store;
store_0_3 = super.store_0_3.overrideScope (self: super: {
store-core = self.store-core_0_3;
});
store_0_3 = super.store_0_3.overrideScope (self: super: { store-core = self.store-core_0_3; });
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = doJailbreak super.applicative-quoters;
@ -1041,4 +1054,17 @@ self: super: {
http-conduit = self.http-conduit_2_2_3;
});
# https://hydra.nixos.org/build/42769611/nixlog/1/raw
# note: the library is unmaintained, no upstream issue
dataenc = doJailbreak super.dataenc;
libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
# https://github.com/ocharles/libsystemd-journal/pull/17
jailbreak = true;
librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
});
# horribly outdated (X11 interface changed a lot)
sindre = markBroken super.sindre;
}

3
pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
View file

@ -60,4 +60,7 @@ self: super: {
sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
});
# https://github.com/christian-marie/xxhash/issues/3
xxhash = doJailbreak super.xxhash;
}

170
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

@ -32,7 +32,7 @@ core-packages:
- xhtml-3000.2.1
default-package-overrides:
# LTS Haskell 7.5
# LTS Haskell 7.7
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@ -146,7 +146,7 @@ default-package-overrides:
- array-memoize ==0.6.0
- arrow-list ==0.7
- ascii-progress ==0.3.3.0
- asciidiagram ==1.3.1.2
- asciidiagram ==1.3.2
- asn1-encoding ==0.9.4
- asn1-parse ==0.9.4
- asn1-types ==0.3.2
@ -264,7 +264,7 @@ default-package-overrides:
- cabal-src ==0.3.0.2
- cache ==0.1.0.0
- cacophony ==0.8.0
- cairo ==0.13.3.0
- cairo ==0.13.3.1
- call-stack ==0.1.0
- camfort ==0.900
- carray ==0.1.6.5
@ -284,9 +284,9 @@ default-package-overrides:
- ChannelT ==0.0.0.2
- charset ==0.3.7.1
- charsetdetect-ae ==1.1.0.1
- Chart ==1.8
- Chart-cairo ==1.8
- Chart-diagrams ==1.8
- Chart ==1.8.1
- Chart-cairo ==1.8.1
- Chart-diagrams ==1.8.1
- ChasingBottoms ==1.3.1.2
- cheapskate ==0.1.0.5
- cheapskate-highlight ==0.1.0.0
@ -421,7 +421,7 @@ default-package-overrides:
- dbus ==0.10.12
- debian-build ==0.10.1.0
- Decimal ==0.4.2
- declarative ==0.2.2
- declarative ==0.2.3
- deepseq-generics ==0.2.0.0
- dejafu ==0.4.0.0
- dependent-map ==0.2.3.0
@ -631,7 +631,7 @@ default-package-overrides:
- gi-pango ==1.0.3
- gi-soup ==2.4.3
- gi-webkit ==3.0.3
- gio ==0.13.3.0
- gio ==0.13.3.1
- gipeda ==0.3.2.2
- giphy-api ==0.4.0.0
- git-fmt ==0.4.1.0
@ -645,7 +645,7 @@ default-package-overrides:
- gl ==0.7.8.1
- glabrous ==0.1.2.0
- GLFW-b ==1.4.8.1
- glib ==0.13.4.0
- glib ==0.13.4.1
- Glob ==0.7.12
- gloss ==1.10.2.3
- gloss-rendering ==1.10.3.3
@ -762,10 +762,10 @@ default-package-overrides:
- grouped-list ==0.2.1.2
- groupoids ==4.0
- groups ==0.4.0.0
- gtk ==0.14.5
- gtk ==0.14.6
- gtk2hs-buildtools ==0.13.2.1
- gtk3 ==0.14.5
- gtksourceview3 ==0.13.3.0
- gtk3 ==0.14.6
- gtksourceview3 ==0.13.3.1
- H ==0.9.0.1
- hackage-db ==1.22
- hackage-mirror ==0.1.1.1
@ -811,7 +811,7 @@ default-package-overrides:
- haskoin-core ==0.4.0
- hasql ==0.19.15.2
- hastache ==0.6.1
- hasty-hamiltonian ==1.1.3
- hasty-hamiltonian ==1.1.4
- HaTeX ==3.17.0.2
- hatex-guide ==1.3.1.5
- hbayes ==0.5.2
@ -846,9 +846,9 @@ default-package-overrides:
- hjsmin ==0.2.0.2
- hjsonpointer ==1.0.0.2
- hjsonschema ==1.1.0.1
- hledger ==0.27.1
- hledger-interest ==1.4.4
- hledger-lib ==0.27.1
- hledger ==1.0.1
- hledger-interest ==1.5
- hledger-lib ==1.0.1
- hlibgit2 ==0.18.0.15
- hlibsass ==0.1.5.0
- hlint ==1.9.35
@ -862,7 +862,6 @@ default-package-overrides:
- hocilib ==0.1.0
- holy-project ==0.2.0.1
- homplexity ==0.4.3.3
- hoogle ==5.0.1
- hOpenPGP ==2.5.5
- hopenpgp-tools ==0.19.4
- hopenssl ==1.7
@ -876,7 +875,7 @@ default-package-overrides:
- hPDB ==1.2.0.9
- hPDB-examples ==1.2.0.7
- HPDF ==1.4.10
- hpio ==0.8.0.3
- hpio ==0.8.0.4
- hprotoc ==2.4.0
- hquantlib ==0.0.3.2
- hreader ==1.0.2
@ -901,11 +900,11 @@ default-package-overrides:
- HsOpenSSL ==0.11.3.2
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- hspec ==2.2.3
- hspec ==2.2.4
- hspec-attoparsec ==0.1.0.2
- hspec-contrib ==0.3.0
- hspec-core ==2.2.3
- hspec-discover ==2.2.3
- hspec-core ==2.2.4
- hspec-discover ==2.2.4
- hspec-expectations ==0.7.2
- hspec-expectations-pretty-diff ==0.7.2.4
- hspec-golden-aeson ==0.2.0.3
@ -938,7 +937,7 @@ default-package-overrides:
- http-date ==0.0.6.1
- http-link-header ==1.0.2
- http-media ==0.6.4
- http-reverse-proxy ==0.4.3.1
- http-reverse-proxy ==0.4.3.2
- http-streams ==0.8.4.0
- http-types ==0.9.1
- http2 ==1.6.2
@ -950,7 +949,7 @@ default-package-overrides:
- hvect ==0.3.1.0
- hw-bits ==0.1.0.1
- hw-conduit ==0.0.0.11
- hw-diagnostics ==0.0.0.4
- hw-diagnostics ==0.0.0.5
- hw-parser ==0.0.0.1
- hw-prim ==0.1.0.3
- hw-rankselect ==0.3.0.0
@ -990,7 +989,7 @@ default-package-overrides:
- inline-r ==0.9.0.0
- insert-ordered-containers ==0.1.0.1
- integration ==0.2.1
- intero ==0.1.18
- intero ==0.1.19
- interpolate ==0.1.0
- interpolatedstring-perl6 ==1.0.0
- IntervalMap ==0.5.1.1
@ -1008,8 +1007,8 @@ default-package-overrides:
- iproute ==1.7.1
- IPv6Addr ==0.6.1.0
- irc ==0.6.1.0
- irc-client ==0.4.4.0
- irc-conduit ==0.2.1.0
- irc-client ==0.4.4.1
- irc-conduit ==0.2.1.1
- irc-ctcp ==0.1.3.0
- irc-dcc ==2.0.0
- islink ==0.1.0.0
@ -1050,7 +1049,7 @@ default-package-overrides:
- lackey ==0.4.1
- language-c ==0.5.0
- language-c-quote ==0.11.7
- language-dockerfile ==0.3.4.0
- language-dockerfile ==0.3.5.0
- language-ecmascript ==0.17.1.0
- language-fortran ==0.5.1
- language-glsl ==0.2.0
@ -1121,7 +1120,7 @@ default-package-overrides:
- matrix ==0.3.5.0
- maximal-cliques ==0.1.1
- mbox ==0.3.3
- mcmc-types ==1.0.1
- mcmc-types ==1.0.2
- megaparsec ==5.0.1
- memory ==0.13
- MemoTrie ==0.6.4
@ -1139,7 +1138,7 @@ default-package-overrides:
- microlens-mtl ==0.1.10.0
- microlens-platform ==0.3.7.0
- microlens-th ==0.4.1.0
- mighty-metropolis ==1.0.2
- mighty-metropolis ==1.0.3
- mime-mail ==0.4.11
- mime-mail-ses ==0.3.2.3
- mime-types ==0.1.0.7
@ -1148,7 +1147,7 @@ default-package-overrides:
- MissingH ==1.4.0.1
- mmap ==0.5.9
- mmorph ==1.0.6
- mockery ==0.3.3
- mockery ==0.3.4
- modify-fasta ==0.8.2.1
- moesocks ==1.0.0.41
- monad-control ==1.0.1.0
@ -1200,7 +1199,7 @@ default-package-overrides:
- MusicBrainz ==0.2.4
- mustache ==2.1
- mutable-containers ==0.3.3
- mwc-probability ==1.2.1
- mwc-probability ==1.2.2
- mwc-random ==0.13.4.0
- mwc-random-monad ==0.7.3.1
- nagios-check ==0.3.2
@ -1280,15 +1279,15 @@ default-package-overrides:
- pagination ==0.1.1
- palette ==0.1.0.4
- pandoc ==1.17.1
- pandoc-citeproc ==0.10.1.2
- pandoc-citeproc ==0.10.2.2
- pandoc-types ==1.16.1.1
- pango ==0.13.3.0
- pango ==0.13.3.1
- parallel ==3.2.1.0
- parallel-io ==0.3.3
- parseargs ==0.2.0.7
- parsec ==3.1.11
- parsers ==0.12.4
- partial-handler ==1.0.1
- partial-handler ==1.0.2
- path ==0.5.9
- path-extra ==0.0.3
- path-io ==1.2.0
@ -1307,7 +1306,7 @@ default-package-overrides:
- pdfinfo ==1.5.4
- pem ==0.2.2
- permutation ==0.5.0.5
- persistable-record ==0.4.0.3
- persistable-record ==0.4.1.0
- persistable-types-HDBC-pg ==0.0.1.4
- persistent ==2.6
- persistent-postgresql ==2.6
@ -1378,7 +1377,7 @@ default-package-overrides:
- primitive ==0.6.1.0
- process-extras ==0.4.1.4
- product-profunctors ==0.7.1.0
- profiteur ==0.3.0.2
- profiteur ==0.3.0.3
- profunctor-extras ==4.0
- profunctors ==5.2
- project-template ==0.2.0
@ -1390,7 +1389,7 @@ default-package-overrides:
- protobuf-simple ==0.1.0.2
- protocol-buffers ==2.4.0
- protocol-buffers-descriptor ==2.4.0
- protolude ==0.1.8
- protolude ==0.1.10
- proxied ==0.2
- psql-helpers ==0.1.0.0
- PSQueue ==1.1
@ -1406,6 +1405,7 @@ default-package-overrides:
- quantum-random ==0.6.3
- QuasiText ==0.1.2.6
- questioner ==0.1.1.0
- quickbench ==1.0
- QuickCheck ==2.8.2
- quickcheck-arbitrary-adt ==0.2.0.0
- quickcheck-assertions ==0.2.0
@ -1470,7 +1470,7 @@ default-package-overrides:
- repa-io ==3.4.1.1
- RepLib ==0.5.4
- reroute ==0.4.0.1
- resolve-trivial-conflicts ==0.3.2.2
- resolve-trivial-conflicts ==0.3.2.3
- resource-pool ==0.2.3.2
- resourcet ==1.1.8
- rest-client ==0.5.1.1
@ -1554,7 +1554,6 @@ default-package-overrides:
- shake-language-c ==0.10.0
- shakespeare ==2.0.11.1
- shell-conduit ==4.5.2
- ShellCheck ==0.4.4
- shelly ==1.6.8.1
- shortcut-links ==0.4.2.0
- should-not-typecheck ==2.1.0
@ -1596,8 +1595,8 @@ default-package-overrides:
- sourcemap ==0.1.6
- spdx ==0.2.1.0
- speculation ==1.5.0.3
- speedy-slice ==0.1.3
- sphinx ==0.6.0.1
- speedy-slice ==0.1.4
- sphinx ==0.6.0.2
- Spintax ==0.1.0.1
- splice ==0.6.1.1
- split ==0.2.3.1
@ -1713,7 +1712,7 @@ default-package-overrides:
- test-framework-th ==0.2.4
- test-simple ==0.1.8
- testing-feat ==0.4.0.3
- texmath ==0.8.6.6
- texmath ==0.8.6.7
- text ==1.2.2.1
- text-all ==0.3.0.2
- text-binary ==0.2.1.1
@ -1859,7 +1858,7 @@ default-package-overrides:
- vinyl ==0.5.2
- vinyl-utils ==0.3.0.0
- void ==0.7.1
- vty ==5.11.1
- vty ==5.11.3
- wai ==3.2.1.1
- wai-app-static ==3.1.6.1
- wai-conduit ==3.0.0.3
@ -1896,8 +1895,8 @@ default-package-overrides:
- web-routes-wai ==0.24.3
- webdriver ==0.8.4
- webdriver-angular ==0.1.11
- webkitgtk3 ==0.14.2.0
- webkitgtk3-javascriptcore ==0.14.2.0
- webkitgtk3 ==0.14.2.1
- webkitgtk3-javascriptcore ==0.14.2.1
- webpage ==0.0.4
- webrtc-vad ==0.1.0.3
- websockets ==0.9.7.0
@ -1909,7 +1908,7 @@ default-package-overrides:
- Win32-extras ==0.2.0.1
- Win32-notify ==0.3.0.1
- with-location ==0.1.0
- withdependencies ==0.2.3
- withdependencies ==0.2.4
- witherable ==0.1.3.3
- wizards ==1.0.2
- wl-pprint ==1.2
@ -1968,7 +1967,7 @@ default-package-overrides:
- yesod-eventsource ==1.4.0.1
- yesod-fay ==0.8.0
- yesod-fb ==0.3.4
- yesod-form ==1.4.7.1
- yesod-form ==1.4.8
- yesod-form-richtext ==0.1.0.0
- yesod-gitrepo ==0.2.1.0
- yesod-gitrev ==0.1.0.0
@ -1991,7 +1990,7 @@ default-package-overrides:
- zip ==0.1.3
- zip-archive ==0.3.0.5
- zippers ==0.2.2
- zlib ==0.6.1.1
- zlib ==0.6.1.2
- zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1
- zoom-refs ==0.0.0.1
@ -2012,7 +2011,7 @@ extra-packages:
- haddock-api == 2.15.* # required on GHC 7.8.x
- haddock-api == 2.16.* # required on GHC 7.10.x
- haddock-library == 1.2.* # required for haddock-api-2.16.x
- hoogle < 5 # required by current implementation of ghcWithHoogle
- haskell-src-exts == 1.18.* # required by hoogle-5.0.4
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
- parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3
@ -2218,6 +2217,7 @@ dont-distribute-packages:
al: [ i686-linux, x86_64-linux, x86_64-darwin ]
AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ]
alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ]
alfred: [ i686-linux, x86_64-linux, x86_64-darwin ]
algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ]
algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ]
algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2241,7 +2241,11 @@ dont-distribute-packages:
amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-servicecatalog: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-snowball: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ]
AMI: [ i686-linux, x86_64-linux, x86_64-darwin ]
ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2360,8 +2364,10 @@ dont-distribute-packages:
authenticate-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ]
authoring: [ i686-linux, x86_64-linux, x86_64-darwin ]
AutoForms: [ i686-linux, x86_64-linux, x86_64-darwin ]
autom: [ i686-linux, x86_64-linux, x86_64-darwin ]
avahi: [ i686-linux, x86_64-linux, x86_64-darwin ]
avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ]
avers-api-docs: [ i686-linux, x86_64-linux, x86_64-darwin ]
avers-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
avers-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
avers: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2724,6 +2730,7 @@ dont-distribute-packages:
chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ]
charade: [ i686-linux, x86_64-linux, x86_64-darwin ]
charsetdetect: [ i686-linux, x86_64-linux, x86_64-darwin ]
Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ]
chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ]
Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
chatter: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2736,6 +2743,7 @@ dont-distribute-packages:
checked: [ i686-linux, x86_64-linux, x86_64-darwin ]
chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ]
chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
chitauri: [ i686-linux, x86_64-linux, x86_64-darwin ]
Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ]
chorale-geo: [ i686-linux, x86_64-linux, x86_64-darwin ]
chorale: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2844,6 +2852,7 @@ dont-distribute-packages:
collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ]
collections: [ i686-linux, x86_64-linux, x86_64-darwin ]
colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ]
color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ]
colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ]
coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3027,6 +3036,7 @@ dont-distribute-packages:
curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ]
CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
curryrs: [ i686-linux, x86_64-linux, x86_64-darwin ]
curve25519: [ i686-linux, x86_64-linux, x86_64-darwin ]
curves: [ i686-linux, x86_64-linux, x86_64-darwin ]
custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3109,6 +3119,8 @@ dont-distribute-packages:
dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ]
dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ]
DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ]
dbmigrations-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ]
dbmigrations-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
dbmigrations: [ i686-linux, x86_64-linux, x86_64-darwin ]
dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3177,6 +3189,7 @@ dont-distribute-packages:
dgs: [ i686-linux, x86_64-linux, x86_64-darwin ]
dia-functions: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3410,6 +3423,7 @@ dont-distribute-packages:
error-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ]
ert: [ i686-linux, x86_64-linux, x86_64-darwin ]
escape-artist: [ i686-linux, x86_64-linux, x86_64-darwin ]
esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ]
EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ]
esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3483,6 +3497,7 @@ dont-distribute-packages:
fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ]
fay-simplejson: [ i686-linux, x86_64-linux, x86_64-darwin ]
fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ]
fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
fca: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3518,6 +3533,7 @@ dont-distribute-packages:
FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ]
FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ]
filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ]
Files: [ i686-linux, x86_64-linux, x86_64-darwin ]
filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3796,6 +3812,7 @@ dont-distribute-packages:
glirc: [ i686-linux, x86_64-linux, x86_64-darwin ]
gll: [ i686-linux, x86_64-linux, x86_64-darwin ]
GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ]
glob-posix: [ i686-linux, x86_64-linux, x86_64-darwin ]
global-config: [ i686-linux, x86_64-linux, x86_64-darwin ]
global-variables: [ i686-linux, x86_64-linux, x86_64-darwin ]
global: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4120,6 +4137,8 @@ dont-distribute-packages:
haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4300,6 +4319,9 @@ dont-distribute-packages:
hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexpat-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexpat-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ]
hF2: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4397,10 +4419,6 @@ dont-distribute-packages:
HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ]
HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ]
HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-web: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4469,6 +4487,8 @@ dont-distribute-packages:
hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ]
hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ]
hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ]
hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ]
hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ]
hopfli: [ i686-linux, x86_64-linux, x86_64-darwin ]
hops: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4642,6 +4662,7 @@ dont-distribute-packages:
hstest: [ i686-linux, x86_64-linux, x86_64-darwin ]
hstidy: [ i686-linux, x86_64-linux, x86_64-darwin ]
hstorchat: [ i686-linux, x86_64-linux, x86_64-darwin ]
hstox: [ i686-linux, x86_64-linux, x86_64-darwin ]
hstradeking: [ i686-linux, x86_64-linux, x86_64-darwin ]
HStringTemplateHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ]
hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4681,6 +4702,7 @@ dont-distribute-packages:
httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ]
htune: [ i686-linux, x86_64-linux, x86_64-darwin ]
htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ]
hub: [ i686-linux, x86_64-linux, x86_64-darwin ]
hubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ]
hubris: [ i686-linux, x86_64-linux, x86_64-darwin ]
HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4702,11 +4724,18 @@ dont-distribute-packages:
huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ]
huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ]
hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-balancedparens: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-bits: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-eliasfano: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-rankselect-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ]
hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ]
hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ]
hworker: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4719,6 +4748,7 @@ dont-distribute-packages:
hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ]
HXQ: [ i686-linux, x86_64-linux, x86_64-darwin ]
hxt-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
hxt-expat: [ i686-linux, x86_64-linux, x86_64-darwin ]
hxt-filter: [ i686-linux, x86_64-linux, x86_64-darwin ]
hxthelper: [ i686-linux, x86_64-linux, x86_64-darwin ]
hxweb: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4737,6 +4767,7 @@ dont-distribute-packages:
hydrogen-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ]
hyena: [ i686-linux, x86_64-linux, x86_64-darwin ]
hylolib: [ i686-linux, x86_64-linux, x86_64-darwin ]
hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ]
hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ]
hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4848,6 +4879,7 @@ dont-distribute-packages:
IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ]
iothread: [ i686-linux, x86_64-linux, x86_64-darwin ]
iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ]
ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ]
ip: [ i686-linux, x86_64-linux, x86_64-darwin ]
ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ]
ipc: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4913,6 +4945,7 @@ dont-distribute-packages:
jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ]
jdi: [ i686-linux, x86_64-linux, x86_64-darwin ]
jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ]
jni: [ i686-linux, x86_64-linux, x86_64-darwin ]
jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ]
join: [ i686-linux, x86_64-linux, x86_64-darwin ]
joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4954,6 +4987,7 @@ dont-distribute-packages:
jspath: [ i686-linux, x86_64-linux, x86_64-darwin ]
juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ]
judy: [ i686-linux, x86_64-linux, x86_64-darwin ]
juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ]
JuicyPixels-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ]
JuicyPixels-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
JuicyPixels-repa: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4961,6 +4995,7 @@ dont-distribute-packages:
JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ]
JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ]
jvm: [ i686-linux, x86_64-linux, x86_64-darwin ]
JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5108,6 +5143,7 @@ dont-distribute-packages:
learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ]
leetify: [ i686-linux, x86_64-linux, x86_64-darwin ]
legion-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ]
legion-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
legion: [ i686-linux, x86_64-linux, x86_64-darwin ]
leksah: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5212,6 +5248,7 @@ dont-distribute-packages:
list-tries: [ i686-linux, x86_64-linux, x86_64-darwin ]
list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ]
listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ]
ListTree: [ i686-linux, x86_64-linux, x86_64-darwin ]
lit: [ i686-linux, x86_64-linux, x86_64-darwin ]
literals: [ i686-linux, x86_64-linux, x86_64-darwin ]
live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5346,6 +5383,7 @@ dont-distribute-packages:
marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ]
marquise: [ i686-linux, x86_64-linux, x86_64-darwin ]
mars: [ i686-linux, x86_64-linux, x86_64-darwin ]
marvin: [ i686-linux, x86_64-linux, x86_64-darwin ]
marxup: [ i686-linux, x86_64-linux, x86_64-darwin ]
masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ]
MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5549,6 +5587,7 @@ dont-distribute-packages:
mulang: [ i686-linux, x86_64-linux, x86_64-darwin ]
multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ]
multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
multifile: [ i686-linux, x86_64-linux, x86_64-darwin ]
multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ]
multihash: [ i686-linux, x86_64-linux, x86_64-darwin ]
multipass: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5594,6 +5633,7 @@ dont-distribute-packages:
n-m: [ i686-linux, x86_64-linux, x86_64-darwin ]
nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ]
named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ]
NameGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
namelist: [ i686-linux, x86_64-linux, x86_64-darwin ]
nano-cryptr: [ i686-linux, x86_64-linux, x86_64-darwin ]
nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5634,8 +5674,10 @@ dont-distribute-packages:
nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ]
nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ]
nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
nettle: [ i686-linux, x86_64-linux, x86_64-darwin ]
netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ]
netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ]
netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
netwire: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-address: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5707,6 +5749,7 @@ dont-distribute-packages:
notzero: [ i686-linux, x86_64-linux, x86_64-darwin ]
np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ]
nptools: [ i686-linux, x86_64-linux, x86_64-darwin ]
ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ]
null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ]
nullary: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5724,6 +5767,7 @@ dont-distribute-packages:
nylas: [ i686-linux, x86_64-linux, x86_64-darwin ]
nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ]
oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ]
obd: [ i686-linux, x86_64-linux, x86_64-darwin ]
oberon0: [ i686-linux, x86_64-linux, x86_64-darwin ]
obj: [ i686-linux, x86_64-linux, x86_64-darwin ]
Object: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5945,6 +5989,7 @@ dont-distribute-packages:
pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-network-tls: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6114,6 +6159,7 @@ dont-distribute-packages:
puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ]
pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ]
pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ]
purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ]
push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ]
push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6204,6 +6250,7 @@ dont-distribute-packages:
Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ]
rascal: [ i686-linux, x86_64-linux, x86_64-darwin ]
Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ]
rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ]
raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ]
raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ]
rawr: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6223,6 +6270,8 @@ dont-distribute-packages:
reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ]
reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ]
reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ]
reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ]
reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ]
reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ]
reactive: [ i686-linux, x86_64-linux, x86_64-darwin ]
reactor: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6485,6 +6534,7 @@ dont-distribute-packages:
Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ]
scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ]
sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ]
sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ]
sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ]
sdr: [ i686-linux, x86_64-linux, x86_64-darwin ]
seacat: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6504,6 +6554,7 @@ dont-distribute-packages:
selenium: [ i686-linux, x86_64-linux, x86_64-darwin ]
selinux: [ i686-linux, x86_64-linux, x86_64-darwin ]
Semantique: [ i686-linux, x86_64-linux, x86_64-darwin ]
semdoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ]
semigroupoids-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ]
semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6523,10 +6574,15 @@ dont-distribute-packages:
serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ]
serv: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-aeson-specs: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-docs: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-elm: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6596,6 +6652,7 @@ dont-distribute-packages:
showdown: [ i686-linux, x86_64-linux, x86_64-darwin ]
shpider: [ i686-linux, x86_64-linux, x86_64-darwin ]
Shu-thing: [ i686-linux, x86_64-linux, x86_64-darwin ]
sibe: [ i686-linux, x86_64-linux, x86_64-darwin ]
sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ]
signals: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6634,6 +6691,7 @@ dont-distribute-packages:
simseq: [ i686-linux, x86_64-linux, x86_64-darwin ]
sindre: [ i686-linux, x86_64-linux, x86_64-darwin ]
sink: [ i686-linux, x86_64-linux, x86_64-darwin ]
siphon: [ i686-linux, x86_64-linux, x86_64-darwin ]
sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ]
sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ]
sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6987,6 +7045,7 @@ dont-distribute-packages:
teams: [ i686-linux, x86_64-linux, x86_64-darwin ]
teeth: [ i686-linux, x86_64-linux, x86_64-darwin ]
telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ]
telegram: [ i686-linux, x86_64-linux, x86_64-darwin ]
tellbot: [ i686-linux, x86_64-linux, x86_64-darwin ]
template-default: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7224,6 +7283,7 @@ dont-distribute-packages:
type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ]
typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ]
typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ]
typed-wire-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7318,6 +7378,7 @@ dont-distribute-packages:
var: [ i686-linux, x86_64-linux, x86_64-darwin ]
variable-precision: [ i686-linux, x86_64-linux, x86_64-darwin ]
variables: [ i686-linux, x86_64-linux, x86_64-darwin ]
vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ]
Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7341,6 +7402,7 @@ dont-distribute-packages:
verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
verdict: [ i686-linux, x86_64-linux, x86_64-darwin ]
verilog: [ i686-linux, x86_64-linux, x86_64-darwin ]
vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ]
views: [ i686-linux, x86_64-linux, x86_64-darwin ]
vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ]
vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7536,6 +7598,7 @@ dont-distribute-packages:
xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml-query-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml-to-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ]
XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7598,6 +7661,7 @@ dont-distribute-packages:
yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-zendesk: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ]

15
pkgs/development/haskell-modules/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, stdenv, ghc
{ pkgs, stdenv, ghc, all-cabal-hashes
, compilerConfig ? (self: super: {})
, packageSetConfig ? (self: super: {})
, overrides ? (self: super: {})
@ -6,14 +6,6 @@
let
allCabalFiles = stdenv.mkDerivation {
name = "all-cabal-hashes-0";
buildCommand = ''
mkdir -p $out
tar -C $out --strip-components=1 -x -f ${builtins.fetchurl "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"}
'';
};
inherit (stdenv.lib) fix' extends;
haskellPackages = self:
@ -69,8 +61,8 @@ let
installPhase = ''
export HOME="$TMP"
mkdir $out
hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${allCabalFiles}/${name}/${version}/${name}.json)
cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${allCabalFiles}/${name}/${version}/${name}.cabal >$out/default.nix
hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${all-cabal-hashes}/${name}/${version}/${name}.json)
cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${all-cabal-hashes}/${name}/${version}/${name}.cabal >$out/default.nix
'';
};
@ -88,7 +80,6 @@ let
packages = selectFrom self;
hoogle = callPackage ./hoogle.nix {
inherit packages;
hoogle = self.hoogle_5_0_4;
};
in withPackages (packages ++ [ hoogle ]);

3470
pkgs/development/haskell-modules/hackage-packages.nix
View file

File diff suppressed because it is too large Load diff

6
pkgs/development/interpreters/groovy/default.nix
View file

@ -15,8 +15,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out
mkdir -p $out/share/doc/groovy
rm bin/*.bat
mv * $out
mv {bin,conf,embeddable,grooid,indy,lib} $out
mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy
sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy
@ -27,8 +29,6 @@ stdenv.mkDerivation rec {
done
'';
phases = "unpackPhase installPhase";
meta = with stdenv.lib; {
description = "An agile dynamic language for the Java Platform";
homepage = http://groovy-lang.org/;

4
pkgs/development/interpreters/racket/default.nix
View file

@ -32,11 +32,11 @@ in
stdenv.mkDerivation rec {
name = "racket-${version}";
version = "6.6";
version = "6.7";
src = fetchurl {
url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
sha256 = "1kzdi1n6h6hmz8zd9k8r5a5yp2ryi4w3c2fjm1k6cqicn18cwaxz";
sha256 = "0v1nz07vzz0c7rwyz15kbagpl4l42n871vbwij4wrbk2lx22ksgy";
};
FONTCONFIG_FILE = fontsConf;

3
pkgs/development/interpreters/ruby/default.nix
View file

@ -129,6 +129,9 @@ let
$out/bin/ruby setup.rb
popd
# Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
# Bundler tries to create this directory
mkdir -pv $out/${passthru.gemPath}
mkdir -p $out/nix-support

4
pkgs/development/libraries/audio/zita-resampler/default.nix
View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "zita-resampler-${version}";
version = "1.3.0";
version = "1.6.0";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
sha256 = "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq";
sha256 = "1w48lp99jn4wh687cvbnbnjgaraqzkb4bgir16cp504x55v8v20h";
};
makeFlags = [

13
pkgs/development/libraries/cairo/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, libiconv, libintlOrEmpty
, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv
, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
, gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12
, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency
@ -26,6 +26,15 @@ stdenv.mkDerivation rec {
sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7";
};
patches = [
# from https://bugs.freedesktop.org/show_bug.cgi?id=98165
(fetchpatch {
name = "cairo-CVE-2016-9082.patch";
url = "https://bugs.freedesktop.org/attachment.cgi?id=127421";
sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri";
})
];
prePatch = ''
patches="$patches $(echo $infinality/*_cairo-iu/*.patch)"
'';

9
pkgs/development/libraries/db/db-4.4.nix
View file

@ -1,9 +0,0 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4.20";
extraPatches = [ ./cygwin-4.4.patch ];
sha256 = "0y9vsq8dkarx1mhhip1vaciz6imbbyv37c1dm8b20l7p064bg2i9";
branch = "4.4";
drvArgs = { hardeningDisable = [ "format" ]; };
})

9
pkgs/development/libraries/db/db-4.5.nix
View file

@ -1,9 +0,0 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "4.5.20";
extraPatches = [ ./cygwin-4.5.patch ./register-race-fix.patch ];
sha256 = "0bd81k0qv5i8w5gbddrvld45xi9k1gvmcrfm0393v0lrm37dab7m";
branch = "4.5";
drvArgs = { hardeningDisable = [ "format" ]; };
})

Some files were not shown because too many files have changed in this diff Show more