Merge remote-tracking branch 'upstream/master' into staging

This commit is contained in:
Tuomas Tynkkynen 2016-09-09 02:40:47 +03:00
commit 290db94f04
199 changed files with 4282 additions and 2450 deletions

View file

@ -15,8 +15,6 @@ matrix:
- os: osx
osx_image: xcode7.3
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
git:
depth: 1
env:
global:
- GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f

View file

@ -470,6 +470,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "The Unlicense";
};
upl = {
fullName = "Universal Permissive License";
url = "https://oss.oracle.com/licenses/upl/";
};
vim = spdx {
spdxId = "Vim";
fullName = "Vim License";

View file

@ -33,6 +33,7 @@
anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
andsild = "Anders Sildnes <andsild@gmail.com>";
aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
antono = "Antono Vasiljev <self@antono.info>";
ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";

View file

@ -157,9 +157,7 @@ rec {
${coreutils}/bin/mkdir -p $TMPDIR
cd $TMPDIR
$origBuilder $origArgs
exit $?
exec $origBuilder $origArgs
'';
testScript = ''
@ -172,9 +170,20 @@ rec {
'';
vmRunCommand = writeText "vm-run" ''
xchg=vm-state-client/xchg
${coreutils}/bin/mkdir $out
${coreutils}/bin/mkdir -p vm-state-client/xchg
export > vm-state-client/xchg/saved-env
${coreutils}/bin/mkdir -p $xchg
for i in $passAsFile; do
i2=''${i}Path
_basename=$(${coreutils}/bin/basename ''${!i2})
${coreutils}/bin/cp ''${!i2} $xchg/$_basename
eval $i2=/tmp/xchg/$_basename
${coreutils}/bin/ls -la $xchg
done
unset i i2 _basename
export > $xchg/saved-env
export tests='${testScript}'
${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
''; # */

View file

@ -20,10 +20,9 @@ in
example = literalExample "with pkgs.fcitx-engines; [ mozc hangul ]";
description =
let
engines =
lib.concatStringsSep ", "
(map (name: "<literal>${name}</literal>")
(lib.attrNames pkgs.fcitx-engines));
enginesDrv = filterAttrs (const isDerivation) pkgs.fcitx-engines;
engines = concatStringsSep ", "
(map (name: "<literal>${name}</literal>") (attrNames enginesDrv));
in
"Enabled Fcitx engines. Available engines are: ${engines}.";
};

View file

@ -30,10 +30,9 @@ in
example = literalExample "with pkgs.ibus-engines; [ mozc hangul ]";
description =
let
engines =
lib.concatStringsSep ", "
(map (name: "<literal>${name}</literal>")
(lib.attrNames pkgs.ibus-engines));
enginesDrv = filterAttrs (const isDerivation) pkgs.ibus-engines;
engines = concatStringsSep ", "
(map (name: "<literal>${name}</literal>") (attrNames enginesDrv));
in
"Enabled IBus engines. Available engines are: ${engines}.";
};

View file

@ -0,0 +1,5 @@
{
x86_64-linux = "/nix/store/i4mwf2gpvar7dqvlpp5m86llbq3ahbvb-nix-1.11.4";
i686-linux = "/nix/store/a3gjrbspb0q4hs3sv5g1y2nza43i8nzv-nix-1.11.4";
x86_64-darwin = "/nix/store/7v21yd3qpv0nclcy5cqr5njj9bril12s-nix-1.11.4";
}

View file

@ -169,7 +169,7 @@ if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> /
for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do
echo " $i"
chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit
rsync -a $i $mountPoint/nix/store/
@rsync@/bin/rsync -a $i $mountPoint/nix/store/
done
# Register the paths in the Nix closure as valid. This is necessary

View file

@ -261,9 +261,9 @@ fi
prebuiltNix() {
machine="$1"
if [ "$machine" = x86_64 ]; then
echo /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10
echo @nix_x86_64_linux@
elif [[ "$machine" =~ i.86 ]]; then
echo /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10
echo @nix_i686_linux@
else
echo "$0: unsupported platform"
exit 1

View file

@ -21,7 +21,7 @@ let
name = "nixos-install";
src = ./nixos-install.sh;
inherit (pkgs) perl pathsFromGraph;
inherit (pkgs) perl pathsFromGraph rsync;
nix = config.nix.package.out;
cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
root_uid = config.ids.uids.root;
@ -32,11 +32,15 @@ let
"cp refs $out";
};
nixos-rebuild = makeProg {
name = "nixos-rebuild";
src = ./nixos-rebuild.sh;
nix = config.nix.package.out;
};
nixos-rebuild =
let fallback = import ./nix-fallback-paths.nix; in
makeProg {
name = "nixos-rebuild";
src = ./nixos-rebuild.sh;
nix = config.nix.package.out;
nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux;
};
nixos-generate-config = makeProg {
name = "nixos-generate-config";

View file

@ -95,7 +95,7 @@ in
nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
# Note: code names must only increase in alphabetical order.
nixosCodeName = "Flounder";
nixosCodeName = "Gorilla";
};
# Generate /etc/os-release. See

View file

@ -99,7 +99,6 @@ in
groupdel = { rootOK = true; };
login = { startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; };
chpasswd = { rootOK = true; };
chgpasswd = { rootOK = true; };
};
security.setuidPrograms = [ "su" "chfn" ]

View file

@ -166,7 +166,8 @@ in
++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains);
acmeService = {
description = "Renew ACME Certificate for ${cert}";
after = [ "network.target" ];
after = [ "network.target" "network-online.target" ];
wants = [ "network-online.target" ];
serviceConfig = {
Type = "oneshot";
SuccessExitStatus = [ "0" "1" ];

View file

@ -105,6 +105,16 @@ let
'';
};
setEnvironment = mkOption {
type = types.bool;
default = true;
description = ''
Whether the service should set the environment variables
listed in <option>environment.sessionVariables</option>
using <literal>pam_env.so</literal>.
'';
};
setLoginUid = mkOption {
type = types.bool;
description = ''
@ -284,7 +294,9 @@ let
"password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
# Session management.
session required pam_env.so envfile=${config.system.build.pamEnvironment}
${optionalString cfg.setEnvironment ''
session required pam_env.so envfile=${config.system.build.pamEnvironment}
''}
session required pam_unix.so
${optionalString cfg.setLoginUid
"session ${
@ -477,6 +489,13 @@ in
vlock = {};
xlock = {};
xscreensaver = {};
runuser = { rootOK = true; unixAuth = false; setEnvironment = false; };
/* FIXME: should runuser -l start a systemd session? Currently
it complains "Cannot create session: Already running in a
session". */
runuser-l = { rootOK = true; unixAuth = false; };
};
};

View file

@ -79,9 +79,13 @@ in {
environment.systemPackages = [ cfg.package editorScript ];
environment.variables = if cfg.defaultEditor then {
EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor";
} else {};
environment.variables = {
# This is required so that GTK applications launched from Emacs
# get properly themed:
GTK_DATA_PREFIX = "${config.system.path}";
} // (if cfg.defaultEditor then {
EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor";
} else {});
};
meta.doc = ./emacs.xml;

View file

@ -271,6 +271,9 @@ in
{ assertion = cfg.showPAMFailure -> cfg.enablePAM;
message = "dovecot is configured with showPAMFailure while enablePAM is disabled";
}
{ assertion = (cfg.sieveScripts != {}) -> ((cfg.mailUser != null) && (cfg.mailGroup != null));
message = "dovecot requires mailUser and mailGroup to be set when sieveScripts is set";
}
];
};

View file

@ -75,7 +75,8 @@ in
};
browseDomains = mkOption {
default = [ "0pointer.de" "zeroconf.org" ];
default = [ ];
example = [ "0pointer.de" "zeroconf.org" ];
description = ''
List of non-local DNS domains to be browsed.
'';

View file

@ -490,7 +490,8 @@ in
systemd.services.firewall = {
description = "Firewall";
wantedBy = [ "network-pre.target" ];
wantedBy = [ "sysinit.target" ];
wants = [ "network-pre.target" ];
before = [ "network-pre.target" ];
after = [ "systemd-modules-load.service" ];
@ -500,6 +501,7 @@ in
# containers don't have CAP_SYS_MODULE. So the host system had
# better have all necessary modules already loaded.
unitConfig.ConditionCapability = "CAP_NET_ADMIN";
unitConfig.DefaultDependencies = false;
reloadIfChanged = true;

View file

@ -52,8 +52,7 @@ in
description = "A Simple Calendar and Contact Server";
after = [ "network-interfaces.target" ];
wantedBy = [ "multi-user.target" ];
script = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -d";
serviceConfig.Type = "forking";
script = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -f";
serviceConfig.User = "radicale";
serviceConfig.Group = "radicale";
};

View file

@ -114,17 +114,18 @@ let
port = if vhost.port != null then vhost.port else (if ssl then 443 else 80);
listenString = toString port + optionalString ssl " ssl http2"
+ optionalString vhost.default " default";
acmeLocation = optionalString vhost.enableACME ''
acmeLocation = optionalString vhost.enableACME (''
location /.well-known/acme-challenge {
try_files $uri @acme-fallback;
${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"}
root ${vhost.acmeRoot};
auth_basic off;
}
'' + (optionalString (vhost.acmeFallbackHost != null) ''
location @acme-fallback {
auth_basic off;
proxy_pass http://${vhost.acmeFallbackHost};
}
'';
''));
in ''
${optionalString vhost.forceSSL ''
server {

View file

@ -39,8 +39,8 @@ with lib;
};
acmeFallbackHost = mkOption {
type = types.str;
default = "0.0.0.0";
type = types.nullOr types.str;
default = null;
description = ''
Host which to proxy requests to if acme challenge is not found. Useful
if you want multiple hosts to be able to verify the same domain name.

View file

@ -12,11 +12,13 @@ let
'';
});
path = map getBin
[ pkgs.coreutils pkgs.gnugrep pkgs.findutils
pkgs.glibc # needed for getent
pkgs.shadow
pkgs.nettools # needed for hostname
path = with pkgs; map getBin
[ coreutils
gnugrep
findutils
glibc # needed for getent
shadow
nettools # needed for hostname
];
in
@ -137,8 +139,13 @@ in
mkdir -m 1777 -p /var/tmp
# Empty, read-only home directory of many system accounts.
mkdir -m 0555 -p /var/empty
# Empty, immutable home directory of many system accounts.
mkdir -p /var/empty
# Make sure it's really empty
${pkgs.e2fsprogs}/bin/chattr -i /var/empty
find /var/empty -mindepth 1 -delete
chmod 0555 /var/empty
${pkgs.e2fsprogs}/bin/chattr +i /var/empty
'';
system.activationScripts.usrbinenv = if config.environment.usrbinenv != null

View file

@ -29,7 +29,7 @@ setPath "@path@"
# Normally, stage 1 mounts the root filesystem read/writable.
# However, in some environments, stage 2 is executed directly, and the
# root is read-only. So make it writable here.
if [ "$container" != systemd-nspawn ]; then
if [ -z "$container" ]; then
mount -n -o remount,rw none /
fi

View file

@ -286,11 +286,15 @@ in
# Sync mount options with systemd's src/core/mount-setup.c: mount_table.
boot.specialFileSystems = {
"/proc" = { fsType = "proc"; options = [ "nosuid" "noexec" "nodev" ]; };
"/sys" = { fsType = "sysfs"; options = [ "nosuid" "noexec" "nodev" ]; };
"/run" = { fsType = "tmpfs"; options = [ "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; };
"/dev" = { fsType = "devtmpfs"; options = [ "nosuid" "strictatime" "mode=755" "size=${config.boot.devSize}" ]; };
"/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; };
"/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "gid=${toString config.ids.gids.tty}" ]; };
} // optionalAttrs (!config.boot.isContainer) {
# systemd-nspawn populates /sys by itself, and remounting it causes all
# kinds of weird issues (most noticeably, waiting for host disk device
# nodes).
"/sys" = { fsType = "sysfs"; options = [ "nosuid" "noexec" "nodev" ]; };
};
};

View file

@ -38,15 +38,17 @@ in
default = null;
example = 4000;
description = ''
Use fixed port for rpc.statd, useful if NFS server is behind firewall.
Use a fixed port for <command>rpc.statd</command>. This is
useful if the NFS server is behind a firewall.
'';
};
lockdPort = mkOption {
default = null;
example = 4001;
description = ''
Use fixed port for NFS lock manager kernel module (lockd/nlockmgr),
useful if NFS server is behind firewall.
Use a fixed port for the NFS lock manager kernel module
(<literal>lockd/nlockmgr</literal>). This is useful if the
NFS server is behind a firewall.
'';
};
};
@ -68,13 +70,16 @@ in
boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
# FIXME: should use upstream units from nfs-utils.
systemd.services.statd =
{ description = "NFSv3 Network Status Monitor";
path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];
wantedBy = [ "remote-fs-pre.target" ];
wants = [ "remote-fs-pre.target" ];
before = [ "remote-fs-pre.target" ];
wantedBy = [ "remote-fs.target" ];
requires = [ "basic.target" "rpcbind.service" ];
after = [ "basic.target" "rpcbind.service" ];
@ -100,8 +105,9 @@ in
path = [ pkgs.sysvtools pkgs.utillinux ];
wantedBy = [ "remote-fs-pre.target" ];
wants = [ "remote-fs-pre.target" ];
before = [ "remote-fs-pre.target" ];
wantedBy = [ "remote-fs.target" ];
requires = [ "rpcbind.service" ];
after = [ "rpcbind.service" ];

View file

@ -88,6 +88,7 @@ in rec {
(all nixos.tests.networking.scripted.sit)
(all nixos.tests.networking.scripted.vlan)
(all nixos.tests.nfs3)
(all nixos.tests.nfs4)
(all nixos.tests.openssh)
(all nixos.tests.printing)
(all nixos.tests.proxy)

View file

@ -69,6 +69,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec {
sed -i \
-e '1i import tempfile' \
-e 's|_STORE_FILE_PATH = .*|_STORE_FILE_PATH = tempfile.gettempdir()|' \
-e 's|DEFAULT_STORE_SIZE = .*|DEFAULT_STORE_SIZE = 409600|' \
tests/loopbackedtestcase.py
PYTHONPATH=".:$(< "${pkgs.stdenv.mkDerivation {

View file

@ -15,6 +15,16 @@ import ./make-test.nix ( { pkgs, ... } : {
services.httpd.adminAddr = "foo@example.org";
};
# Dummy configuration to check whether firewall.service will be honored
# during system activation. This only needs to be different to the
# original walled configuration so that there is a change in the service
# file.
walled2 =
{ config, pkgs, nodes, ... }:
{ networking.firewall.enable = true;
networking.firewall.rejectPackets = true;
};
attacker =
{ config, pkgs, ... }:
{ services.httpd.enable = true;
@ -23,28 +33,33 @@ import ./make-test.nix ( { pkgs, ... } : {
};
};
testScript =
{ nodes, ... }:
''
startAll;
testScript = { nodes, ... }: let
newSystem = nodes.walled2.config.system.build.toplevel;
in ''
$walled->start;
$attacker->start;
$walled->waitForUnit("firewall");
$walled->waitForUnit("httpd");
$attacker->waitForUnit("network.target");
$walled->waitForUnit("firewall");
$walled->waitForUnit("httpd");
$attacker->waitForUnit("network.target");
# Local connections should still work.
$walled->succeed("curl -v http://localhost/ >&2");
# Local connections should still work.
$walled->succeed("curl -v http://localhost/ >&2");
# Connections to the firewalled machine should fail, but ping should succeed.
$attacker->fail("curl --fail --connect-timeout 2 http://walled/ >&2");
$attacker->succeed("ping -c 1 walled >&2");
# Connections to the firewalled machine should fail, but ping should succeed.
$attacker->fail("curl --fail --connect-timeout 2 http://walled/ >&2");
$attacker->succeed("ping -c 1 walled >&2");
# Outgoing connections/pings should still work.
$walled->succeed("curl -v http://attacker/ >&2");
$walled->succeed("ping -c 1 attacker >&2");
# Outgoing connections/pings should still work.
$walled->succeed("curl -v http://attacker/ >&2");
$walled->succeed("ping -c 1 attacker >&2");
# If we stop the firewall, then connections should succeed.
$walled->stopJob("firewall");
$attacker->succeed("curl -v http://walled/ >&2");
'';
# If we stop the firewall, then connections should succeed.
$walled->stopJob("firewall");
$attacker->succeed("curl -v http://walled/ >&2");
# Check whether activation of a new configuration reloads the firewall.
$walled->succeed("${newSystem}/bin/switch-to-configuration test 2>&1" .
" | grep -qF firewall.service");
'';
})

View file

@ -22,18 +22,15 @@ import ./make-test.nix ({ pkgs, ...} : {
# create database
$one->succeed(q~
curl -X POST 'http://localhost:8086/db?u=root&p=root' \
-d '{"name": "test"}'
curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE test"
~);
# write some points and run simple query
$one->succeed(q~
curl -X POST 'http://localhost:8086/db/test/series?u=root&p=root' \
-d '[{"name":"foo","columns":["val"],"points":[[6666]]}]'
curl -XPOST 'http://localhost:8086/write?db=test' --data-binary 'cpu_load_short,host=server01,region=us-west value=0.64 1434055562000000000'
~);
$one->succeed(q~
curl -G 'http://localhost:8086/db/test/series?u=root&p=root' \
--data-urlencode 'q=select * from foo limit 1' | grep 6666
curl -GET 'http://localhost:8086/query' --data-urlencode "db=test" --data-urlencode "q=SELECT \"value\" FROM \"cpu_load_short\" WHERE \"region\"='us-west'" | grep "0\.64"
~);
'';
})

View file

@ -81,7 +81,7 @@ in {
'';
};
systemd.services.mongodb.unitConfig.Before = "pump.io.service";
systemd.services.mongodb.unitConfig.RequiredBy = "pump.io.service";
systemd.services."pump.io".unitConfig.Requires = "mongodb.service";
};
};

View file

@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, autoconf-archive, pkgconfig
, libpulseaudio, ncurses }:
stdenv.mkDerivation rec {
name = "pamix-${version}";
version = "1.4.1";
src = fetchFromGitHub {
owner = "patroclos";
repo = "pamix";
rev = "v${version}";
sha256 = "06pxpalzynb8z7qwhkfs7sj823k9chdmpyj40rp27f2znf2qga19";
};
nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ];
buildInputs = [ libpulseaudio ncurses ];
meta = with stdenv.lib; {
description = "Pulseaudio terminal mixer";
homepage = https://github.com/patroclos/PAmix;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ ericsagnes ];
};
}

View file

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1qpyb7355s21sgy6gibkybxpzx4ikha57a8w644lca6qy9mhcwi3";
};
patches = [ ./mutex_no_nameclash.patch ];
buildInputs = [ alsaLib gtkmm libjack2 ];
nativeBuildInputs = [ pkgconfig ];

View file

@ -0,0 +1,58 @@
--- a/src/mutex.cpp
+++ b/src/mutex.cpp
@@ -20,23 +20,23 @@
#include "mutex.h"
-const pthread_mutex_t mutex::recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+const pthread_mutex_t mutex_no_nameclash::recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
const pthread_cond_t condition_var::cond = PTHREAD_COND_INITIALIZER;
-mutex::mutex( )
+mutex_no_nameclash::mutex_no_nameclash( )
{
m_mutex_lock = recmutex;
}
void
-mutex::lock( )
+mutex_no_nameclash::lock( )
{
pthread_mutex_lock( &m_mutex_lock );
}
void
-mutex::unlock( )
+mutex_no_nameclash::unlock( )
{
pthread_mutex_unlock( &m_mutex_lock );
}
--- a/src/mutex.h
+++ b/src/mutex.h
@@ -24,7 +24,7 @@
#include <pthread.h>
-class mutex {
+class mutex_no_nameclash {
private:
@@ -37,14 +37,14 @@
public:
- mutex();
+ mutex_no_nameclash();
void lock();
void unlock();
};
-class condition_var : public mutex {
+class condition_var : public mutex_no_nameclash {
private:

View file

@ -54,6 +54,7 @@ let
pkgsi686Linux.stdenv.cc.cc.lib
# aapt wants libz.so.1
zlib
pkgsi686Linux.zlib
# Support multiple monitors
libXrandr
]}"

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
version = "1.9.9";
version = "1.10.1";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
sha256 = "1rgqajqc1z1n8ckwkxg61j0k6ridps25am54qdwjm25w53bd0z1x";
sha256 = "0v03a93qa57ajji4sfz7hyr06n20jnlq87103nr7wqycv1v4dm85";
name = "${name}.deb";
};

View file

@ -19,12 +19,12 @@ rec {
if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz;
md5 = "54e2ce0660b2b1b0eb4267acf70ea66d";
sha256 = "1ndvanxw62b5ywi6ww0dyimabfmjdsw9q3xpy95zd8d5ygj2qsgq";
}
else
fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz;
md5 = "bde55a2354dc224cf5f26e5320e72dac";
sha256 = "0y5n0cyr9lgjmmzkfmav7j5w66rc1jq3300hcw3vrfjiv1k6ng3w";
};
};
eclipse_sdk_35 = eclipse-sdk-35; # backward compatibility, added 2016-01-30
@ -199,6 +199,23 @@ rec {
};
eclipse_cpp_45 = eclipse-cpp-45; # backward compatibility, added 2016-01-30
eclipse-cpp-46 = buildEclipse {
name = "eclipse-cpp-4.6.0";
description = "Eclipse IDE for C/C++ Developers, Neon release";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h";
}
else throw "Unsupported system: ${stdenv.system}";
};
eclipse-sdk-421 = buildEclipse {
name = "eclipse-sdk-4.2.1";
description = "Eclipse Classic";

View file

@ -152,12 +152,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
version = "8.8.0";
version = "9.0.1";
src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/8.8/${name}.zip";
sha256 = "1i1m7g5128q21njgrkiw71y4vi4aqzz8xdd4iv80j3nsvhbv6cnm";
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.0/${name}.zip";
sha256 = "0vdx0j9ci533wnk7y17qjvjyqx38hlrdw67z6pi05vfv3r6ys39x";
};
meta = with stdenv.lib; {
@ -322,12 +322,12 @@ rec {
gnuarmeclipse = buildEclipseUpdateSite rec {
name = "gnuarmeclipse-${version}";
version = "2.11.1-201512141335";
version = "3.1.1-201606210758";
src = fetchzip {
stripRoot = false;
url = "https://github.com/gnuarmeclipse/plug-ins/releases/download/v${version}/ilg.gnuarmeclipse.repository-${version}.zip";
sha256 = "1ijvnahfw2wc860la7kj8b52z2sfm8k1yk62bl0d4lq60y3aycg9";
sha256 = "1g77jlhfa3csaxxps1z5lasrd9l2p5ajnddnq9ra5syw8ggkdc2h";
};
meta = with stdenv.lib; {

View file

@ -175,10 +175,10 @@
}) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex";
version = "11.89.4";
version = "11.89.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-11.89.4.tar";
sha256 = "06dxj9wflwgzy88vk47pdk6xln4f63cab7s73ynwp2bdqjs99f5b";
url = "https://elpa.gnu.org/packages/auctex-11.89.5.tar";
sha256 = "0scab76ks9wnv1wp9lrm6h9hag7p70zn950srp2p02vrzz2z5p53";
};
packageRequires = [];
meta = {
@ -618,10 +618,10 @@
}) {};
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "el-search";
version = "0.2.2";
version = "0.2.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-0.2.2.tar";
sha256 = "07b4jk143vi3sydg03mg12gy1rs21q0qvs7p303irwz4pv8bfwqj";
url = "https://elpa.gnu.org/packages/el-search-0.2.3.tar";
sha256 = "0icxfq6hd8pfg4r5q70ylm84wgv1jiijpv0d56x7kjdh7wrdalrb";
};
packageRequires = [ emacs ];
meta = {
@ -1336,10 +1336,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20160829";
version = "20160905";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20160829.tar";
sha256 = "1p0bxbzjzxmhsg1m4a3mlsphh7gcv6b97mfgkl22lfy0ia0g1fzv";
url = "https://elpa.gnu.org/packages/org-20160905.tar";
sha256 = "118xq8bsiwa6nfxm14ww5dmyf5r0cv69lf748cj39bcvg1qm94vn";
};
packageRequires = [];
meta = {

File diff suppressed because it is too large Load diff

View file

@ -98,6 +98,9 @@ self:
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
# upstream issue: missing dependency
jade = null;
# upstream issue: missing file header
jsfmt = markBroken super.jsfmt;

View file

@ -1061,12 +1061,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
version = "0.1.3";
version = "0.1.5";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
rev = "7128978b571ec013ccfd91865029cc0d062c269c";
sha256 = "0l683fk3l82w6097d1g8i9ka3sfv9vpa363i6500xwraa49fcq9i";
rev = "359c9d62649ad3f2cb007c4d8871e5b051d695f6";
sha256 = "1kwn5lln7l754x5l3glij7ci3r2g6p9sapc43bm2gmwbgxa9fgis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@ -1166,12 +1166,12 @@
annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "annotate";
version = "0.4.5";
version = "0.4.6";
src = fetchFromGitHub {
owner = "bastibe";
repo = "annotate.el";
rev = "067fe860eabcbad4894609c06f090c2c0f97773f";
sha256 = "0s1yviv6sa05njlix7a88vhfz75mw056w2ac6cmw4wyhxcf4rwdv";
rev = "9616c55812c4b6f11365e0f4e90f9357c95280ff";
sha256 = "0wkdvmszabx1rcwqbm6rw07niwd7n4bdb9h2iav2miljwy68s40x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate";
@ -3019,12 +3019,12 @@
cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
melpaBuild {
pname = "cask";
version = "0.7.4";
version = "0.8.0";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
rev = "8337237449446e186ccd5ade0b0dc8c6ea7bd728";
sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l";
rev = "f5b828ef4ff6c367f87181a5b998aa78e42c2f24";
sha256 = "0kmm1dlyf4f8b7dy2v2n7nf6620v6cq70ndlv5607dibhmaa8ksr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@ -3103,12 +3103,12 @@
cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cbm";
version = "0.3.2";
version = "0.4";
src = fetchFromGitHub {
owner = "akermu";
repo = "cbm.el";
rev = "3c7f33d26336776f94877974f5f7e1470ea1cbdd";
sha256 = "0rrgi765x9p9wa14p2b5jhsk86cmiicx2a239jkxm00w3sdn7rn8";
rev = "bd74f5f83ea1778d2e871cbcbedf458ccde40128";
sha256 = "1smj2l0g0643qp2c5jgj7z9yk6y8yia5a33pfbdpa4qwgq1ap3m4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm";
@ -3418,12 +3418,12 @@
cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
melpaBuild {
pname = "cider-eval-sexp-fu";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider-eval-sexp-fu";
rev = "dbe6a19c835ea42b099dd17f040db0baf9774aaf";
sha256 = "1rkd76561h93si4lpisz3qnaj48dx8x01nd59a3lgpqsbbibnccf";
rev = "6b437bf073b21543e72d76fd0392a28fba7cbfbe";
sha256 = "1frpr5dwg7aa0pjr2sarck498lj11li8xi36s5qa8qhflgl29jpn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu";
@ -3478,6 +3478,27 @@
license = lib.licenses.free;
};
}) {};
circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe-notifications";
version = "1.0";
src = fetchFromGitHub {
owner = "eqyiel";
repo = "circe-notifications";
rev = "80c44441ecd3ae04ae63760aa20afa837c1ed05b";
sha256 = "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications";
sha256 = "06y525x5yc0xgbw0cf16mc72ca9bv8j8z4gpgznbad2qp7psf53c";
name = "circe-notifications";
};
packageRequires = [ alert circe emacs ];
meta = {
homepage = "https://melpa.org/#/circe-notifications";
license = lib.licenses.free;
};
}) {};
cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cl-format";
@ -3765,12 +3786,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitLab {
owner = "tarsius";
repo = "closql";
rev = "a8b6b2beaa10528b2fd5ed9759136e3959529266";
sha256 = "1p251vyh8fc6xzaf0v7yvf4wkrvcfjdb3qr88ll4xcb61gj3vi3a";
rev = "8e4d0b3b31913a2362a45fcdaf05745dfc188b66";
sha256 = "1189drdpzp05kafg5wfi556n2v6a957qs9xm3v9k2rsbgnyd2hgk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql";
@ -3828,12 +3849,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
version = "3.6.1";
version = "3.6.2";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
rev = "f59513140bf086eda2029c5b4e950fc58216c06e";
sha256 = "0x32brljg3rv4nsj75sngzbwkfp908xz0ypmvwm1rb47jgds6aqd";
rev = "c5dcd31e92c0a09009a340e3fe23ced4f6190b64";
sha256 = "0k40czfgxwdn4yavkl10ab5ls57mdr7smxjjld20mfrjnfbmv0fc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@ -4143,12 +4164,12 @@
company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-ansible";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitHub {
owner = "krzysztof-magosa";
repo = "company-ansible";
rev = "b9b4b22bc8c109de3ae3a5bb4c6b2be89bd644db";
sha256 = "1dds3fynbd6yb0874aw6g4qk5zmq3pgl3jmcp38md027qalgqmym";
rev = "09065115bead0a14c134d4419944eed7e999284c";
sha256 = "1vygalvg3hky0hacvj8pgjiaym91yh0npq69q4qi3slz87rpl24c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible";
@ -4632,12 +4653,12 @@
composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
melpaBuild {
pname = "composer";
version = "0.0.5";
version = "0.0.6";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "composer.el";
rev = "3b5a9b7364136c8dd85b8b3c1323790c8c38c2a8";
sha256 = "0zk1rbnh423r1rsml4lbwzkajkq7h3k6dan4cjqbyiw8pd12hq3m";
rev = "d955d9dd39b3bd0ba04ade648108ddb805bac4bc";
sha256 = "1yxywibs7zdhc4kgl372rl49r1ivl96adnapz2k58kggjybjk778";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
@ -7375,12 +7396,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
version = "0.17.0";
version = "0.19.3";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
rev = "3112ff7964b596022de94c12b4676c6ca7a69c80";
sha256 = "1n6gp3c4b3ryprw7hxd7447gkgjafxnlbfg75mjm96vfgxkb7abx";
rev = "7e0da96f483703930919f04943f60f6eca3cb842";
sha256 = "1y0prk4dbw6h26kj2l5vl3bakvc58aawjpkpb2r8wgb2b3fg9vl3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@ -8153,12 +8174,12 @@
eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }:
melpaBuild {
pname = "eopengrok";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "youngker";
repo = "eopengrok.el";
rev = "30154a083b2fd8cbb9336d0d2134f790efd4163b";
sha256 = "1yn9jn6jl6rmknj50g18z5yvpa1d8mzzx3j1pfdwfn36ak4nc9ba";
rev = "0bf07c636f8d29a98e9776243ec9496875ddff51";
sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok";
@ -8195,12 +8216,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitLab {
owner = "tarsius";
repo = "epkg";
rev = "17553458c01563170be9c74db37bcc359a4702d4";
sha256 = "18am0nc2kjxbnkls7dl9j47cynwiiafx8w6rqa4d9dyx7khl2rmp";
rev = "b0606f9800c971085d5fef17dfe242aece378fb3";
sha256 = "195y4clhs8lwbl3f5a9181v60n424s69nfzy9xrwzqclbyj42lr3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg";
@ -9137,12 +9158,12 @@
evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
rev = "de6ce21e1e24b7a0370ca3a6ce83b529f772c8db";
sha256 = "0dhk8ajn5b0y4qla4jak76zxqgiai9fcd1hpfh98pmsjy1jq5ll4";
rev = "b01763bf766a7449626e6216c2d360ae1e80e5c1";
sha256 = "197ycwx02mjlvck5xraw2jwlsv3ham5jm2yv8133i4cq8dszcfaa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@ -11307,12 +11328,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
rev = "cffb48cfc3973155d34651996257a901e6f5f8d0";
sha256 = "1bzbjv15bz0zfsizgd8yr6gin225qnq8g2795r14q7al8f71slv7";
rev = "a31c19e88f403a8ebb2e6a5d27eef39fca595ba4";
sha256 = "1sxr79gcj2xkh8qfp0h4r6iqmhm27qkibsk8l78gi2n3790sbnxk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@ -11557,12 +11578,12 @@
fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fzf";
version = "0.1";
version = "0.2";
src = fetchFromGitHub {
owner = "bling";
repo = "fzf.el";
rev = "bfc157a682b53927af633fd919c2e03235ea6599";
sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
rev = "383a050920e9b99d37c21d041deb7f38b202485c";
sha256 = "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@ -11977,12 +11998,12 @@
git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-gutter";
version = "0.89";
version = "0.90";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-git-gutter";
rev = "02f67e207f0653077c06ddc8502c6a0cd28de260";
sha256 = "04qkznd85f9msrgpwsfswbfi5nzvpy4mk5mcmv2cvbq68grs4c40";
rev = "a786465bd527c13e32c73c02b95086560c1be878";
sha256 = "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter";
@ -12352,22 +12373,22 @@
license = lib.licenses.free;
};
}) {};
glab = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "glab";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitLab {
owner = "tarsius";
repo = "glab";
rev = "7c022e55ec5d50f9f5b656b17823f7e165f2d056";
sha256 = "0qmnz4zd6z0nhxxmwgk16mppf7i86na7c3nyc47jfw7xl63s98pk";
rev = "5ced0214622450930bcea105b9aac785c594609d";
sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab";
sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di";
name = "glab";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/glab";
license = lib.licenses.free;
@ -12772,27 +12793,6 @@
license = lib.licenses.free;
};
}) {};
goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "goose-theme";
version = "1.0.0";
src = fetchFromGitHub {
owner = "thwg";
repo = "goose-theme";
rev = "52244bd5ee3e7b42599d9697007a5df3b026aafc";
sha256 = "1d1x5ffpn9gq9byd0qavxr081sl3qf0lihdxfdqvhwd815kravxk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fa2ce32adbccdbc3f1b642585b430202e7ae274/recipes/goose-theme";
sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9";
name = "goose-theme";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/goose-theme";
license = lib.licenses.free;
};
}) {};
gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "gotest";
@ -13477,12 +13477,12 @@
haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-emacs";
version = "4.0.2";
version = "4.0.3";
src = fetchFromGitHub {
owner = "knupfer";
repo = "haskell-emacs";
rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9";
sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh";
rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9";
sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs";
@ -13498,12 +13498,12 @@
haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
melpaBuild {
pname = "haskell-emacs-base";
version = "4.0.2";
version = "4.0.3";
src = fetchFromGitHub {
owner = "knupfer";
repo = "haskell-emacs";
rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9";
sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh";
rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9";
sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-base";
@ -13519,12 +13519,12 @@
haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
melpaBuild {
pname = "haskell-emacs-text";
version = "4.0.2";
version = "4.0.3";
src = fetchFromGitHub {
owner = "knupfer";
repo = "haskell-emacs";
rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9";
sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh";
rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9";
sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-text";
@ -13665,16 +13665,16 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
version = "2.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
rev = "557786d0443791d5d0ccfbdc1dcc86004e31d218";
sha256 = "0xk0hw08b335j3w2frxa61bg3521zjrjv35bw5qcd1z6b0n8gwks";
rev = "7a7c9d990e924b9ac0e845afa4e539122f034e31";
sha256 = "0rpjz3z5ainpxkdmdwpmb1an23qwvfyfjsfscw5kw7k915wak0kq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90ab37af6b0c85eac11c423bc8f0d93d6d8a9fd4/recipes/helm";
sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
sha256 = "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf";
name = "helm";
};
packageRequires = [ async emacs helm-core popup ];
@ -13875,12 +13875,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
version = "2.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
rev = "557786d0443791d5d0ccfbdc1dcc86004e31d218";
sha256 = "0xk0hw08b335j3w2frxa61bg3521zjrjv35bw5qcd1z6b0n8gwks";
rev = "7a7c9d990e924b9ac0e845afa4e539122f034e31";
sha256 = "0rpjz3z5ainpxkdmdwpmb1an23qwvfyfjsfscw5kw7k915wak0kq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@ -15051,12 +15051,12 @@
hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hindent";
version = "5.2.0";
version = "5.2.1";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
rev = "7d883bfa80dcb6fd2bf6c559cc8250fe0c4f80d7";
sha256 = "1dil3lspcidvdq99h7an7n6mvylwmf8s4xmaqbpdbc4rwiijjhkl";
rev = "5de979e1e001608c9fe73d552c4e29110957bbb8";
sha256 = "1qaklfhf92zibj2wrpiyjqrzba7j00iqzb46nd7p64wyqqhh7ncp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@ -17400,12 +17400,12 @@
keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "keymap-utils";
version = "1.0.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "tarsius";
repo = "keymap-utils";
rev = "34e28d4c88ad9c71aee3dd226817c6eb6927b2c7";
sha256 = "17bfxn1bl2by3vnp24hnk6qjxx6av1fayrsw9hlldwhgp4ayhy48";
rev = "14c86914b708081299cf6a290570ff8e11853cab";
sha256 = "15zsx296cqzmwivrkkknr8lmdsr6dkggxbwp2yggr20278vsvbhv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
@ -17736,12 +17736,12 @@
leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
melpaBuild {
pname = "leanote";
version = "0.3.6";
version = "0.4.0";
src = fetchFromGitHub {
owner = "aborn";
repo = "leanote-emacs";
rev = "60368f2629ec4eac97c2a9d1ad043efd84454925";
sha256 = "01y4ilrjhf7y3a1r514ahxpa7cl1w5xdj01lxal2a3bhxbkzcvrp";
rev = "1bd49fdf13ef707bae7edaa724a1592aa7fb002f";
sha256 = "1k58rhk5p819cvfa6zg7j3ysvzhq6dc433fzhh1ff0gwga2vrqbz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote";
@ -20416,12 +20416,12 @@
nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-mode";
version = "1.11.3";
version = "1.11.4";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "2ac966a464a830f52a9101c0a9d65f6a95cbfa0e";
sha256 = "003lxk19z8wq0i6ah7xf14cgqgxww50337vgp66gi3kc0lscfdbf";
rev = "fb577a431f5ef1a29fdf3b818dceb4f6b4e8fa52";
sha256 = "1vzs5y0ib9bqvcyap7f6v75pf8z0xpdwgq554zxci4dlwp68fp2p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@ -20458,12 +20458,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "tarsius";
repo = "no-littering";
rev = "6e4c239f58645d6cee3ed4aa180ae484f677a7ab";
sha256 = "1j5agcq56mphpbpxdaklvl1y2689sfny4l6wknvrwxnqyl48yzkb";
rev = "537e584d115fb056a23a0b055e0a28f543182c45";
sha256 = "1cma5047c3486bjfshb612iq6j3yml0c02gqy8d0ms9507r60igq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@ -20958,12 +20958,12 @@
olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
version = "1.5.2";
version = "1.5.3";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
rev = "d2c54acf566a9ee38021261f7d8f43a94c9eee8c";
sha256 = "1rh6vi2vi50zkmcd5jyfnhhsdrfn6l9abd43l8ppgr3k93l3m5bl";
rev = "1553934954ea47e4d2de676c42324ed4790cfd14";
sha256 = "1n978yv19bsy5876lnp16xs1qg1frdbicf9c9h2rvil5myrljhyj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@ -21450,12 +21450,12 @@
org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-journal";
version = "1.11.1";
version = "1.11.2";
src = fetchFromGitHub {
owner = "bastibe";
repo = "org-journal";
rev = "51aec969cc0dc8e0c81220f020d643861d2f5c9b";
sha256 = "0j3z2imv5w6cndnxdyy0pf9la6qxbgwdwr7vr8mr47frqpjb4i63";
rev = "5f1445e9bafa252c8708b3bc223f30032f5ae82b";
sha256 = "0aip4krrl5cyaa2agmmzipqw139zar3j6594vba93axalfdx9i9z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@ -22621,12 +22621,12 @@
pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "pandoc-mode";
version = "2.18";
version = "2.19";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "pandoc-mode";
rev = "e641d91c2886800871769e8e0e6554d2f8001e79";
sha256 = "1lv3iiwidlvr6jsldd2s9apir1jzpynii8vp58gxq9kxbm4rzb42";
rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2";
sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@ -23331,7 +23331,7 @@
phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "phpunit";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "phpunit.el";
@ -23496,6 +23496,27 @@
license = lib.licenses.free;
};
}) {};
plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plain-theme";
version = "1";
src = fetchFromGitHub {
owner = "yegortimoshenko";
repo = "plain-theme";
rev = "4210122812df9b5fe375ad35a3b933bf040460a3";
sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8";
name = "plain-theme";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/plain-theme";
license = lib.licenses.free;
};
}) {};
platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "platformio-mode";
@ -24063,12 +24084,12 @@
projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-rails";
version = "0.10.1";
version = "0.10.2";
src = fetchFromGitHub {
owner = "asok";
repo = "projectile-rails";
rev = "9a8a4641be1f2eae7f6f42d13db24c10bfa0c974";
sha256 = "0v5mm9v4wd3yfnlx7zbb48lsxz7fyv4vcdszdpr5nswynmihxfi5";
rev = "70ec237ce49172ccc4daa536505749e3d4701469";
sha256 = "0jvj0lxy7mhkv8ql472zz6wyrmh72cw1z9n1200z5g8p4n7jfjsj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@ -24168,12 +24189,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
version = "3.0.0";
version = "3.0.2";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
rev = "e8ae137c96444ea313485ed1118c5e43b2099cf1";
sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7";
rev = "1a586735085e817b1f52e53feec92ce418049f69";
sha256 = "16wmr1fgdqpf84fkq90cxvccfsxx7h0q0wzqkbg8vdjmka412g09";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@ -24942,6 +24963,27 @@
license = lib.licenses.free;
};
}) {};
rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rc-mode";
version = "1.0.6";
src = fetchFromGitHub {
owner = "mrhmouse";
repo = "rc-mode.el";
rev = "b9b48e24a55083e4911f2b497ed4d9676a192e88";
sha256 = "06ln916fim58q44g67zlnsipfxcramyrqbm9adh52mdbk44j4bf9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode";
sha256 = "0p77mckw8jyxcwspj1ffm8mz0k01ddm67hh9j8rw812wddwnj7qf";
name = "rc-mode";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/rc-mode";
license = lib.licenses.free;
};
}) {};
rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rcirc-styles";
@ -25999,8 +26041,8 @@
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
rev = "a0b73b25377f5aedf50abe198d6b6111310735be";
sha256 = "0b2gm1mfxiqm86m5156scmzvn10dl0idgxpzgki1k0cpy4xf4qfa";
rev = "387e93c70a3703e55f717d3285912ad12cfee947";
sha256 = "0xwwarla3m9cr1mpnlhsknfvxw1xyf85cxjkzg42q12k7i0yad5w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@ -27570,12 +27612,12 @@
sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sqlup-mode";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "Trevoke";
repo = "sqlup-mode.el";
rev = "6140e23a2902616da5894dc676b47a8748faf016";
sha256 = "0dczcmibvr9m5isn9isgl01q9x97yfdcs21qa57ds2b3nmqaqy4p";
rev = "4bf563b0b95f5a1e627e55d52d1c2fd0dd3af95f";
sha256 = "0hxkkpylnf5phavcd2y3bxzikcnr7cdk3rbqgp3nw74sxz0223w2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@ -30698,12 +30740,12 @@
with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
rev = "4929d430266925c1145adef9987e2acdb829395b";
sha256 = "12613xwd05l26p2v9jxjxcqf4v20j6fq5wpmnj45spg0ngalwzg4";
rev = "6f41998405796336575b1fce49b84667feaa9b9f";
sha256 = "12bw86l8756rwfgnik0kywqafw8idv8ncdxlbaybix70r2iaa61y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";

View file

@ -35,10 +35,6 @@ self:
});
overrides = {
ac-php = super.ac-php.override {
inherit (self.melpaPackages) company popup;
};
# upstream issue: mismatched filename
ack-menu = markBroken super.ack-menu;
@ -95,6 +91,9 @@ self:
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
# upstream issue: missing dependency
jade = null;
# upstream issue: missing file header
jsfmt = markBroken super.jsfmt;

View file

@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20160725";
version = "20160905";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20160725.tar";
sha256 = "1d2v6w93z543jnmz6a1kmp61rmznjnw6pvd9ia2pm42rzhsgydy5";
url = "http://orgmode.org/elpa/org-20160905.tar";
sha256 = "01zm7s5qbh1xvxddd93i6cmz3m7x2s67zwzah5q5l3hgnvbx750q";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20160725";
version = "20160905";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20160725.tar";
sha256 = "0bxxbcln7npffvd947052sjp59ypxdfwkp2ja7mbs28pzzb25xxi";
url = "http://orgmode.org/elpa/org-plus-contrib-20160905.tar";
sha256 = "1wx51iqg1cfrf220yslp2lq9s7klbv6bbxq0d2ygj47yjikkf39r";
};
packageRequires = [];
meta = {

View file

@ -120,12 +120,12 @@ in
{
clion = buildClion rec {
name = "clion-${version}";
version = "2016.2.1";
version = "2016.2.2";
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "01a8qylfw8bsyywlxgysghjd7d2rlp9x3myd6nqhn7c1803pcks4";
sha256 = "06aq3lfccki9203gjvibzj3gn9d82pc6s5z0m3fnf049zxk58ndi";
};
wmClass = "jetbrains-clion";
};

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = mirror://sourceforge/gqview/gqview-2.1.5.tar.gz;
md5 = "4644187d9b14b1dc11ac3bb146f262ea";
sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj";
};
buildInputs = [pkgconfig gtk libpng];

View file

@ -2,14 +2,14 @@
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
, libX11, libwebp, quantumdepth ? 8}:
let version = "1.3.24"; in
let version = "1.3.25"; in
stdenv.mkDerivation {
name = "graphicsmagick-${version}";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "1q40w5hcl8rcpszm0r7rpr3a9lj390p39zfvavkvlgxyyk7bmgsj";
sha256 = "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn";
};
patches = [ ./disable-popen.patch ];

View file

@ -61,7 +61,7 @@ let
inherit version;
src = fetchurl {
url = "http://www.hackenberger.at/ktikz/ktikz_${version}.tar.gz";
md5 = "e8f0826cba2447250bcdcd389a71a2ac";
sha256 = "19jl49r7dw3vb3hg52man8p2lszh71pvnx7d0xawyyi0x6r8ml9i";
};
enableParallelBuilding = true;

View file

@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
name = "sane-frontends-1.0.14";
src = fetchurl {
url = "ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/${name}.tar.gz";
md5 = "c63bf7b0bb5f530cf3c08715db721cd3";
url = "https://alioth.debian.org/frs/download.php/file/1140/${name}.tar.gz";
sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
};
preConfigure = ''

View file

@ -1,29 +1,50 @@
{ stdenv, fetchurl, python, pyqt5, sip, poppler_utils, pkgconfig, libpng
{ stdenv, fetchurl, fetchpatch, python, pyqt5, sip, poppler_utils, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite
, makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp
, xdg_utils, makeDesktopItem
}:
stdenv.mkDerivation rec {
version = "2.64.0";
version = "2.66.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
sha256 = "0jjbkhd3n7rh5q6cl6yy51hyjbxmgm6xj7i2a1d3h2ggrip1zmr9";
sha256 = "1dbv6p9cq9zj51zvhfy2b7aic2zqa44lmfmq7k7fkqcgb6wmanic";
};
inherit python;
patches = [
# Patch from Debian that switches the version update change from
# enabled by default to disabled by default.
./no_updates_dialog.patch
# Patches from Debian that:
# - disable plugin installation (very insecure)
# - disables loading of web bug for privacy
# - switches the version update from enabled to disabled by default
(fetchpatch {
name = "disable_plugins.patch";
url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/disable_plugins.py-20111220183043-dcl08ccfagjxt1dv-1/disable_plugins.py";
sha256 = "19spdx52dhbrfn9lm084yl3cfwm6f90imd51k97sf7flmpl569pk";
})
(fetchpatch {
name = "links_privacy.patch";
url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/linksprivacy.patch-20160417214308-6hvive72pc0r4awc-1/links-privacy.patch";
sha256 = "0f6pq2b7q56pxrq2j8yqd7bksc623q2zgq29qcli30f13vga1w60";
})
(fetchpatch {
name = "no_updates_dialog.patch";
url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/no_updates_dialog.pa-20081231120426-rzzufl0zo66t3mtc-16/no_updates_dialog.patch";
sha256 = "16xwa2fa47jvs954fjrwr8rhh89aljgi1d1wrfxa40sknlmfwxif";
})
# the unrar patch is not from debian
] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
prePatch = ''
sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip/PyQt5':" \
setup/build_environment.py
# Remove unneeded files and libs
rm -rf resources/calibre-portable.* \
src/{chardet,cherrypy,html5lib,odf,routes}
'';
dontUseQmakeConfigure = true;
@ -34,14 +55,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];
buildInputs =
[ python pyqt5 sip poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw
pythonPackages.cssselect
];
buildInputs = [
python pyqt5 sip poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
] ++ (with pythonPackages; [
apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow sqlite3
# the following are distributed with calibre, but we use upstream instead
chardet cherrypy html5lib odfpy routes
]);
installPhase = ''
export HOME=$TMPDIR/fakehome

View file

@ -1,16 +0,0 @@
# Description: Disable update check by default.
Index: calibre/src/calibre/gui2/main.py
===================================================================
--- calibre.orig/src/calibre/gui2/main.py 2014-02-02 10:41:28.470954623 +0100
+++ calibre/src/calibre/gui2/main.py 2014-02-02 10:41:56.546954247 +0100
@@ -37,8 +37,8 @@
help=_('Start minimized to system tray.'))
parser.add_option('-v', '--verbose', default=0, action='count',
help=_('Ignored, do not use. Present only for legacy reasons'))
- parser.add_option('--no-update-check', default=False, action='store_true',
- help=_('Do not check for updates'))
+ parser.add_option('--update-check', dest='no_update_check', default=True, action='store_false',
+ help=_('Check for updates'))
parser.add_option('--ignore-plugins', default=False, action='store_true',
help=_('Ignore custom plugins, useful if you installed a plugin'
' that is preventing calibre from starting'))

View file

@ -0,0 +1,42 @@
{ stdenv, lib, fetchurl, dpkg, gtk, atk, glib, pango, gdk_pixbuf, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
];
in
stdenv.mkDerivation rec {
version = "0.7.6";
name = "hyperterm-${version}";
src = fetchurl {
url = https://github.com/zeit/hyperterm/releases/download/v0.7.1/hyperterm-0.7.1.deb;
sha256 = "1xdwhmzlkg1ly1xgsbv99xk4x1g1x270vx1b12dvf10ck5x9v63a";
};
buildInputs = [ dpkg ];
unpackPhase = ''
mkdir pkg
dpkg-deb -x $src pkg
sourceRoot=pkg
'';
installPhase = ''
mkdir -p "$out/bin"
ln -s "$out/opt/HyperTerm/HyperTerm" "$out/bin/HyperTerm"
mv opt "$out/"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/HyperTerm/HyperTerm"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/HyperTerm/resources/app/node_modules/child_pty/build/Release/exechelper"
mv usr/* "$out/"
'';
dontPatchELF = true;
meta = with lib; {
description = "A terminal built on web technologies";
homepage = https://hyperterm.org/;
maintainers = with maintainers; [ puffnfresh ];
license = licenses.mit;
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
version = "10786";
version = "10966";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "1dlb33nw8idipshiqy5p9vssdnkra3z2ixfixkj017b8wxdzvjpn";
sha256 = "0ggiilqfr7n4b2qik1ddlx9h0dwzglfk10y1zmzw9ij0gfbxn791";
};
phases = [ "installPhase" ];

View file

@ -1,17 +1,17 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte }:
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib }:
stdenv.mkDerivation rec {
name = "sakura-${version}";
version = "3.2.0";
version = "3.3.4";
src = fetchurl {
url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
sha256 = "1pfvc35kckrzik5wx8ywhkhclr52rfp2syg46ix2nsdm72q6dl90";
sha256 = "1fnkrkzf2ysav1ljgi4y4w8kvbwiwgmg1462xhizlla8jqa749r7";
};
nativeBuildInputs = [ cmake perl pkgconfig ];
buildInputs = [ gtk3 vte ];
buildInputs = [ gtk3 vte pcre glib ];
meta = with stdenv.lib; {
description = "A terminal emulator based on GTK and VTE";

View file

@ -1,33 +1,32 @@
{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft, fontconfig
, conf ? null, patches ? []}:
{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft
, fontconfig, conf ? null, patches ? []}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "st-0.6";
let patches' = if isNull patches then [] else patches;
in stdenv.mkDerivation rec {
name = "st-0.7";
src = fetchurl {
url = "http://dl.suckless.org/st/${name}.tar.gz";
sha256 = "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5";
sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000";
};
inherit patches;
patches = patches' ++ [ ./st-fix-deletekey.patch ];
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
NIX_LDFLAGS = "-lfontconfig";
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out
'';
meta = {
homepage = http://st.suckless.org/;
license = stdenv.lib.licenses.mit;
maintainers = with maintainers; [viric];
maintainers = with maintainers; [viric andsild];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,15 @@
diff --git a/config.def.h b/config.def.h
index 1896246..b41747f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -315,8 +315,8 @@ static Key key[] = {
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
{ XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
+ { XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0},
+ { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0},
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0},
{ XK_Home, ShiftMask, "\033[2J", 0, -1, 0},

View file

@ -0,0 +1,2 @@
source 'http://rubygems.org'
gem 'taskjuggler'

View file

@ -0,0 +1,21 @@
GEM
remote: http://rubygems.org/
specs:
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.6.1)
taskjuggler (3.5.0)
mail (>= 2.4.3)
term-ansicolor (>= 1.0.7)
term-ansicolor (1.3.2)
tins (~> 1.0)
tins (1.6.0)
PLATFORMS
ruby
DEPENDENCIES
taskjuggler
BUNDLED WITH
1.10.5

View file

@ -0,0 +1,17 @@
{ lib, bundlerEnv, ruby }:
bundlerEnv {
name = "taskjuggler-3.5.0";
inherit ruby;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
meta = {
description = "A modern and powerful project management tool";
homepage = http://taskjuggler.org/;
license = lib.licenses.gpl2;
platforms = lib.platforms.unix;
};
}

View file

@ -0,0 +1,47 @@
{
"mail" = {
version = "2.6.3";
source = {
type = "gem";
sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
};
dependencies = [
"mime-types"
];
};
"mime-types" = {
version = "2.6.1";
source = {
type = "gem";
sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
};
};
"taskjuggler" = {
version = "3.5.0";
source = {
type = "gem";
sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2";
};
dependencies = [
"mail"
"term-ansicolor"
];
};
"term-ansicolor" = {
version = "1.3.2";
source = {
type = "gem";
sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
};
dependencies = [
"tins"
];
};
"tins" = {
version = "1.6.0";
source = {
type = "gem";
sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
};
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoconf, automake, SDL, SDL_image }:
{ stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }:
stdenv.mkDerivation rec {
name = "vp-${version}";
@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "08q6xrxsyj6vj0sz59nix9isqz84gw3x9hym63lz6v8fpacvykdq";
};
buildInputs = [ SDL autoconf automake SDL_image ];
nativeBuildInputs = [ autoreconfHook ];
preConfigure = ''
autoreconf -i
'';
buildInputs = [ SDL SDL_image ];
NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL -I${SDL_image}/include/SDL";
meta = with stdenv.lib; {
homepage = http://brlcad.org/~erik/;

View file

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "0brpkjg1rcq8c0h5hnzqg3bg4jj805dph67zzramlcvbr44a06r6";
sha256bin64 = "0zqa40xz0v715ggb1g2hc2085k65m24mf8xl1n2fzj7k21hf7bkc";
version = "53.0.2785.34";
sha256 = "1w7h24jblbpvg49iap1cpsd0gwal1p7m7i2yqw12rcn0hqz4hc31";
sha256bin64 = "006pksc1ibdqcshsal55ps4qizj706zh1jrph6152znafl5hjb7i";
version = "53.0.2785.92";
};
dev = {
sha256 = "1c73jfy11l4qiy553a3lvmd8kb29i25az6i5a4azmfc1abriwhjn";
sha256bin64 = "06r53fnwp8v5drh3ilplqbwcak954gcgclc8mqq3mlx5530fp6fv";
version = "54.0.2816.0";
sha256 = "1n6cq9fani9cl4qxx82iaiv40n4d6y5ns9mk63na1m5pdcjbaqhw";
sha256bin64 = "0iypx2p7xqc03i5mc85ilf162gdpn4x2vkb1kgzhlzhq8nvq0y9d";
version = "54.0.2840.8";
};
stable = {
sha256 = "00d16yr8d9280b2rcjmjxkqvdzgy6a7l7fmnsjrj8404vcgax551";
sha256bin64 = "0knlxgcv3wfvpgysaxb83agmp88n4ljmyx40j4r8wb5cisnl6cs8";
version = "52.0.2743.116";
sha256 = "1w7h24jblbpvg49iap1cpsd0gwal1p7m7i2yqw12rcn0hqz4hc31";
sha256bin64 = "0nma1h5npx6vp5fww50xdznadq7yf5604w02w8h5mq3an4pn4g1j";
version = "53.0.2785.92";
};
}

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "nomad-${version}";
version = "0.4.0";
version = "0.4.1";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/nomad";
@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "nomad";
inherit rev;
sha256 = "0c6qrprb33fb3y4d1xn3df0nvh0hsnqccq6xaab0jb40cbz3048p";
sha256 = "093nljhibphhccjwxkylbvlc8dh8g2js36mlxxdh9nh21b3mghcs";
};
meta = with stdenv.lib; {

View file

@ -35,7 +35,9 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
;
NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm '';
NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm
-DHAVE_INTTYPES_H -D__GLIBC__
-D__need_timeval -D__need_timespec -D__need_time_t '';
meta = {
homepage = "http://www.creytiv.com/baresip.html";
platforms = with stdenv.lib.platforms; linux;

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat
, alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd
, mesa_noglu, xcbutilkeysyms, xdg_utils }:
, mesa_noglu, xcbutilkeysyms, xdg_utils, libtool }:
let
@ -31,6 +31,7 @@ let
dbus
alsaLib
zlib
libtool
libxml2
libxslt
expat

View file

@ -1,32 +1,36 @@
{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev
, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip
, mediastreamer-openh264, makeWrapper
, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
, libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl
}:
stdenv.mkDerivation rec {
name = "linphone-3.8.5";
baseName = "linphone";
version = "3.10.2";
name = "${baseName}-${version}";
src = fetchurl {
url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz";
sha256 = "10brlbwkk61nhd5v2sim1vfv11xm138l1cqqh3imhs2sigmzzlax";
src = fetchFromGitHub {
owner = "BelledonneCommunications";
repo = "${baseName}";
rev = "${version}";
sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p";
};
buildInputs = [
readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango
];
nativeBuildInputs = [ intltool pkgconfig makeWrapper ];
nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ];
configureFlags = [
"--enable-ldap"
"--with-ffmpeg=${ffmpeg.dev}"
"--with-polarssl=${polarssl}"
"--enable-lime"
"--enable-external-ortp"
"--enable-external-mediastreamer"
];
NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0
-I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/
-I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0
-I${gtk2}/lib/gtk-2.0/include
-DLIBLINPHONE_GIT_VERSION=\"v${version}\"
";
postInstall = ''
for i in $(cd $out/bin && ls); do

View file

@ -4,7 +4,7 @@
qtbase, qtsvg, qttools, qmakeHook, qttranslations, sqlcipher }:
let
version = "1.4.1";
version = "1.5.0";
revision = "v${version}";
in
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "tux3";
repo = "qTox";
rev = revision;
sha256 = "1n0bfcfc90pnh0bzas7gv60jicsg9vpfwhhln9hkllsrimjvcdq5";
sha256 = "1na2qqzbdbjfw8kymxw5jfglslmw18fz3vpw805pqg4d5y7f7vsi";
};
buildInputs =

View file

@ -1,22 +1,23 @@
{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses
, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }:
{ stdenv, fetchFromGitHub, libsodium, ncurses, curl
, libtoxcore-dev, openal, libvpx, freealut, libconfig, pkgconfig
, libqrencode }:
stdenv.mkDerivation rec {
name = "toxic-dev-20150125";
name = "toxic-dev-20160728";
src = fetchFromGitHub {
owner = "Tox";
repo = "toxic";
rev = "4badc983ea";
sha256 = "01zk6316v51f1zvp5ss53ay49h3nnaq5snlk0gxmsrmwg71bsnm6";
rev = "cb21672600206423c844306a84f8b122e534c348";
sha256 = "1nq1xnbyjfrk8jrjvk5sli1bm3i9r8b4m8f4xgmiz68mx1r3fn5k";
};
makeFlags = [ "-Cbuild" "PREFIX=$(out)" ];
makeFlags = [ "PREFIX=$(out)" ];
installFlags = [ "PREFIX=$(out)" ];
nativeBuildInputs = [ pkgconfig libconfig ];
buildInputs = [
autoconf libtool automake libtoxcore libsodium ncurses
libconfig pkgconfig
libtoxcore-dev libsodium ncurses libqrencode curl
] ++ stdenv.lib.optionals (!stdenv.isArm) [
openal libvpx freealut
];

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "utox-${version}";
version = "0.9.4";
version = "0.9.8";
src = fetchFromGitHub {
owner = "GrayHatter";
repo = "uTox";
rev = "v${version}";
sha256 = "0kcz8idjsf3vc94ccxqkwnqdj5q1m8c720nsvixk25klzws2cshv";
sha256 = "0ahwdwqhi1gmvw80jihc1ba4cqqnx8ifjnzazxidfdky4ikzccmn";
};
buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip, firefox-unwrapped, makeWrapper }:
stdenv.mkDerivation rec {
name = "chatzilla-0.9.91";
name = "chatzilla-0.9.92";
src = fetchurl {
# Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp";
sha256 = "1bmjw2wvp8gh7fdl8czkxc55iari6dy672446hps20xixrh8hl8r";
sha256 = "09asg7ixjrin46xd19ri71g4jdrgb1gg0pk0lwk0dlb1qjxyf1xy";
};
buildInputs = [ unzip makeWrapper ];

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
};
cmakeFlags = with stdenv.lib; []
++ optional stdenv.isDarwin "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
++ optional (!guileSupport) "-DENABLE_GUILE=OFF"
++ optional (!luaSupport) "-DENABLE_LUA=OFF"
++ optional (!perlSupport) "-DENABLE_PERL=OFF"

View file

@ -11,7 +11,7 @@ assert withQt -> !withGtk && qt4 != null;
with stdenv.lib;
let
version = "2.0.5";
version = "2.2.0";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in
@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
sha256 = "02xi3fz8blcz9cf75rs11g7bijk06wm45vpgnksp72c2609j9q0c";
sha256 = "010i7wpsv2231pwb1xdqs0xfwywi3514siidv6wnrfpw3rs7x156";
};
buildInputs = [

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, go }:
stdenv.mkDerivation rec {
version = "0.14.5";
version = "0.14.6";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "172ca3xgc3dp9yiqm3fmq696615jnclgfg521sh5mk78na1r4mgz";
sha256 = "1w8a46c6r3rddfl9xbx7j2mavai4dm9h8flpm4qr0bsd6whf60hz";
};
buildInputs = [ go ];

View file

@ -1,52 +1,25 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, bundlerEnv, ruby
{ lib, bundlerEnv, ruby
, withPostgresql ? true, postgresql
, withSqlite ? false, sqlite
}:
let
_name = "ledger-web";
cmd = "ledger_web";
bundlerEnv rec {
name = "ledger-web-${version}";
env = bundlerEnv {
name = _name;
inherit ruby;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
meta = with lib; {
homepage = https://github.com/peterkeen/ledger-web;
platforms = platforms.linux;
maintainers = [ peterhoeg ];
license = licenses.mit;
};
version = (import gemset).ledger_web.version;
inherit ruby;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
buildInputs = lib.optional withPostgresql postgresql
++ lib.optional withSqlite sqlite;
meta = with lib; {
description = "A web frontend to the Ledger CLI tool";
homepage = https://github.com/peterkeen/ledger-web;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
};
in stdenv.mkDerivation rec {
name = "${_name}-${version}";
version = "1.5.2";
buildInputs = [ env ruby makeWrapper ]
++ lib.optional withPostgresql postgresql
++ lib.optional withSqlite sqlite;
src = fetchFromGitHub {
owner = "peterkeen";
repo = _name;
rev = "v${version}";
sha256 = "0an4d46h3pp7a8s96jl0dnw1imwdgnb2j474b9wrbidwc6cmfrm7";
};
dontStrip = true;
installPhase = ''
mkdir -p $out
cp --no-preserve=mode -r bin lib $out
chmod 0755 $out/bin/${cmd}
wrapProgram $out/bin/${cmd} \
--set BUNDLE_BIN ${env.bundler}/bin/bundle \
--set GEM_PATH ${env}/${env.ruby.gemPath}
'';
}

View file

@ -20,6 +20,8 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
# Skip byte-compiling of emacs-lisp files because this is currently
# broken in ledger...
postInstall = ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:
{ stdenv, fetchurl, lib, bash, firefox, perl, unzipNLS, xorg }:
let
@ -30,7 +30,7 @@ stdenv.mkDerivation {
unzip "${xpi}" -d "$out/libexec/zotero"
BUILDID=`date +%Y%m%d`
GECKO_VERSION="${firefox.passthru.version}"
GECKO_VERSION="${lib.removeSuffix "esr" firefox.passthru.version}"
UPDATE_CHANNEL="default"
# Copy branding
@ -52,8 +52,8 @@ stdenv.mkDerivation {
# Copy application.ini and modify
cp assets/application.ini "$out/libexec/zotero/application.ini"
perl -pi -e "s/{{VERSION}}/$version/" "$out/libexec/zotero/application.ini"
perl -pi -e "s/{{BUILDID}}/$BUILDID/" "$out/libexec/zotero/application.ini"
perl -pi -e "s/\{\{VERSION}}/$version/" "$out/libexec/zotero/application.ini"
perl -pi -e "s/\{\{BUILDID}}/$BUILDID/" "$out/libexec/zotero/application.ini"
perl -pi -e "s/^MaxVersion.*\$/MaxVersion=$GECKO_VERSION/" "$out/libexec/zotero/application.ini"
# Copy prefs.js and modify

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
"http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
"http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
];
sha256 = "1i5hi8grfl5zyh8py63zn39rg019bd90h2l312iswbgai6nyfdw0";
sha256 = "17mnqxnyibmzf5vvbnyhsd010zykqw8ikx4pvyj0x9sfyhpvgfix";
};
buildInputs = [ tcsh yap perl patchelf ];

View file

@ -1,20 +1,26 @@
{ stdenv, fetchurl, git, openssl }:
{ stdenv, fetchFromGitHub, git, makeWrapper, openssl }:
stdenv.mkDerivation rec {
name = "transcrypt-0.9.7";
name = "transcrypt-${version}";
version = "0.9.9";
src = fetchurl {
url = https://github.com/elasticdog/transcrypt/archive/v0.9.7.tar.gz;
sha256 = "0pgrf74wdc7whvwz7lkkq6qfk38n37dc5668baq7czgckibvjqdh";
src = fetchFromGitHub {
owner = "elasticdog";
repo = "transcrypt";
rev = "v${version}";
sha256 = "0brsgj3qmvkgxzqqamk8krwyarwff1dlb3jjd09snnbfl0kdq1a5";
};
buildInputs = [ git openssl ];
buildInputs = [ git makeWrapper openssl ];
installPhase = ''
install -m 755 -D transcrypt $out/bin/transcrypt
install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1
install -m 644 -D contrib/bash/transcrypt $out/share/bash-completion/completions/transcrypt
install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt
wrapProgram $out/bin/transcrypt \
--prefix PATH : "${stdenv.lib.makeBinPath [ git openssl ]}"
'';
meta = with stdenv.lib; {

View file

@ -1,56 +1,70 @@
{ stdenv, fetchurl, fetchFromGitHub, docutils, makeWrapper, perl, pkgconfig
, python, which, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs
, lua, lua5_sockets
, libuchardet, rubberband
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, sdl2Support? true, SDL2 ? null
, alsaSupport ? true, alsaLib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? true, libvdpau ? null
, dvdreadSupport? true, libdvdread ? null
, dvdnavSupport ? true, libdvdnav ? null
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? false, libjack2 ? null
, pulseSupport ? true, libpulseaudio ? null
, bs2bSupport ? true, libbs2b ? null
# For screenshots
, libpngSupport ? true, libpng ? null
# for Youtube support
, youtubeSupport ? true, youtube-dl ? null
, cacaSupport ? true, libcaca ? null
, vaapiSupport ? false, libva ? null
, waylandSupport ? false, wayland ? null, libxkbcommon ? null
{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg
, freefont_ttf, freetype, libass, libpthreadstubs
, lua, lua5_sockets, libuchardet, rubberband
, x11Support ? true,
mesa ? null,
libX11 ? null,
libXext ? null,
libXxf86vm ? null
, waylandSupport ? false,
wayland ? null,
libxkbcommon ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, sdl2Support ? true, SDL2 ? null
, alsaSupport ? true, alsaLib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? true, libvdpau ? null
, dvdreadSupport ? true, libdvdread ? null
, dvdnavSupport ? true, libdvdnav ? null
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, pulseSupport ? true, libpulseaudio ? null
, bs2bSupport ? true, libbs2b ? null
, cacaSupport ? true, libcaca ? null
, libpngSupport ? true, libpng ? null
, youtubeSupport ? true, youtube-dl ? null
, vapoursynthSupport ? false, vapoursynth ? null
, jackaudioSupport ? false, libjack2 ? null
, vaapiSupport ? false, libva ? null
# scripts you want to be loaded by default
, scripts ? []
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
assert sdl2Support -> SDL2 != null;
assert alsaSupport -> alsaLib != null;
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
assert dvdreadSupport -> libdvdread != null;
assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> libjack2 != null;
assert pulseSupport -> libpulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
assert youtubeSupport -> youtube-dl != null;
assert cacaSupport -> libcaca != null;
assert waylandSupport -> (wayland != null && libxkbcommon != null);
with stdenv.lib;
let
available = x: x != null;
in
assert x11Support -> all available [mesa libX11 libXext libXxf86vm];
assert waylandSupport -> all available [wayland libxkbcommon];
assert xineramaSupport -> x11Support && available libXinerama;
assert xvSupport -> x11Support && available libXv;
assert sdl2Support -> available SDL2;
assert alsaSupport -> available alsaLib;
assert screenSaverSupport -> available libXScrnSaver;
assert vdpauSupport -> available libvdpau;
assert dvdreadSupport -> available libdvdread;
assert dvdnavSupport -> available libdvdnav;
assert bluraySupport -> available libbluray;
assert speexSupport -> available speex;
assert theoraSupport -> available libtheora;
assert pulseSupport -> available libpulseaudio;
assert bs2bSupport -> available libbs2b;
assert cacaSupport -> available libcaca;
assert libpngSupport -> available libpng;
assert youtubeSupport -> available youtube-dl;
assert vapoursynthSupport -> available vapoursynth;
assert jackaudioSupport -> available libjack2;
assert vaapiSupport -> available libva;
let
inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
# Purity: Waf is normally downloaded by bootstrap.py, but
# for purity reasons this behavior should be avoided.
wafVersion = "1.8.12";
@ -59,16 +73,14 @@ let
"http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ];
sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1";
};
in
stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
name = "mpv-${version}";
version = "0.19.0";
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
repo = "mpv";
rev = "v${version}";
sha256 = "14rbglrcplhkf16ik4fbcv7k27lz6h4glfayr12ylh98srmsscqa";
};
@ -80,60 +92,65 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-libmpv-shared"
"--enable-manpage-build"
"--enable-zsh-comp"
"--disable-libmpv-static"
"--disable-static-build"
"--enable-manpage-build"
"--disable-build-date" # Purity
"--enable-zsh-comp"
] ++ optional vaapiSupport "--enable-vaapi"
++ optional waylandSupport "--enable-wayland";
(enableFeature vaapiSupport "vaapi")
(enableFeature waylandSupport "wayland")
];
configurePhase = ''
python ${waf} configure --prefix=$out $configureFlags
python3 ${waf} configure --prefix=$out $configureFlags
'';
nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python which ];
nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ];
buildInputs = [
ffmpeg freetype libass libpthreadstubs lua lua5_sockets libuchardet rubberband
] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional xineramaSupport libXinerama
++ optional dvdreadSupport libdvdread
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray
++ optional jackaudioSupport libjack2
++ optional pulseSupport libpulseaudio
ffmpeg freetype libass libpthreadstubs
lua lua5_sockets libuchardet rubberband
] ++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional xineramaSupport libXinerama
++ optional dvdreadSupport libdvdread
++ optional bluraySupport libbluray
++ optional jackaudioSupport libjack2
++ optional pulseSupport libpulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau
++ optional speexSupport speex
++ optional bs2bSupport libbs2b
++ optional libpngSupport libpng
++ optional youtubeSupport youtube-dl
++ optional sdl2Support SDL2
++ optional cacaSupport libcaca
++ optional vaapiSupport libva
++ optionals waylandSupport [ wayland libxkbcommon ];
++ optional vdpauSupport libvdpau
++ optional speexSupport speex
++ optional bs2bSupport libbs2b
++ optional libpngSupport libpng
++ optional youtubeSupport youtube-dl
++ optional sdl2Support SDL2
++ optional cacaSupport libcaca
++ optional vaapiSupport libva
++ optional vapoursynthSupport vapoursynth
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optionals waylandSupport [ wayland libxkbcommon ];
enableParallelBuilding = true;
buildPhase = ''
python ${waf} build
python3 ${waf} build
'';
installPhase = ''
python ${waf} install
python3 ${waf} install
# Use a standard font
mkdir -p $out/share/mpv
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
'' + optionalString youtubeSupport ''
# Ensure youtube-dl is available in $PATH for MPV
wrapProgram $out/bin/mpv \
--add-flags "--script=${concatStringsSep "," scripts}" \
'' + optionalString youtubeSupport ''
--prefix PATH : "${youtube-dl}/bin" \
--add-flags "--script=${concatStringsSep "," scripts}"
'' + optionalString vapoursynthSupport ''
--prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH"
'';
meta = with stdenv.lib; {

View file

@ -76,5 +76,9 @@ stdenv.mkDerivation rec {
homepage = http://www.videolan.org/vlc/;
platforms = platforms.linux;
license = licenses.lgpl21Plus;
broken =
if withQt5
then builtins.compareVersions qtbase.version "5.7.0" >= 0
else false;
};
}

View file

@ -4,15 +4,15 @@
let
# Always get the information from
# https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk
coreosImageRelease = "1097.0.0";
coreosImageSystemdVersion = "229";
coreosImageRelease = "1151.0.0";
coreosImageSystemdVersion = "231";
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
stage1Flavours = [ "coreos" "fly" ];
stage1Dir = "lib/rkt/stage1-images";
in stdenv.mkDerivation rec {
version = "1.12.0";
version = "1.14.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";
@ -20,12 +20,12 @@ in stdenv.mkDerivation rec {
rev = "v${version}";
owner = "coreos";
repo = "rkt";
sha256 = "0fkjhmssxyx2q699zcif5fvnpcs50l9pqrvy680dw670wsl3b7s7";
sha256 = "0wniknmsv6xml3cp6ggjlqvcpwhp4bw1dqdnbm561mchvm69zhc2";
};
stage1BaseImage = fetchurl {
url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
sha256 = "0dzp0vsjbipx8mcikrc5l7k3qjrg4y7h63r2nx6cycy7qhcmj85a";
sha256 = "1j75ad1g217aqar84m9ycl2m71g821hq9yahl4bgjaipx9xnj23g";
};
buildInputs = [

View file

@ -1,20 +1,23 @@
# Functions to build elisp files to locally configure emcas buffers.
# See https://github.com/shlevy/nix-buffer
{ runCommand }:
{ lib, writeText }:
{
withPackages = pkgs: runCommand "dir-locals.el" { inherit pkgs; } ''
echo "(make-local-variable 'process-environment)" >> $out
echo "(setenv \"PATH\" (concat" >> $out
for pkg in $pkgs; do
echo " \"$pkg/bin:$pkg/sbin\"" >> $out
done
echo " (getenv \"PATH\")))" >> $out
echo -n "(setq-local exec-path (append '(" >> $out
for pkg in $pkgs; do
echo -en "\n \"$pkg/bin\" \"$pkg/sbin\"" >> $out
done
echo -e ")\\n exec-path))" >> $out
'';
withPackages = pkgs: let
coqs = builtins.filter (x: (builtins.parseDrvName x.name).name == "coq") pkgs;
coq = builtins.head coqs;
pg-setup = if builtins.length coqs == 0 then "" else ''
(setq-local coq-prog-name "${coq}/bin/coqtop")
(setq-local coq-dependency-analyzer "${coq}/bin/coqdep")
(setq-local coq-compiler "${coq}/bin/coqc")
(setq-local coq-library-directory (get-coq-library-directory))
(coq-prog-args)
'';
in writeText "dir-locals.el" ''
(make-local-variable 'process-environment)
(setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH")))
(setq-local exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path))
${pg-setup}
'';
}

View file

@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
# See http://dejavu-fonts.org/wiki/License for details
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "unifont-${version}";
version = "9.0.01";
version = "9.0.02";
ttf = fetchurl {
url = "http://fossies.org/linux/unifont/font/precompiled/${name}.ttf";
sha256 = "0n2vdzrp86bjxfyqgmryrqckmjiiz4jvsfz9amgg3dv2p42y0dhd";
sha256 = "14a254gpfyr2ssmbxqwfvh6166vc4klnx2vgz4nybx52bnr9qfkm";
};
pcf = fetchurl {
url = "http://fossies.org/linux/unifont/font/precompiled/${name}.pcf.gz";
sha256 = "1n3zff46pk6s2x5y7h76aq7h9wfq2acv77gpmxkhz5iwvbpxgb4z";
sha256 = "07wn2hlx1x22d2nil0zgsrlgy9b2hdhwly37sr70shp8lkba7wn2";
};
buildInputs = [ mkfontscale mkfontdir ];

View file

@ -1,19 +1,28 @@
{ stdenv, fetchurl, efl, automake, autoconf, libtool, pkgconfig, gst_all_1
, makeWrapper, lib }:
{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "rage-${version}";
version = "0.2.0";
version = "0.2.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz";
sha256 = "06fxhznwbd5x341r8ml3cpwmvwn0aq9i1akcgclk4vjdqiyff1d9";
sha256 = "0xlxb1hmbnqcy088cqpj2i87hsd5h3da7d2f9afiavz0ssw4ll94";
};
nativeBuildInputs = [
automake autoconf libtool pkgconfig makeWrapper
pkgconfig
wrapGAppsHook
];
buildInputs = [
efl
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-libav
];
NIX_CFLAGS_COMPILE = [
"-I${efl}/include/ecore-con-1"
"-I${efl}/include/ecore-evas-1"
@ -29,28 +38,10 @@ stdenv.mkDerivation rec {
"-I${efl}/include/ethumb-client-1"
];
buildInputs = [
efl
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-libav
];
configurePhase = ''
./autogen.sh --prefix=$out
'';
postInstall = ''
wrapProgram $out/bin/rage \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
meta = {
description = "Video + Audio player along the lines of mplayer";
homepage = http://enlightenment.org/;
maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ];
maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;
};

View file

@ -1,8 +1,8 @@
{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
, pkgconfig, gtk3, glib, libnotify, gtkspell3
, makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite
, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf }:
let
majVer = gnome3.version;
@ -11,18 +11,22 @@ in stdenv.mkDerivation rec {
doCheck = true;
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
gnome3.evolution_data_server ];
propagatedBuildInputs = [ gnome3.gtkhtml ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
gnome3.evolution_data_server libsecret libical gcr
webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
nss nspr libnotify procps highlight gnome3.libgweather
gnome3.gsettings_desktop_schemas makeWrapper ];
gnome3.gsettings_desktop_schemas dconf
gnome3.libgnome_keyring gnome3.glib_networking ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
"--disable-libcryptui" ];
@ -31,14 +35,6 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
preFixup = ''
for f in $out/bin/* $out/libexec/*; do
wrapProgram "$f" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
done
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Evolution;
description = "Personal information management application that provides integrated mail, calendaring and address book functionality";

View file

@ -1,7 +1,8 @@
{stdenv, fetchurl
, libtool, autoconf, automake
, gmp, mpfr, libffi, makeWrapper
, noUnicode ? false,
, noUnicode ? false
, gcc
}:
let
s = # Generated upstream information
@ -17,7 +18,7 @@ let
libtool autoconf automake makeWrapper
];
propagatedBuildInputs = [
libffi gmp mpfr
libffi gmp mpfr gcc
];
in
stdenv.mkDerivation {
@ -43,6 +44,7 @@ stdenv.mkDerivation {
postInstall = ''
sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
wrapProgram "$out/bin/ecl" \
--prefix PATH ':' "${gcc}/bin" \
--prefix NIX_LDFLAGS ' ' "-L${gmp.lib or gmp.out or gmp}/lib" \
--prefix NIX_LDFLAGS ' ' "-L${libffi.lib or libffi.out or libffi}/lib"
'';

View file

@ -64,10 +64,6 @@ stdenv.mkDerivation rec {
installFlags = "-C src/ocaml-output";
postInstall = ''
# Workaround for FStarLang/FStar#456
mv $out/lib/fstar/* $out/lib/
rmdir $out/lib/fstar
wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin"
'';

View file

@ -1,95 +0,0 @@
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
let
loader386 = "${glibc.out}/lib/ld-linux.so.2";
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
in
stdenv.mkDerivation {
name = "go-1.0.3";
src = fetchurl {
url = http://go.googlecode.com/files/go1.0.3.src.tar.gz;
sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz";
};
buildInputs = [ bison glibc bash makeWrapper ];
# I'm not sure what go wants from its 'src', but the go installation manual
# describes an installation keeping the src.
preUnpack = ''
mkdir -p $out/share
cd $out/share
'';
prePatch = ''
cd ..
if [ ! -d go ]; then
mv * go
fi
cd go
patchShebangs ./ # replace /bin/bash
# !!! substituteInPlace does not seems to be effective.
sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
#sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
# -e 's,/bin/echo,${coreutils}/bin/echo,' \
# src/pkg/exec/exec_test.go
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
# The os test wants to read files in an existing path. Just it don't be /usr/bin.
sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
'';
patches = [ ./cacert.patch ./1_0-opt-error.patch ./1_0-gcc-bug.patch ];
GOOS = "linux";
GOARCH = if stdenv.system == "i686-linux" then "386"
else if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "armv5tel-linux" then "arm"
else throw "Unsupported system";
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
installPhase = ''
mkdir -p "$out/bin"
export GOROOT="$(pwd)/"
export GOBIN="$out/bin"
export PATH="$GOBIN:$PATH"
cd ./src
./all.bash
cd -
# Wrap the tools to define the location of the
# libraries.
for a in go gofmt godoc; do
wrapProgram "$out/bin/$a" \
--set "GOROOT" $out/share/go \
${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""}
done
# Copy the emacs configuration for Go files.
mkdir -p "$out/share/emacs/site-lisp"
cp ./misc/emacs/* $out/share/emacs/site-lisp/
'';
meta = {
branch = "1.0";
homepage = http://golang.org/;
description = "The Go Programming language";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [ pierron viric ];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -2,6 +2,6 @@
callPackage ./generic.nix (rec {
inherit Foundation libobjc;
version = "4.4.1.0";
sha256 = "0jibyvyv2jy8dq5ij0j00iq3v74r0y90dcjc3dkspcfbnn37cphn";
version = "4.4.2.11";
sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h";
})

View file

@ -0,0 +1,7 @@
{ stdenv, callPackage, Foundation, libobjc }:
callPackage ./generic.nix (rec {
inherit Foundation libobjc;
version = "4.6.0.182";
sha256 = "1sajwl7fqhkcmh697qqjj4z6amzkay7xf7npsvpm10gm071s5qi6";
})

View file

@ -0,0 +1,44 @@
{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz }:
stdenv.mkDerivation rec {
version = "1.0.0";
name = "souffle-${version}";
src = fetchFromGitHub {
owner = "souffle-lang";
repo = "souffle";
rev = version;
sha256 = "13j14227dgxcm25z9iizcav563wg2ak9338pb03aqqz8yqxbmz4n";
};
buildInputs = [
autoconf automake boost bison flex openjdk
# Used for docs
doxygen perl graphviz
];
patchPhase = ''
substituteInPlace configure.ac \
--replace "m4_esyscmd([git describe --tags --abbrev=0 | tr -d '\n'])" "${version}"
'';
# Without this, we get an obscure error about not being able to find a library version
# without saying what library it's looking for. Turns out it's searching global paths
# for boost and failing there, so we tell it what's what here.
configureFlags = [ "--with-boost-libdir=${boost}/lib" ];
preConfigure = "./bootstrap";
enableParallelBuilding = true;
# See https://github.com/souffle-lang/souffle/issues/176
hardeningDisable = [ "fortify" ];
meta = with stdenv.lib; {
description = "A translator of declarative Datalog programs into the C++ language";
homepage = "http://souffle-lang.github.io/";
platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin ];
license = licenses.upl;
};
}

View file

@ -896,7 +896,7 @@ self: super: {
dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; };
# Haste stuff
haste-Cabal = self.callPackage ../tools/haskell/haste/haste-Cabal.nix {};
haste-Cabal = markBroken (self.callPackage ../tools/haskell/haste/haste-Cabal.nix {});
haste-cabal-install = self.callPackage ../tools/haskell/haste/haste-cabal-install.nix { Cabal = self.haste-Cabal; };
haste-compiler = self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; };

View file

@ -63,10 +63,6 @@ self: super: {
nats = dontHaddock super.nats;
bytestring-builder = dontHaddock super.bytestring-builder;
hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
# Setup: At least the following dependencies are missing: base <4.8
hspec-expectations = overrideCabal super.hspec-expectations (drv: {
postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
@ -205,16 +201,20 @@ self: super: {
hackage-security = dontHaddock (dontCheck super.hackage-security);
# GHC versions prior to 8.x require additional build inputs.
aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale";
aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
bytes = addBuildDepend super.bytes self.doctest;
hslogger = addBuildDepend super.hslogger self.HUnit;
semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
Glob = addBuildDepends super.Glob (with self; [semigroups]);
Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale";
bytes = addBuildDepend super.bytes self.doctest;
case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
hslogger = addBuildDepend super.hslogger self.HUnit;
intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
texmath = addBuildDepend super.texmath self.network-uri;
yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
# cereal must have `fail` in pre-ghc-8.0.x versions
# also tests require bytestring>=0.10.8.1
cereal = dontCheck (addBuildDepend super.cereal self.fail);

View file

@ -220,6 +220,7 @@ self: super: {
"DOM" = dontDistribute super."DOM";
"DP" = dontDistribute super."DP";
"DPM" = dontDistribute super."DPM";
"DPutils" = dontDistribute super."DPutils";
"DSA" = dontDistribute super."DSA";
"DSH" = dontDistribute super."DSH";
"DSTM" = dontDistribute super."DSTM";
@ -673,6 +674,7 @@ self: super: {
"NestedFunctor" = dontDistribute super."NestedFunctor";
"NestedSampling" = dontDistribute super."NestedSampling";
"NetSNMP" = dontDistribute super."NetSNMP";
"Network-NineP" = doDistribute super."Network-NineP_0_4_0";
"NewBinary" = dontDistribute super."NewBinary";
"Ninjas" = dontDistribute super."Ninjas";
"NoSlow" = dontDistribute super."NoSlow";
@ -808,6 +810,7 @@ self: super: {
"RoyalMonad" = dontDistribute super."RoyalMonad";
"RxHaskell" = dontDistribute super."RxHaskell";
"SBench" = dontDistribute super."SBench";
"SCalendar" = dontDistribute super."SCalendar";
"SConfig" = dontDistribute super."SConfig";
"SDL" = dontDistribute super."SDL";
"SDL-gfx" = dontDistribute super."SDL-gfx";
@ -821,6 +824,7 @@ self: super: {
"SFont" = dontDistribute super."SFont";
"SG" = dontDistribute super."SG";
"SGdemo" = dontDistribute super."SGdemo";
"SGplus" = dontDistribute super."SGplus";
"SHA2" = dontDistribute super."SHA2";
"SMTPClient" = dontDistribute super."SMTPClient";
"SNet" = dontDistribute super."SNet";
@ -1156,6 +1160,7 @@ self: super: {
"alarmclock" = doDistribute super."alarmclock_0_2_0_9";
"alea" = dontDistribute super."alea";
"alex-meta" = dontDistribute super."alex-meta";
"alex-tools" = dontDistribute super."alex-tools";
"alfred" = dontDistribute super."alfred";
"alga" = dontDistribute super."alga";
"algebra" = dontDistribute super."algebra";
@ -1871,6 +1876,7 @@ self: super: {
"chp-spec" = dontDistribute super."chp-spec";
"chp-transformers" = dontDistribute super."chp-transformers";
"chronograph" = dontDistribute super."chronograph";
"chronos" = dontDistribute super."chronos";
"chu2" = dontDistribute super."chu2";
"chuchu" = dontDistribute super."chuchu";
"chunked-data" = doDistribute super."chunked-data_0_2_0";
@ -2061,6 +2067,7 @@ self: super: {
"conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
"conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
"conf" = dontDistribute super."conf";
"conffmt" = dontDistribute super."conffmt";
"config-manager" = dontDistribute super."config-manager";
"config-select" = dontDistribute super."config-select";
"config-value" = dontDistribute super."config-value";
@ -2149,6 +2156,7 @@ self: super: {
"cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
"cpsa" = dontDistribute super."cpsa";
"cpuid" = dontDistribute super."cpuid";
"cpuinfo" = dontDistribute super."cpuinfo";
"cpuperf" = dontDistribute super."cpuperf";
"cpython" = dontDistribute super."cpython";
"cql" = doDistribute super."cql_3_0_7";
@ -2167,6 +2175,7 @@ self: super: {
"craftwerk" = dontDistribute super."craftwerk";
"craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
"craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
"crawlchain" = dontDistribute super."crawlchain";
"craze" = dontDistribute super."craze";
"crc" = dontDistribute super."crc";
"crc16" = dontDistribute super."crc16";
@ -2440,6 +2449,7 @@ self: super: {
"demarcate" = dontDistribute super."demarcate";
"denominate" = dontDistribute super."denominate";
"dense" = dontDistribute super."dense";
"dependent-map" = doDistribute super."dependent-map_0_2_2_0";
"dependent-state" = dontDistribute super."dependent-state";
"depends" = dontDistribute super."depends";
"dephd" = dontDistribute super."dephd";
@ -2473,6 +2483,7 @@ self: super: {
"diagrams-boolean" = dontDistribute super."diagrams-boolean";
"diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_1";
"diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_5";
"diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_11";
"diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
"diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
"diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_6";
@ -3432,6 +3443,7 @@ self: super: {
"google-html5-slide" = dontDistribute super."google-html5-slide";
"google-mail-filters" = dontDistribute super."google-mail-filters";
"google-oauth2" = dontDistribute super."google-oauth2";
"google-oauth2-jwt" = dontDistribute super."google-oauth2-jwt";
"google-search" = dontDistribute super."google-search";
"google-translate" = dontDistribute super."google-translate";
"googleplus" = dontDistribute super."googleplus";
@ -3645,6 +3657,7 @@ self: super: {
"hakyll-elm" = dontDistribute super."hakyll-elm";
"hakyll-filestore" = dontDistribute super."hakyll-filestore";
"hakyll-ogmarkup" = dontDistribute super."hakyll-ogmarkup";
"hakyll-shakespeare" = dontDistribute super."hakyll-shakespeare";
"halberd" = dontDistribute super."halberd";
"halfs" = dontDistribute super."halfs";
"halipeto" = dontDistribute super."halipeto";
@ -4416,6 +4429,7 @@ self: super: {
"htsn-common" = dontDistribute super."htsn-common";
"htsn-import" = dontDistribute super."htsn-import";
"http-attoparsec" = dontDistribute super."http-attoparsec";
"http-client" = doDistribute super."http-client_0_4_31";
"http-client-auth" = dontDistribute super."http-client-auth";
"http-client-conduit" = dontDistribute super."http-client-conduit";
"http-client-lens" = dontDistribute super."http-client-lens";
@ -4924,6 +4938,7 @@ self: super: {
"language-boogie" = dontDistribute super."language-boogie";
"language-c-comments" = dontDistribute super."language-c-comments";
"language-c-inline" = dontDistribute super."language-c-inline";
"language-c-quote" = doDistribute super."language-c-quote_0_11_6_2";
"language-cil" = dontDistribute super."language-cil";
"language-conf" = dontDistribute super."language-conf";
"language-css" = dontDistribute super."language-css";
@ -5004,6 +5019,7 @@ self: super: {
"lens-utils" = dontDistribute super."lens-utils";
"lenses" = dontDistribute super."lenses";
"lensref" = dontDistribute super."lensref";
"lentil" = doDistribute super."lentil_0_1_12_0";
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
@ -5211,6 +5227,7 @@ self: super: {
"luachunk" = dontDistribute super."luachunk";
"luautils" = dontDistribute super."luautils";
"lub" = dontDistribute super."lub";
"lucid" = doDistribute super."lucid_2_9_5";
"lucid-foundation" = dontDistribute super."lucid-foundation";
"lucid-svg" = doDistribute super."lucid-svg_0_6_0_1";
"lucienne" = dontDistribute super."lucienne";
@ -5345,6 +5362,7 @@ self: super: {
"memexml" = dontDistribute super."memexml";
"memo-ptr" = dontDistribute super."memo-ptr";
"memo-sqlite" = dontDistribute super."memo-sqlite";
"memoize" = doDistribute super."memoize_0_7";
"memorypool" = dontDistribute super."memorypool";
"memscript" = dontDistribute super."memscript";
"merge-bash-history" = dontDistribute super."merge-bash-history";
@ -5925,8 +5943,16 @@ self: super: {
"pandoc-types" = doDistribute super."pandoc-types_1_16_1";
"pandoc-unlit" = dontDistribute super."pandoc-unlit";
"pango" = doDistribute super."pango_0_13_1_1";
"papa" = dontDistribute super."papa";
"papa-lens" = dontDistribute super."papa-lens";
"papa-prelude" = dontDistribute super."papa-prelude";
"papa-prelude-core" = dontDistribute super."papa-prelude-core";
"papa-prelude-lens" = dontDistribute super."papa-prelude-lens";
"papa-prelude-semigroupoids" = dontDistribute super."papa-prelude-semigroupoids";
"papa-prelude-semigroups" = dontDistribute super."papa-prelude-semigroups";
"papillon" = dontDistribute super."papillon";
"pappy" = dontDistribute super."pappy";
"paprika" = dontDistribute super."paprika";
"para" = dontDistribute super."para";
"paragon" = dontDistribute super."paragon";
"parallel-tasks" = dontDistribute super."parallel-tasks";
@ -6240,6 +6266,7 @@ self: super: {
"prelude-prime" = dontDistribute super."prelude-prime";
"prelude2010" = dontDistribute super."prelude2010";
"preprocess-haskell" = dontDistribute super."preprocess-haskell";
"preprocessor" = dontDistribute super."preprocessor";
"present" = dontDistribute super."present";
"press" = dontDistribute super."press";
"presto-hdbc" = dontDistribute super."presto-hdbc";
@ -6449,6 +6476,7 @@ self: super: {
"random-eff" = dontDistribute super."random-eff";
"random-effin" = dontDistribute super."random-effin";
"random-extras" = dontDistribute super."random-extras";
"random-fu-multivariate" = dontDistribute super."random-fu-multivariate";
"random-hypergeometric" = dontDistribute super."random-hypergeometric";
"random-stream" = dontDistribute super."random-stream";
"random-strings" = dontDistribute super."random-strings";
@ -7424,6 +7452,7 @@ self: super: {
"sym-plot" = dontDistribute super."sym-plot";
"symengine" = dontDistribute super."symengine";
"symengine-hs" = dontDistribute super."symengine-hs";
"symon" = dontDistribute super."symon";
"sync" = dontDistribute super."sync";
"synchronous-channels" = dontDistribute super."synchronous-channels";
"syncthing-hs" = dontDistribute super."syncthing-hs";
@ -7596,6 +7625,7 @@ self: super: {
"text-lips" = dontDistribute super."text-lips";
"text-loc" = dontDistribute super."text-loc";
"text-locale-encoding" = dontDistribute super."text-locale-encoding";
"text-metrics" = dontDistribute super."text-metrics";
"text-normal" = dontDistribute super."text-normal";
"text-position" = dontDistribute super."text-position";
"text-printer" = dontDistribute super."text-printer";
@ -8006,6 +8036,7 @@ self: super: {
"utc" = dontDistribute super."utc";
"utf8-env" = dontDistribute super."utf8-env";
"utf8-prelude" = dontDistribute super."utf8-prelude";
"utility-ht" = doDistribute super."utility-ht_0_0_11";
"uu-cco" = dontDistribute super."uu-cco";
"uu-cco-examples" = dontDistribute super."uu-cco-examples";
"uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
@ -8263,6 +8294,8 @@ self: super: {
"wraxml" = dontDistribute super."wraxml";
"wreq-sb" = dontDistribute super."wreq-sb";
"wright" = dontDistribute super."wright";
"writer-cps-mtl" = dontDistribute super."writer-cps-mtl";
"writer-cps-transformers" = dontDistribute super."writer-cps-transformers";
"wsdl" = dontDistribute super."wsdl";
"wsedit" = dontDistribute super."wsedit";
"wtk" = dontDistribute super."wtk";
@ -8375,6 +8408,7 @@ self: super: {
"yajl-enumerator" = dontDistribute super."yajl-enumerator";
"yall" = dontDistribute super."yall";
"yamemo" = dontDistribute super."yamemo";
"yaml" = doDistribute super."yaml_0_8_18_1";
"yaml-config" = dontDistribute super."yaml-config";
"yaml-light-lens" = dontDistribute super."yaml-light-lens";
"yaml-rpc" = dontDistribute super."yaml-rpc";
@ -8453,6 +8487,7 @@ self: super: {
"yesod-s3" = dontDistribute super."yesod-s3";
"yesod-sass" = dontDistribute super."yesod-sass";
"yesod-session-redis" = dontDistribute super."yesod-session-redis";
"yesod-static" = doDistribute super."yesod-static_1_5_0_3";
"yesod-tableview" = dontDistribute super."yesod-tableview";
"yesod-test" = doDistribute super."yesod-test_1_5_1_1";
"yesod-test-json" = dontDistribute super."yesod-test-json";

File diff suppressed because it is too large Load diff

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "elixir-${version}";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "elixir";
rev = "v${version}";
sha256 = "0pihqgsnddrhhcpiphz170wgwlc59pd492iy4f66dajapm5k329d";
sha256 = "0dib7j81vgbi0npn13jj19rbrsn66cr0rm05hnhkqz6dixz96xcy";
};
buildInputs = [ erlang rebar makeWrapper ];

View file

@ -2,7 +2,7 @@
, libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk
, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp
, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null
, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null
}:
let
@ -70,6 +70,8 @@ stdenv.mkDerivation rec {
homepage = http://octave.org/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [viric raskin];
platforms = with stdenv.lib.platforms; linux ++ darwin;
platforms = if overridePlatforms == null then
(with stdenv.lib.platforms; linux ++ darwin)
else overridePlatforms;
};
}

View file

@ -147,6 +147,7 @@ let
license = stdenv.lib.licenses.ruby;
homepage = http://www.ruby-lang.org/en/;
description = "The Ruby language";
maintainers = [ stdenv.lib.maintainers.vrthra ];
platforms = stdenv.lib.platforms.all;
};
@ -187,25 +188,25 @@ in {
};
};
ruby_2_1_7 = generic {
ruby_2_1_10 = generic {
majorVersion = "2";
minorVersion = "1";
teenyVersion = "7";
teenyVersion = "10";
patchLevel = "0";
sha256 = {
src = "10fxlqmpbq9407zgsx060q22yj4zq6c3czbf29h7xk1rmjb1b77m";
git = "1fmbqd943akqjwsfbj9bg394ac46qmpavm8s0kv2w87rflrjcjfb";
src = "086x66w51lg41abjn79xb7f6xsryymkcc3nvakmkjnjyg96labpv";
git = "133phd5r5y0np5lc9nqif93l7yb13yd52aspyl6c46z5jhvhyvfi";
};
};
ruby_2_2_3 = generic {
ruby_2_2_5 = generic {
majorVersion = "2";
minorVersion = "2";
teenyVersion = "3";
teenyVersion = "5";
patchLevel = "0";
sha256 = {
src = "1kpdf7f8pw90n5bckpl2idzggk0nn0240ah92sj4a1w6k4pmyyfz";
git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx";
src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h";
git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2";
};
};

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