mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 04:02:55 +03:00
Merge branch 'master' into staging
This commit is contained in:
William A. Kennington III
commit
767c179a94
@ -22,8 +22,7 @@ with lib;
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.hardware.cpu.amd.updateMicrocode {
|
||||
hardware.firmware = [ "${pkgs.amdUcode}/lib/firmware" ];
|
||||
boot.kernelModules = [ "microcode" ];
|
||||
boot.initrd.prepend = [ "${pkgs.microcodeAmd}/amd-ucode.img" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -22,8 +22,7 @@ with lib;
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.hardware.cpu.intel.updateMicrocode {
|
||||
hardware.firmware = [ "${pkgs.microcodeIntel}/lib/firmware" ];
|
||||
boot.kernelModules = [ "microcode" ];
|
||||
boot.initrd.prepend = [ "${pkgs.microcodeIntel}/intel-ucode.img" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -211,6 +211,7 @@
|
||||
unifi = 183;
|
||||
uptimed = 184;
|
||||
zope2 = 185;
|
||||
ripple-data-api = 186;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
|
||||
|
||||
@ -399,6 +400,7 @@
|
||||
#unifi = 183; # unused
|
||||
#uptimed = 184; # unused
|
||||
#zope2 = 185; # unused
|
||||
#ripple-data-api = 186; #unused
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing
|
||||
# uid. Users and groups with the same name should have equal
|
||||
|
||||
@ -201,6 +201,7 @@
|
||||
./services/misc/phd.nix
|
||||
./services/misc/redmine.nix
|
||||
./services/misc/rippled.nix
|
||||
./services/misc/ripple-data-api.nix
|
||||
./services/misc/rogue.nix
|
||||
./services/misc/siproxd.nix
|
||||
./services/misc/svnserve.nix
|
||||
|
||||
168
nixos/modules/services/misc/ripple-data-api.nix
Normal file
168
nixos/modules/services/misc/ripple-data-api.nix
Normal file
@ -0,0 +1,168 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.rippleDataApi;
|
||||
|
||||
deployment_env_config = builtins.toJSON {
|
||||
production = {
|
||||
port = toString cfg.port;
|
||||
maxSockets = 150;
|
||||
batchSize = 100;
|
||||
startIndex = 32570;
|
||||
rippleds = cfg.rippleds;
|
||||
redis = {
|
||||
enable = cfg.redis.enable;
|
||||
host = cfg.redis.host;
|
||||
port = cfg.redis.port;
|
||||
options.auth_pass = null;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
db_config = builtins.toJSON {
|
||||
production = {
|
||||
username = optional (cfg.couchdb.pass != "") cfg.couchdb.user;
|
||||
password = optional (cfg.couchdb.pass != "") cfg.couchdb.pass;
|
||||
host = cfg.couchdb.host;
|
||||
port = cfg.couchdb.port;
|
||||
database = cfg.couchdb.db;
|
||||
protocol = "http";
|
||||
};
|
||||
};
|
||||
|
||||
in {
|
||||
options = {
|
||||
services.rippleDataApi = {
|
||||
enable = mkEnableOption "Whether to enable ripple data api.";
|
||||
|
||||
port = mkOption {
|
||||
description = "Ripple data api port";
|
||||
default = 5993;
|
||||
type = types.int;
|
||||
};
|
||||
|
||||
redis = {
|
||||
enable = mkOption {
|
||||
description = "Whether to enable caching of ripple data to redis.";
|
||||
default = true;
|
||||
type = types.bool;
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
description = "Ripple data api redis host.";
|
||||
default = "localhost";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
description = "Ripple data api redis port.";
|
||||
default = 5984;
|
||||
type = types.int;
|
||||
};
|
||||
};
|
||||
|
||||
couchdb = {
|
||||
host = mkOption {
|
||||
description = "Ripple data api couchdb host.";
|
||||
default = "localhost";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
description = "Ripple data api couchdb port.";
|
||||
default = 5984;
|
||||
type = types.int;
|
||||
};
|
||||
|
||||
db = mkOption {
|
||||
description = "Ripple data api couchdb database.";
|
||||
default = "rippled";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
description = "Ripple data api couchdb username.";
|
||||
default = "rippled";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
pass = mkOption {
|
||||
description = "Ripple data api couchdb password.";
|
||||
default = "";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
create = mkOption {
|
||||
description = "Whether to create couchdb database needed by ripple data api.";
|
||||
type = types.bool;
|
||||
default = true;
|
||||
};
|
||||
};
|
||||
|
||||
rippleds = mkOption {
|
||||
description = "List of rippleds to be used by ripple data api.";
|
||||
default = [
|
||||
"http://s_east.ripple.com:51234"
|
||||
"http://s_west.ripple.com:51234"
|
||||
];
|
||||
type = types.listOf types.str;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf (cfg.enable) {
|
||||
services.couchdb.enable = mkDefault true;
|
||||
services.couchdb.bindAddress = mkDefault "0.0.0.0";
|
||||
services.redis.enable = mkDefault true;
|
||||
|
||||
systemd.services.ripple-data-api = {
|
||||
after = [ "couchdb.service" "redis.service" "ripple-data-api-importer.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
environment = {
|
||||
NODE_ENV = "production";
|
||||
DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config;
|
||||
DB_CONFIG = pkgs.writeText "db.config.json" db_config;
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.ripple-data-api}/bin/api";
|
||||
User = "ripple-data-api";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.ripple-data-importer = {
|
||||
after = [ "couchdb.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ pkgs.curl ];
|
||||
|
||||
environment = {
|
||||
NODE_ENV = "production";
|
||||
DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config;
|
||||
DB_CONFIG = pkgs.writeText "db.config.json" db_config;
|
||||
LOG_FILE = "/dev/null";
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.ripple-data-api}/bin/importer live debug2";
|
||||
User = "ripple-data-api";
|
||||
};
|
||||
|
||||
preStart = mkMerge [
|
||||
(mkIf (cfg.couchdb.create) ''
|
||||
HOST="http://${optionalString (cfg.couchdb.pass != "") "${cfg.couchdb.user}:${cfg.couchdb.pass}@"}${cfg.couchdb.host}:${toString cfg.couchdb.port}"
|
||||
curl -X PUT $HOST/${cfg.couchdb.db} || true
|
||||
'')
|
||||
"${pkgs.ripple-data-api}/bin/update-views"
|
||||
];
|
||||
};
|
||||
|
||||
users.extraUsers = singleton
|
||||
{ name = "ripple-data-api";
|
||||
description = "Ripple data api user";
|
||||
uid = config.ids.uids.ripple-data-api;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -205,7 +205,7 @@ let
|
||||
# The closure of the init script of boot stage 1 is what we put in
|
||||
# the initial RAM disk.
|
||||
initialRamdisk = pkgs.makeInitrd {
|
||||
inherit (config.boot.initrd) compressor;
|
||||
inherit (config.boot.initrd) compressor prepend;
|
||||
|
||||
contents =
|
||||
[ { object = bootStage1;
|
||||
@ -247,6 +247,14 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
boot.initrd.prepend = mkOption {
|
||||
default = [ ];
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
Other initrd files to prepend to the final initrd we are building.
|
||||
'';
|
||||
};
|
||||
|
||||
boot.initrd.checkJournalingFS = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
|
||||
@ -13,7 +13,7 @@ let
|
||||
|
||||
makeUnit = name: unit:
|
||||
let
|
||||
pathSafeName = lib.replaceChars ["@" "\\"] ["-" "-"] name;
|
||||
pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name;
|
||||
in
|
||||
if unit.enable then
|
||||
pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; }
|
||||
|
||||
@ -7,6 +7,9 @@ in
|
||||
{
|
||||
imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
|
||||
|
||||
# https://cloud.google.com/compute/docs/tutorials/building-images
|
||||
networking.firewall.enable = mkDefault false;
|
||||
|
||||
system.build.googleComputeImage =
|
||||
pkgs.vmTools.runInLinuxVM (
|
||||
pkgs.runCommand "google-compute-image"
|
||||
@ -95,6 +98,7 @@ in
|
||||
|
||||
boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
|
||||
boot.initrd.kernelModules = [ "virtio_scsi" ];
|
||||
boot.kernelModules = [ "virtio_pci" "virtio_net" ];
|
||||
|
||||
# Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd.
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
@ -108,6 +112,7 @@ in
|
||||
# at instance creation time.
|
||||
services.openssh.enable = true;
|
||||
services.openssh.permitRootLogin = "without-password";
|
||||
services.openssh.passwordAuthentication = mkDefault false;
|
||||
|
||||
# Force getting the hostname from Google Compute.
|
||||
networking.hostName = mkDefault "";
|
||||
@ -178,5 +183,79 @@ in
|
||||
serviceConfig.RemainAfterExit = true;
|
||||
serviceConfig.StandardError = "journal+console";
|
||||
serviceConfig.StandardOutput = "journal+console";
|
||||
};
|
||||
};
|
||||
|
||||
# Setings taken from https://cloud.google.com/compute/docs/tutorials/building-images#providedkernel
|
||||
boot.kernel.sysctl = {
|
||||
# enables syn flood protection
|
||||
"net.ipv4.tcp_syncookies" = mkDefault "1";
|
||||
|
||||
# ignores source-routed packets
|
||||
"net.ipv4.conf.all.accept_source_route" = mkDefault "0";
|
||||
|
||||
# ignores source-routed packets
|
||||
"net.ipv4.conf.default.accept_source_route" = mkDefault "0";
|
||||
|
||||
# ignores ICMP redirects
|
||||
"net.ipv4.conf.all.accept_redirects" = mkDefault "0";
|
||||
|
||||
# ignores ICMP redirects
|
||||
"net.ipv4.conf.default.accept_redirects" = mkDefault "0";
|
||||
|
||||
# ignores ICMP redirects from non-GW hosts
|
||||
"net.ipv4.conf.all.secure_redirects" = mkDefault "1";
|
||||
|
||||
# ignores ICMP redirects from non-GW hosts
|
||||
"net.ipv4.conf.default.secure_redirects" = mkDefault "1";
|
||||
|
||||
# don't allow traffic between networks or act as a router
|
||||
"net.ipv4.ip_forward" = mkDefault "0";
|
||||
|
||||
# don't allow traffic between networks or act as a router
|
||||
"net.ipv4.conf.all.send_redirects" = mkDefault "0";
|
||||
|
||||
# don't allow traffic between networks or act as a router
|
||||
"net.ipv4.conf.default.send_redirects" = mkDefault "0";
|
||||
|
||||
# reverse path filtering - IP spoofing protection
|
||||
"net.ipv4.conf.all.rp_filter" = mkDefault "1";
|
||||
|
||||
# reverse path filtering - IP spoofing protection
|
||||
"net.ipv4.conf.default.rp_filter" = mkDefault "1";
|
||||
|
||||
# ignores ICMP broadcasts to avoid participating in Smurf attacks
|
||||
"net.ipv4.icmp_echo_ignore_broadcasts" = mkDefault "1";
|
||||
|
||||
# ignores bad ICMP errors
|
||||
"net.ipv4.icmp_ignore_bogus_error_responses" = mkDefault "1";
|
||||
|
||||
# logs spoofed, source-routed, and redirect packets
|
||||
"net.ipv4.conf.all.log_martians" = mkDefault "1";
|
||||
|
||||
# log spoofed, source-routed, and redirect packets
|
||||
"net.ipv4.conf.default.log_martians" = mkDefault "1";
|
||||
|
||||
# implements RFC 1337 fix
|
||||
"net.ipv4.tcp_rfc1337" = mkDefault "1";
|
||||
|
||||
# randomizes addresses of mmap base, heap, stack and VDSO page
|
||||
"kernel.randomize_va_space" = mkDefault "2";
|
||||
|
||||
# provides protection from ToCToU races
|
||||
"fs.protected_hardlinks" = mkDefault "1";
|
||||
|
||||
# provides protection from ToCToU races
|
||||
"fs.protected_symlinks" = mkDefault "1";
|
||||
|
||||
# makes locating kernel addresses more difficult
|
||||
"kernel.kptr_restrict" = mkDefault "1";
|
||||
|
||||
# set ptrace protections
|
||||
"kernel.yama.ptrace_scope" = mkDefault "1";
|
||||
|
||||
# set perf only available to root
|
||||
"kernel.perf_event_paranoid" = mkDefault "2";
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -242,7 +242,7 @@ in rec {
|
||||
tests.blivet = callTest tests/blivet.nix {};
|
||||
tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
|
||||
tests.chromium = callTest tests/chromium.nix {};
|
||||
#tests.cjdns = callTest tests/cjdns.nix {};
|
||||
tests.cjdns = callTest tests/cjdns.nix {};
|
||||
tests.containers = callTest tests/containers.nix {};
|
||||
tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
|
||||
tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });
|
||||
|
||||
@ -3,15 +3,15 @@ let
|
||||
carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k";
|
||||
carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52";
|
||||
carolIp4 = "192.168.0.9";
|
||||
|
||||
|
||||
basicConfig =
|
||||
{ config, pkgs, ... }:
|
||||
{ services.cjdns.enable = true;
|
||||
|
||||
|
||||
# Turning off DHCP isn't very realistic but makes
|
||||
# the sequence of address assignment less stochastic.
|
||||
networking.useDHCP = false;
|
||||
|
||||
|
||||
networking.interfaces.eth1.prefixLength = 24;
|
||||
# CJDNS output is incompatible with the XML log.
|
||||
systemd.services.cjdns.serviceConfig.StandardOutput = "null";
|
||||
@ -41,19 +41,18 @@ import ./make-test.nix {
|
||||
# Bob explicitly connects to Carol over UDPInterface.
|
||||
bob =
|
||||
{ config, lib, nodes, ... }:
|
||||
|
||||
|
||||
let carolIp4 = lib.mkForce nodes.carol.config.networking.interfaces.eth1; in
|
||||
|
||||
|
||||
{ imports = [ basicConfig ];
|
||||
|
||||
|
||||
networking.interfaces.eth1.ipAddress = "192.168.0.2";
|
||||
|
||||
|
||||
services.cjdns =
|
||||
{ UDPInterface =
|
||||
{ bind = "0.0.0.0:1024";
|
||||
connectTo."192.168.0.1:1024}" =
|
||||
{ hostname = "carol.hype";
|
||||
password = carolPassword;
|
||||
{ password = carolPassword;
|
||||
publicKey = carolPubKey;
|
||||
};
|
||||
};
|
||||
@ -75,7 +74,7 @@ import ./make-test.nix {
|
||||
'';
|
||||
|
||||
networking.interfaces.eth1.ipAddress = "192.168.0.1";
|
||||
|
||||
|
||||
services.cjdns =
|
||||
{ authorizedPasswords = [ carolPassword ];
|
||||
ETHInterface.bind = "eth1";
|
||||
@ -106,13 +105,13 @@ import ./make-test.nix {
|
||||
my $carolIp6 = cjdnsIp $carol;
|
||||
|
||||
# ping a few times each to let the routing table establish itself
|
||||
|
||||
|
||||
$alice->succeed("ping6 -c 4 $carolIp6");
|
||||
$bob->succeed("ping6 -c 4 carol.hype");
|
||||
$bob->succeed("ping6 -c 4 $carolIp6");
|
||||
|
||||
$carol->succeed("ping6 -c 4 $aliceIp6");
|
||||
$carol->succeed("ping6 -c 4 $bobIp6");
|
||||
|
||||
|
||||
$alice->succeed("ping6 -c 4 $bobIp6");
|
||||
$bob->succeed("ping6 -c 4 $aliceIp6");
|
||||
|
||||
|
||||
@ -31,8 +31,8 @@ import ./make-test.nix ({pkgs, ... }: {
|
||||
startAll;
|
||||
|
||||
# Make sure that cups is up on both sides.
|
||||
$server->waitForUnit("cupsd.service");
|
||||
$client->waitForUnit("cupsd.service");
|
||||
$server->waitForUnit("cups.service");
|
||||
$client->waitForUnit("cups.service");
|
||||
$client->succeed("lpstat -r") =~ /scheduler is running/ or die;
|
||||
$client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
|
||||
$client->succeed("curl --fail http://localhost:631/");
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, libcanberra_gtk3, makeWrapper, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pavucontrol-2.0";
|
||||
name = "pavucontrol-3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
|
||||
sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2";
|
||||
sha256 = "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk";
|
||||
};
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "snd-15.2";
|
||||
name = "snd-15.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/${name}.tar.gz";
|
||||
sha256 = "0v2r7a6363aai726cywi7ai0qlwdc20bqdprs5fmyz8sbmksbqzr";
|
||||
sha256 = "1dari02ind445h5hpb6dhi0kix1vmlk64lyxwv1zrqagw3ajmpwh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -8,7 +8,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
let
|
||||
version = if stdenv.system == "i686-linux"
|
||||
then "0.9.4.183.g644e24e.428"
|
||||
else "0.9.11.27.g2b1a638.81";
|
||||
else "0.9.17.1.g9b85d43.7";
|
||||
|
||||
deps = [
|
||||
alsaLib
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation {
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb";
|
||||
sha256 = "0yfljiw01kssj3qaz8m0ppgrpjs6xrhzlr2wccp64bsnmin7g4sg";
|
||||
sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki";
|
||||
}
|
||||
else throw "Spotify not supported on this platform.";
|
||||
|
||||
@ -90,8 +90,8 @@ stdenv.mkDerivation {
|
||||
ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so.0d
|
||||
''}
|
||||
|
||||
# Work around Spotify trying to open libudev.so.0 (which we don't have)
|
||||
ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.0
|
||||
# Work around Spotify trying to open libudev.so.1 (which we don't have)
|
||||
ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.1
|
||||
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -128,6 +128,6 @@ stdenv.mkDerivation {
|
||||
homepage = https://www.spotify.com/;
|
||||
description = "Play music from the Spotify music service";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -205,14 +205,14 @@ in
|
||||
};
|
||||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
name = "clion-${build}";
|
||||
version = "eap";
|
||||
build = "140.1740.3";
|
||||
build = "141.102.4";
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform.";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/${name}-${build}.tar.gz";
|
||||
sha256 = "1hpsq37hq61id836wg5j6l3xapln6qdkqa10r3ig2p1rs2hq7i9y";
|
||||
url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
|
||||
sha256 = "0qjm8wxqn171wfd7yqf5ys1g4mwl0iyhlbry29jkgkikxp7h9dym";
|
||||
};
|
||||
};
|
||||
|
||||
@ -242,13 +242,13 @@ in
|
||||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "7.0";
|
||||
build = "135.1104";
|
||||
version = "7.0.4";
|
||||
build = "139.1231";
|
||||
description = "The Most Intelligent Ruby and Rails IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
|
||||
sha256 = "0xsx44gaddarkw5k4yjidzwkayf2xvsxklfzdnzcck4rg4vyk4v4";
|
||||
sha256 = "08b0iwccb5w9b1yk0kbs99r5mxkcyxqs9mkr57wb5j71an80yx38";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1,22 +1,33 @@
|
||||
{ stdenv, fetchurl, ncurses, gettext }:
|
||||
{ stdenv, fetchurl
|
||||
, ncurses
|
||||
, gettext ? null
|
||||
, enableNls ? true
|
||||
, enableTiny ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "nano";
|
||||
version = "2.3.6";
|
||||
assert enableNls -> (gettext != null);
|
||||
|
||||
name = "${pname}-${version}";
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nano-${version}";
|
||||
version = "2.4.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nano/${name}.tar.gz";
|
||||
sha256 = "a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534";
|
||||
sha256 = "1gbm9bcv4k55y01r5q8a8a9s3yrrgq3z5jxxiij3wl404r8gnxjh";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses gettext ];
|
||||
|
||||
configureFlags = "sysconfdir=/etc";
|
||||
buildInputs = [ ncurses ] ++ optional enableNls gettext;
|
||||
configureFlags = ''
|
||||
--sysconfdir=/etc
|
||||
${optionalString (!enableNls) "--disable-nls"}
|
||||
${optionalString enableTiny "--enable-tiny"}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.nano-editor.org/;
|
||||
description = "A small, user-friendly console text editor";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ joachifm ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation {
|
||||
|
||||
mkdir dependencies/common/dictionaries
|
||||
for dict in $hunspellDicts; do
|
||||
for i in $dict/share/hunspell/*
|
||||
for i in "$dict/share/hunspell/"*
|
||||
do ln -sv $i dependencies/common/dictionaries/
|
||||
done
|
||||
done
|
||||
|
||||
24
pkgs/applications/editors/rstudio/r-location.patch
Normal file
24
pkgs/applications/editors/rstudio/r-location.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff -ur rstudio-0.98.110-old/src/cpp/core/CMakeLists.txt rstudio-0.98.110-new/src/cpp/core/CMakeLists.txt
|
||||
--- rstudio-0.98.110-old/src/cpp/core/r_util/REnvironmentPosix.cpp 2013-04-28 10:02:14.000000000 -0400
|
||||
+++ rstudio-0.98.110-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2015-03-23 15:06:35.533400807 -0400
|
||||
@@ -84,9 +84,7 @@
|
||||
{
|
||||
// define potential paths
|
||||
std::vector<std::string> rScriptPaths;
|
||||
- rScriptPaths.push_back("/usr/bin/R");
|
||||
- rScriptPaths.push_back("/usr/local/bin/R");
|
||||
- rScriptPaths.push_back("/opt/local/bin/R");
|
||||
+ rScriptPaths.push_back("@R@/bin/R");
|
||||
return scanForRScript(rScriptPaths, pErrMsg);
|
||||
}
|
||||
|
||||
@@ -220,8 +218,7 @@
|
||||
// scan in standard locations as a fallback
|
||||
std::string scanErrMsg;
|
||||
std::vector<std::string> rScriptPaths;
|
||||
- rScriptPaths.push_back("/usr/local/bin/R");
|
||||
- rScriptPaths.push_back("/usr/bin/R");
|
||||
+ rScriptPaths.push_back("@R@/bin/R");
|
||||
FilePath scriptPath = scanForRScript(rScriptPaths, &scanErrMsg);
|
||||
if (scriptPath.empty())
|
||||
{
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchgit, libX11, imlib2, giflib, libexif }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "sxiv-1.3-git";
|
||||
name = "sxiv-2015.03.25";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/muennich/sxiv.git";
|
||||
rev = "92e3b57816e999b46f8d0778984719227631e9a7";
|
||||
sha256 = "0jbswh0k1xq5hgrv1pyvk7lpwbbj66p7gjsdm8zh6ah324apjr2b";
|
||||
rev = "01ed483b50f506fcba928af43e2ca017897e7c77";
|
||||
sha256 = "18s64l3dvibqg9biznzy4mdkkn9qmmpqxpdx7ljx7c0832aqy94k";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
patches = [ ./robomongo.patch ];
|
||||
|
||||
postPatch = ''
|
||||
rm ./cmake/FindOpenSSL.cmake
|
||||
rm ./cmake/FindOpenSSL.cmake # remove outdated bundled CMake file
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
|
||||
|
||||
64
pkgs/applications/networking/mailreaders/mutt-kz/default.nix
Normal file
64
pkgs/applications/networking/mailreaders/mutt-kz/default.nix
Normal file
@ -0,0 +1,64 @@
|
||||
{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook, autoconf, automake, notmuch
|
||||
, sslSupport ? true
|
||||
, imapSupport ? true
|
||||
, headerCache ? true
|
||||
, saslSupport ? true
|
||||
, gpgmeSupport ? true
|
||||
, gdbm ? null
|
||||
, openssl ? null
|
||||
, cyrus_sasl ? null
|
||||
, gpgme ? null
|
||||
}:
|
||||
|
||||
assert headerCache -> gdbm != null;
|
||||
assert sslSupport -> openssl != null;
|
||||
assert saslSupport -> cyrus_sasl != null;
|
||||
assert gpgmeSupport -> gpgme != null;
|
||||
|
||||
let
|
||||
version = "1.5.23.1-rc1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mutt-kz-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz";
|
||||
sha256 = "1m4bnn8psyrx2wy8ribannmp5qf75lv1gz116plji2z37z015zny";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
[ ncurses which perl autoreconfHook autoconf automake notmuch]
|
||||
++ optional headerCache gdbm
|
||||
++ optional sslSupport openssl
|
||||
++ optional saslSupport cyrus_sasl
|
||||
++ optional gpgmeSupport gpgme;
|
||||
|
||||
configureFlags = [
|
||||
"--with-mailpath=" "--enable-smtp"
|
||||
|
||||
# This allows calls with "-d N", that output debug info into ~/.muttdebug*
|
||||
"--enable-debug"
|
||||
|
||||
"--enable-pop" "--enable-imap"
|
||||
|
||||
"--enable-notmuch"
|
||||
|
||||
# The next allows building mutt without having anything setgid
|
||||
# set by the installer, and removing the need for the group 'mail'
|
||||
# I set the value 'mailbox' because it is a default in the configure script
|
||||
"--with-homespool=mailbox"
|
||||
(if headerCache then "--enable-hcache" else "--disable-hcache")
|
||||
(if sslSupport then "--with-ssl" else "--without-ssl")
|
||||
(if imapSupport then "--enable-imap" else "--disable-imap")
|
||||
(if saslSupport then "--with-sasl" else "--without-sasl")
|
||||
(if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A small but very powerful text-based mail client, forked to support notmuch";
|
||||
homepage = https://github.com/karelzak/mutt-kz/;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
};
|
||||
}
|
||||
38
pkgs/applications/science/logic/abella/default.nix
Normal file
38
pkgs/applications/science/logic/abella/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ stdenv, fetchurl, rsync, ocaml }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "abella-${version}";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://abella-prover.org/distributions/${name}.tar.gz";
|
||||
sha256 = "b56d865ebdb198111f1dcd5b6fbcc0d7fc6dd1294f7601903ba4e3c3322c099c";
|
||||
};
|
||||
|
||||
buildInputs = [ rsync ocaml ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
rsync -av abella $out/bin/
|
||||
|
||||
mkdir -p $out/share/emacs/site-lisp/abella/
|
||||
rsync -av emacs/ $out/share/emacs/site-lisp/abella/
|
||||
|
||||
mkdir -p $out/share/abella/examples
|
||||
rsync -av examples/ $out/share/abella/examples/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Interactive theorem prover";
|
||||
longDescription = ''
|
||||
Abella is an interactive theorem prover based on lambda-tree syntax.
|
||||
This means that Abella is well-suited for reasoning about the meta-theory
|
||||
of programming languages and other logical systems which manipulate
|
||||
objects with binding.
|
||||
'';
|
||||
homepage = http://abella-prover.org/;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [ bcdarwin ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -26,11 +26,8 @@ stdenv.mkDerivation rec {
|
||||
soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include
|
||||
cp ../src/api/z3.h $out/include
|
||||
cp ../src/api/z3_api.h $out/include
|
||||
cp ../src/api/z3_v1.h $out/include
|
||||
cp ../src/api/z3_macros.h $out/include
|
||||
cp ../src/api/c++/z3++.h $out/include
|
||||
cp ../src/api/z3*.h $out/include
|
||||
cp ../src/api/c++/z3*.h $out/include
|
||||
cp z3 $out/bin
|
||||
cp libz3${soext} $out/lib
|
||||
cp libz3${soext} $out/lib/${python.libPrefix}/site-packages
|
||||
|
||||
@ -4,12 +4,12 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pcalc-${version}";
|
||||
version = "20120812";
|
||||
version = "20141224";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://git.code.sf.net/p/pcalc/code;
|
||||
rev = "db5c5d587d4d24ff6b23405a92eeaad4c0f99618";
|
||||
sha256 = "1bzmiz9rrss3xk0vzszbisjkph73zwgc0riqn9zdd2h1iv6dgq92";
|
||||
rev = "181d60d3c880da4344fef7138065943eb3b9255f";
|
||||
sha256 = "0n60m3p4kkqvvswjf50mnfaaacmzi1lss8vgy63mrgzwi9v6yb4l";
|
||||
};
|
||||
|
||||
makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ];
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "fossil-1.30";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fossil-1.32";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.fossil-scm.org/download/fossil-src-20150119112900.tar.gz;
|
||||
sha256 = "1p4jxd67m2a5rl85hb9gl0vxcvvkxnj1hd8yjaci2qf115d9x5ip";
|
||||
urls =
|
||||
[
|
||||
"https://www.fossil-scm.org/fossil/tarball/Fossil-6c40678e.tar.gz?uuid=6c40678e9114c41a50f73cc43f6f942ace0408ec"
|
||||
];
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "0f1rvqiy630z2q1q8r3kgdd0c6sxjx8c8pm46yabn238xvf3bfnr";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl readline sqlite ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
in
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "11s6w6dsv9kfgpfa75sas4pi6spw75ph0b0b6b12xq37hl4l8ma7";
|
||||
sha256 = "15fv155skjy80j7sv7x4kxlj3m8i334bic4q2qmb6zvr04hjpslp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# `contents = {object = ...; symlink = /init;}' is a typical
|
||||
# argument.
|
||||
|
||||
{stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor}:
|
||||
{ stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor, prepend }:
|
||||
|
||||
let
|
||||
inputsFun = ubootName : [perl cpio perlArchiveCpio ]
|
||||
@ -41,5 +41,5 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = inputsFun stdenv.cross.platform.uboot;
|
||||
makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot;
|
||||
};
|
||||
inherit compressor;
|
||||
inherit compressor prepend;
|
||||
}
|
||||
|
||||
@ -36,7 +36,10 @@ storePaths=$(perl $pathsFromGraph closure-*)
|
||||
|
||||
# Put the closure in a gzipped cpio archive.
|
||||
mkdir -p $out
|
||||
(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor > $out/initrd)
|
||||
for PREP in $prepend; do
|
||||
cat $PREP >> $out/initrd
|
||||
done
|
||||
(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor >> $out/initrd)
|
||||
|
||||
if [ -n "$makeUInitrd" ]; then
|
||||
mv $out/initrd $out/initrd.gz
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fira-4.002";
|
||||
name = "fira-4.004";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.carrois.com/downloads/fira_4_0/FiraFonts4002.zip;
|
||||
sha256 = "1vh4hx8ffmh2p7mxxbcp5zbcz8kzpzxaggdqnhj5i4vi329n5hfw";
|
||||
url = "http://www.carrois.com/downloads/fira_4_0/FiraFonts4004.zip";
|
||||
sha256 = "0mab1n4i8ayhzmpfm0dj07annghrfpnsfr2rhnwsyhkk5zxlh6v7";
|
||||
};
|
||||
|
||||
buildInputs = [unzip];
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
sourceRoot = "FiraFonts4004";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/opentype
|
||||
|
||||
26
pkgs/data/fonts/mplus-outline-fonts/default.nix
Normal file
26
pkgs/data/fonts/mplus-outline-fonts/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mplus-${version}";
|
||||
version = "TESTFLIGHT-059";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz";
|
||||
sha256 = "09dzdgqqflpijd3c30m38cyidshawfp4nz162xhn91j9w09y2qkq";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
cp *.ttf $out/share/fonts/truetype
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "M+ Outline Fonts";
|
||||
homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ henrytill ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation {
|
||||
}
|
||||
";
|
||||
|
||||
passthru = { inherit langC langCC langF77; };
|
||||
passthru = { inherit langC langCC langF77; isGNU = true; };
|
||||
|
||||
meta = {
|
||||
homepage = "http://gcc.gnu.org/";
|
||||
|
||||
@ -171,6 +171,8 @@ stdenv.mkDerivation ({
|
||||
rm -Rf ghdl-*
|
||||
'';
|
||||
|
||||
passthru.isGNU = true;
|
||||
|
||||
meta = {
|
||||
homepage = "http://ghdl.free.fr/";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
@ -243,7 +243,7 @@ stdenv.mkDerivation ({
|
||||
|
||||
|
||||
passthru = { inherit langC langCC langAda langFortran langVhdl
|
||||
enableMultilib version; };
|
||||
enableMultilib version; isGNU = true; };
|
||||
|
||||
# ghdl does not build fine with parallel building
|
||||
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46173
|
||||
|
||||
@ -358,7 +358,7 @@ stdenv.mkDerivation ({
|
||||
else null;
|
||||
|
||||
passthru = { inherit langC langCC langAda langFortran langVhdl
|
||||
enableMultilib version; };
|
||||
enableMultilib version; isGNU = true; };
|
||||
|
||||
enableParallelBuilding = !langAda;
|
||||
|
||||
|
||||
@ -427,7 +427,7 @@ stdenv.mkDerivation ({
|
||||
else null;
|
||||
|
||||
passthru = { inherit langC langCC langAda langFortran langVhdl
|
||||
langGo version; };
|
||||
langGo version; isGNU = true; };
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
|
||||
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "http://haskell.org/ghc";
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
inherit (ghc.meta) license platforms;
|
||||
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported.
|
||||
inherit (ghc.meta) license;
|
||||
};
|
||||
}
|
||||
|
||||
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://haskell.org/ghc";
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
|
||||
inherit (ghc.meta) license platforms;
|
||||
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported.
|
||||
inherit (ghc.meta) license;
|
||||
};
|
||||
}
|
||||
|
||||
@ -116,5 +116,5 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta.license = stdenv.lib.licenses.bsd3;
|
||||
meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
|
||||
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
|
||||
}
|
||||
|
||||
@ -45,13 +45,13 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "http://haskell.org/ghc";
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
stdenv.lib.maintainers.simons
|
||||
];
|
||||
platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
|
||||
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is not supported.
|
||||
inherit (ghc.meta) license;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -45,13 +45,13 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "http://haskell.org/ghc";
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
stdenv.lib.maintainers.simons
|
||||
];
|
||||
inherit (ghc.meta) license platforms;
|
||||
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported.
|
||||
inherit (ghc.meta) license;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -124,5 +124,5 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta.license = stdenv.lib.licenses.bsd3;
|
||||
meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
|
||||
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
|
||||
}
|
||||
|
||||
@ -38,15 +38,11 @@ stdenv.mkDerivation rec {
|
||||
# that in turn causes GHCi to abort
|
||||
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = {
|
||||
homepage = "http://haskell.org/ghc";
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ];
|
||||
inherit (ghc.meta) license;
|
||||
# Filter old "i686-darwin" platform which is unsupported these days.
|
||||
platforms = filter (x: elem x platforms.all) ghc.meta.platforms;
|
||||
# Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>.
|
||||
hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms;
|
||||
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -29,7 +29,11 @@ stdenv.mkDerivation {
|
||||
sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
|
||||
};
|
||||
|
||||
passthru = { cc = stdenv.cc.cc; };
|
||||
passthru = {
|
||||
isClang = true;
|
||||
cc = stdenv.cc.cc;
|
||||
gcc = gccReal;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://clang.llvm.org/;
|
||||
|
||||
@ -34,7 +34,13 @@ stdenv.mkDerivation {
|
||||
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
|
||||
'';
|
||||
|
||||
passthru.cc = stdenv.cc.cc;
|
||||
passthru = {
|
||||
isClang = true;
|
||||
cc = stdenv.cc.cc;
|
||||
# GCC_INSTALL_PREFIX points here, so just use it even though it may not
|
||||
# actually be a gcc
|
||||
gcc = stdenv.cc.cc;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -39,7 +39,9 @@ in stdenv.mkDerivation {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = stdenv.lib.optionalAttrs stdenv.isLinux {
|
||||
passthru = {
|
||||
isClang = true;
|
||||
} // stdenv.lib.optionalAttrs stdenv.isLinux {
|
||||
inherit gcc;
|
||||
};
|
||||
|
||||
|
||||
@ -40,7 +40,9 @@ in stdenv.mkDerivation {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = stdenv.lib.optionalAttrs stdenv.isLinux {
|
||||
passthru = {
|
||||
isClang = true;
|
||||
} // stdenv.lib.optionalAttrs stdenv.isLinux {
|
||||
inherit gcc;
|
||||
};
|
||||
|
||||
|
||||
@ -37,8 +37,7 @@ let
|
||||
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
|
||||
sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
openjdk8 = stdenv.mkDerivation {
|
||||
name = "openjdk-8u${update}b${build}";
|
||||
srcs = [jdk8 langtools hotspot corba jdk jaxws jaxp nashorn];
|
||||
outputs = [ "out" "jre" ];
|
||||
@ -138,5 +137,6 @@ stdenv.mkDerivation {
|
||||
maintainers = [ stdenv.lib.maintainers.cocreature ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
passthru.home = "${openjdk8}/lib/openjdk";
|
||||
}; in openjdk8
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
# The source code implementing the Marsenne Twister algorithm is licensed
|
||||
# under the 3-clause BSD license. The rest is 2-clause BSD license.
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,8 +7,8 @@ self: super: {
|
||||
# Some packages need a non-core version of Cabal.
|
||||
Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
|
||||
Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
|
||||
Cabal_1_22_1_1 = dontCheck super.Cabal_1_22_1_1;
|
||||
cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_1; });
|
||||
Cabal_1_22_2_0 = dontCheck super.Cabal_1_22_2_0;
|
||||
cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_2_0; });
|
||||
|
||||
# Break infinite recursions.
|
||||
digest = super.digest.override { inherit (pkgs) zlib; };
|
||||
@ -107,6 +107,7 @@ self: super: {
|
||||
deepseq-magic = dontHaddock super.deepseq-magic;
|
||||
diagrams = dontHaddock super.diagrams;
|
||||
either = dontHaddock super.either;
|
||||
feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1
|
||||
gl = dontHaddock super.gl;
|
||||
groupoids = dontHaddock super.groupoids;
|
||||
hamlet = dontHaddock super.hamlet;
|
||||
@ -181,7 +182,7 @@ self: super: {
|
||||
lushtags = markBrokenVersion "0.0.1" super.lushtags;
|
||||
|
||||
# https://github.com/haskell/bytestring/issues/41
|
||||
bytestring_0_10_4_1 = dontCheck super.bytestring_0_10_4_1;
|
||||
bytestring_0_10_6_0 = dontCheck super.bytestring_0_10_6_0;
|
||||
|
||||
# https://github.com/zmthy/http-media/issues/6
|
||||
http-media = dontCheck super.http-media;
|
||||
@ -253,6 +254,7 @@ self: super: {
|
||||
amqp-conduit = dontCheck super.amqp-conduit;
|
||||
concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
|
||||
dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw
|
||||
directory_1_2_2_0 = dontCheck super.directory_1_2_2_0; # https://github.com/haskell/directory/issues/24
|
||||
hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw
|
||||
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
|
||||
hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
|
||||
@ -300,6 +302,7 @@ self: super: {
|
||||
cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw
|
||||
cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw
|
||||
cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw
|
||||
CLI = dontCheck super.CLI; # Upstream has no issue tracker.
|
||||
cjk = dontCheck super.cjk;
|
||||
command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw
|
||||
conduit-connection = dontCheck super.conduit-connection;
|
||||
@ -428,7 +431,7 @@ self: super: {
|
||||
snappy = dontCheck super.snappy;
|
||||
|
||||
# Needs llvm to compile.
|
||||
bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm_34;
|
||||
bytestring-arbitrary = addBuildTool super.bytestring-arbitrary self.llvm;
|
||||
|
||||
# Expect to find sendmail(1) in $PATH.
|
||||
mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\"";
|
||||
@ -482,11 +485,6 @@ self: super: {
|
||||
# https://github.com/ucsd-progsys/liquid-fixpoint/issues/44
|
||||
liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; });
|
||||
|
||||
# LLVM 3.5 breaks GHC: https://ghc.haskell.org/trac/ghc/ticket/9142.
|
||||
GlomeVec = super.GlomeVec.override { llvm = pkgs.llvm_34; }; # https://github.com/jimsnow/glome/issues/2
|
||||
gloss-raster = super.gloss-raster.override { llvm = pkgs.llvm_34; };
|
||||
repa-examples = super.repa-examples.override { llvm = pkgs.llvm_34; };
|
||||
|
||||
# Missing module.
|
||||
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
|
||||
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6
|
||||
@ -580,15 +578,6 @@ self: super: {
|
||||
hmidi = markBrokenVersion "0.2.1.0" super.hmidi;
|
||||
padKONTROL = markBroken super.padKONTROL;
|
||||
|
||||
# https://github.com/lambdabot/lambdabot/issues/105
|
||||
lambdabot-core = markBroken super.lambdabot-core;
|
||||
lambdabot-haskell-plugins = markBroken super.lambdabot-haskell-plugins;
|
||||
lambdabot-irc-plugins = markBroken super.lambdabot-irc-plugins;
|
||||
lambdabot-misc-plugins = markBroken super.lambdabot-misc-plugins;
|
||||
lambdabot-novelty-plugins = markBroken super.lambdabot-novelty-plugins;
|
||||
lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins;
|
||||
lambdabot-social-plugins = markBroken super.lambdabot-social-plugins;
|
||||
|
||||
# Upstream provides no issue tracker and no contact details.
|
||||
vivid = markBroken super.vivid;
|
||||
|
||||
@ -637,6 +626,27 @@ self: super: {
|
||||
hydrogen-syntax = markBroken super.hydrogen-syntax;
|
||||
hydrogen-cli = dontDistribute super.hydrogen-cli;
|
||||
|
||||
# https://github.com/meteficha/Hipmunk/issues/8
|
||||
Hipmunk = markBroken super.Hipmunk;
|
||||
HipmunkPlayground = dontDistribute super.HipmunkPlayground;
|
||||
|
||||
# https://github.com/prowdsponsor/esqueleto/issues/93
|
||||
esqueleto = dontCheck super.esqueleto;
|
||||
|
||||
# https://github.com/anchor/ceilometer-common/issues/16
|
||||
ceilometer-common = dontCheck super.ceilometer-common;
|
||||
|
||||
# https://github.com/fumieval/audiovisual/issues/1
|
||||
audiovisual = markBroken super.audiovisual;
|
||||
|
||||
# https://github.com/cdupont/Nomyx/issues/85
|
||||
Nomyx-Core = markBroken super.Nomyx-Core;
|
||||
Nomyx-Web = dontDistribute super.Nomyx-Web;
|
||||
Nomyx = dontDistribute super.Nomyx;
|
||||
|
||||
# https://github.com/alephcloud/hs-stm-queue-extras/issues/2
|
||||
stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; });
|
||||
|
||||
} // {
|
||||
|
||||
# Not on Hackage.
|
||||
|
||||
@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# LLVM is not supported on this GHC; use the latest one.
|
||||
inherit (pkgs) llvmPackages;
|
||||
|
||||
# Disable GHC 6.12.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
|
||||
@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# Suitable LLVM version.
|
||||
llvmPackages = pkgs.llvmPackages_34;
|
||||
|
||||
# Disable GHC 7.0.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
@ -35,7 +38,7 @@ self: super: {
|
||||
binary = self.binary_0_7_4_0;
|
||||
|
||||
# deepseq is not a core library for this compiler.
|
||||
deepseq = self.deepseq_1_4_1_0;
|
||||
deepseq = self.deepseq_1_4_1_1;
|
||||
|
||||
# transformers is not a core library for this compiler.
|
||||
transformers = self.transformers_0_4_3_0;
|
||||
|
||||
@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# Suitable LLVM version.
|
||||
llvmPackages = pkgs.llvmPackages_35;
|
||||
|
||||
# Disable GHC 7.10.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
@ -125,10 +128,4 @@ self: super: {
|
||||
sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq";
|
||||
stripLen = 1;
|
||||
});
|
||||
|
||||
# https://github.com/batterseapower/ansi-wl-pprint/issues/13
|
||||
ansi-wl-pprint = appendPatch super.ansi-wl-pprint (pkgs.fetchpatch {
|
||||
url = "https://github.com/hvr/ansi-wl-pprint/commit/7e489ea6b546899074b1cdccf37d2e49ab313098.patch";
|
||||
sha256 = "0j20cwbph1wg82gfad5a6gfc5gy42cf4vz514jrpfg8d9qvyfhlj";
|
||||
});
|
||||
}
|
||||
|
||||
@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# Suitable LLVM version.
|
||||
llvmPackages = pkgs.llvmPackages_34;
|
||||
|
||||
# Disable GHC 7.2.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
@ -32,7 +35,7 @@ self: super: {
|
||||
unix = null;
|
||||
|
||||
# deepseq is not a core library for this compiler.
|
||||
deepseq = self.deepseq_1_4_1_0;
|
||||
deepseq = self.deepseq_1_4_1_1;
|
||||
|
||||
# transformers is not a core library for this compiler.
|
||||
transformers = self.transformers_0_4_3_0;
|
||||
@ -40,7 +43,7 @@ self: super: {
|
||||
transformers-compat = disableCabalFlag super.transformers-compat "three";
|
||||
|
||||
# https://github.com/haskell/cabal/issues/2322
|
||||
Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; };
|
||||
Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; };
|
||||
|
||||
# https://github.com/tibbe/hashable/issues/85
|
||||
hashable = dontCheck super.hashable;
|
||||
|
||||
@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# Suitable LLVM version.
|
||||
llvmPackages = pkgs.llvmPackages_34;
|
||||
|
||||
# Disable GHC 7.4.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
@ -37,7 +40,7 @@ self: super: {
|
||||
transformers-compat = disableCabalFlag super.transformers-compat "three";
|
||||
|
||||
# https://github.com/haskell/cabal/issues/2322
|
||||
Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
|
||||
Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; };
|
||||
|
||||
# https://github.com/tibbe/hashable/issues/85
|
||||
hashable = dontCheck super.hashable;
|
||||
|
||||
@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# Suitable LLVM version.
|
||||
llvmPackages = pkgs.llvmPackages_34;
|
||||
|
||||
# Disable GHC 7.6.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
@ -36,11 +39,11 @@ self: super: {
|
||||
transformers-compat = disableCabalFlag super.transformers-compat "three";
|
||||
|
||||
# haskeline and terminfo are not core libraries for this compiler.
|
||||
haskeline = self.haskeline_0_7_2_0;
|
||||
haskeline = self.haskeline_0_7_2_1;
|
||||
terminfo = self.terminfo_0_4_0_1;
|
||||
|
||||
# https://github.com/haskell/cabal/issues/2322
|
||||
Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
|
||||
Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; };
|
||||
|
||||
# https://github.com/tibbe/hashable/issues/85
|
||||
hashable = dontCheck super.hashable;
|
||||
@ -87,7 +90,7 @@ self: super: {
|
||||
presburger pretty process QuickCheck random smtLib syb text
|
||||
tf-random transformers utf8-string
|
||||
];
|
||||
buildTools = with self; [ alex happy Cabal_1_22_1_1 ];
|
||||
buildTools = with self; [ alex happy Cabal_1_22_2_0 ];
|
||||
patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal";
|
||||
description = "Cryptol: The Language of Cryptography";
|
||||
license = pkgs.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# Suitable LLVM version.
|
||||
llvmPackages = pkgs.llvmPackages_34;
|
||||
|
||||
# Disable GHC 7.8.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
@ -45,7 +48,7 @@ self: super: {
|
||||
mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
|
||||
transformers = super.transformers_0_4_3_0;
|
||||
transformers-compat = disableCabalFlag super.transformers-compat "three";
|
||||
haskeline = self.haskeline_0_7_2_0;
|
||||
haskeline = self.haskeline_0_7_2_1;
|
||||
mtl = super.mtl_2_2_1;
|
||||
})) (drv: {
|
||||
jailbreak = true; # idris is scared of lens 4.7
|
||||
@ -53,7 +56,7 @@ self: super: {
|
||||
}); # warning: "Module ‘Control.Monad.Error’ is deprecated"
|
||||
|
||||
# Depends on time == 0.1.5, which we don't have.
|
||||
HStringTemplate_0_8_1 = dontDistribute super.HStringTemplate_0_8_1;
|
||||
HStringTemplate_0_8_3 = dontDistribute super.HStringTemplate_0_8_3;
|
||||
|
||||
# This is part of bytestring in our compiler.
|
||||
bytestring-builder = dontHaddock super.bytestring-builder;
|
||||
|
||||
@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# Use the latest LLVM.
|
||||
inherit (pkgs) llvmPackages;
|
||||
|
||||
# Disable GHC 7.11.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
|
||||
@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# LLVM is not supported on this GHC; use the latest one.
|
||||
inherit (pkgs) llvmPackages;
|
||||
|
||||
# This is the list of packages that are built into a booted ghcjs installation
|
||||
# It can be generated with the command:
|
||||
# nix-shell '<nixpkgs>' -A pkgs.haskellPackages_ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'"
|
||||
|
||||
@ -54,7 +54,10 @@ let
|
||||
|
||||
inherit mkDerivation callPackage;
|
||||
|
||||
ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix { packages = pkgs self; };
|
||||
ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix {
|
||||
inherit (self) llvmPackages;
|
||||
packages = pkgs self;
|
||||
};
|
||||
|
||||
ghc = ghc // { withPackages = self.ghcWithPackages; };
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
{ pname
|
||||
, version
|
||||
, version, revision ? null
|
||||
, sha256 ? null
|
||||
, src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
|
||||
, buildDepends ? []
|
||||
@ -46,6 +46,7 @@
|
||||
}:
|
||||
|
||||
assert pkgconfigDepends != [] -> pkgconfig != null;
|
||||
assert editedCabalFile != null -> revision != null;
|
||||
|
||||
let
|
||||
|
||||
@ -53,8 +54,9 @@ let
|
||||
concatStringsSep enableFeature optionalAttrs;
|
||||
|
||||
newCabalFile = fetchurl {
|
||||
url = "http://hackage.haskell.org/package/${pname}-${version}/${pname}.cabal";
|
||||
url = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
|
||||
sha256 = editedCabalFile;
|
||||
name = "${pname}-${version}-r${revision}.cabal";
|
||||
};
|
||||
|
||||
defaultSetupHs = builtins.toFile "Setup.hs" ''
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,11 @@
|
||||
{ stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }:
|
||||
{ stdenv, ghc, llvmPackages, packages, buildEnv
|
||||
, makeWrapper
|
||||
, ignoreCollisions ? false, withLLVM ? false }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
# This wrapper works only with GHC 6.12 or later.
|
||||
assert stdenv.lib.versionOlder "6.12" ghc.version;
|
||||
assert versionOlder "6.12" ghc.version;
|
||||
|
||||
# It's probably a good idea to include the library "ghc-paths" in the
|
||||
# compiler environment, because we have a specially patched version of
|
||||
@ -25,15 +29,20 @@ assert stdenv.lib.versionOlder "6.12" ghc.version;
|
||||
# fi
|
||||
|
||||
let
|
||||
ghc761OrLater = stdenv.lib.versionOlder "7.6.1" ghc.version;
|
||||
ghc761OrLater = versionOlder "7.6.1" ghc.version;
|
||||
packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf";
|
||||
libDir = "$out/lib/ghc-${ghc.version}";
|
||||
docDir = "$out/share/doc/ghc/html";
|
||||
packageCfgDir = "${libDir}/package.conf.d";
|
||||
paths = stdenv.lib.filter (x: x ? isHaskellLibrary) (stdenv.lib.closePropagation packages);
|
||||
hasLibraries = stdenv.lib.any (x: x.isHaskellLibrary) paths;
|
||||
paths = filter (x: x ? isHaskellLibrary) (closePropagation packages);
|
||||
hasLibraries = any (x: x.isHaskellLibrary) paths;
|
||||
# CLang is needed on Darwin for -fllvm to work:
|
||||
# https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html
|
||||
llvm = makeSearchPath "bin"
|
||||
([ llvmPackages.llvm ]
|
||||
++ optional stdenv.isDarwin llvmPackages.clang);
|
||||
in
|
||||
if paths == [] then ghc else
|
||||
if paths == [] && !withLLVM then ghc else
|
||||
buildEnv {
|
||||
inherit (ghc) name;
|
||||
paths = paths ++ [ghc];
|
||||
@ -55,7 +64,8 @@ buildEnv {
|
||||
--set "NIX_GHC" "$out/bin/ghc" \
|
||||
--set "NIX_GHCPKG" "$out/bin/ghc-pkg" \
|
||||
--set "NIX_GHC_DOCDIR" "${docDir}" \
|
||||
--set "NIX_GHC_LIBDIR" "${libDir}"
|
||||
--set "NIX_GHC_LIBDIR" "${libDir}" \
|
||||
${optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''}
|
||||
done
|
||||
|
||||
for prg in runghc runhaskell; do
|
||||
@ -73,7 +83,7 @@ buildEnv {
|
||||
makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
|
||||
done
|
||||
|
||||
${stdenv.lib.optionalString hasLibraries "$out/bin/ghc-pkg recache"}
|
||||
${optionalString hasLibraries "$out/bin/ghc-pkg recache"}
|
||||
$out/bin/ghc-pkg check
|
||||
'';
|
||||
} // {
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
args :
|
||||
let
|
||||
lib = args.lib;
|
||||
fetchurl = args.fetchurl;
|
||||
simplyShare = args.simplyShare;
|
||||
|
||||
version = lib.attrByPath ["version"] "2.0.0" args;
|
||||
buildInputs = with args; [ ];
|
||||
in
|
||||
rec {
|
||||
src = fetchurl {
|
||||
url = http://weitz.de/files/cl-ppcre.tar.gz;
|
||||
sha256 = "1hrk051yi1qixy0vdig99cbv0v0p825acli65s08yz99b0pjz7m5";
|
||||
};
|
||||
|
||||
inherit buildInputs;
|
||||
configureFlags = [];
|
||||
|
||||
/* doConfigure should be specified separately */
|
||||
phaseNames = [(simplyShare "cl-ppcre")];
|
||||
|
||||
name = "cl-ppcre-" + version;
|
||||
meta = {
|
||||
description = "Common Lisp Portable Perl Compatible RegExp library";
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glm-0.9.6.0";
|
||||
name = "glm-0.9.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip";
|
||||
sha256 = "0gq79gxjm449ryi8l94rahrqy2cjccnrvivxgbwp10xdlfdyc4ha";
|
||||
sha256 = "1s1kpf9hpyq6bdf87nhlkxyr2ay0ip9wqicdma9h8yz4vs20r2hs";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
@ -9,14 +9,14 @@ assert sslSupport -> openssl != null;
|
||||
assert idnSupport -> libidn != null;
|
||||
|
||||
let
|
||||
version = "1.0.12";
|
||||
version = "1.0.13";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gloox-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://camaya.net/download/gloox-${version}.tar.bz2";
|
||||
sha256 = "1aa3pkg8yz6glg2273yl7310nkx1q31wkwbmmxwk3059k0p5l4k7";
|
||||
sha256 = "12payqyx1ly8nm3qn24bj0kyy9d08sixnjqxw7fn6rbwr7m1x7sd";
|
||||
};
|
||||
|
||||
buildInputs = [ ]
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkspell-${version}";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz";
|
||||
sha256 = "1hqaddgzxjw9lpsphankld6a8bpm92hfv46kp99cgmj82rdjwdq1";
|
||||
sha256 = "1hiwzajf18v9ik4nai3s7frps4ccn9s20nggad1c4k2mwb9ydwhk";
|
||||
};
|
||||
|
||||
buildInputs = [ aspell pkgconfig gtk3 enchant intltool ];
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
# (icu is a ~30 MB dependency, the rest is very small in comparison)
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "harfbuzz-0.9.38";
|
||||
name = "harfbuzz-0.9.40";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
|
||||
sha256 = "056mrzf6ry78s8nvnj4rqzc1gml2lcn314ijdzmsmz7dnj1z6dk7";
|
||||
sha256 = "07rjp05axas96fp23lpf8l2yyfdj9yib4m0qjv592vdyhcsxaw8p";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -60,17 +60,17 @@ let
|
||||
{ shortName, shortDescription, longDescription, dictFileName }:
|
||||
mkDict rec {
|
||||
inherit dictFileName;
|
||||
version = "5.2";
|
||||
version = "5.3";
|
||||
name = "hunspell-dict-${shortName}-dicollecte-${version}";
|
||||
readmeFile = "README_dict_fr.txt";
|
||||
src = fetchurl {
|
||||
url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip";
|
||||
sha256 = "c5863f7592a8c4defe8b4ed2b3b45f6f10ef265d34ae9881c1f3bbb3b80bdd02";
|
||||
sha256 = "0ca7084jm7zb1ikwzh1frvpb97jn27i7a5d48288h2qlfp068ik0";
|
||||
};
|
||||
meta = with stdenv.lib; {
|
||||
inherit longDescription;
|
||||
description = "Hunspell dictionary for ${shortDescription} from Dicollecte";
|
||||
homepage = http://www.dicollecte.org/home.php?prj=fr;
|
||||
homepage = "http://www.dicollecte.org/home.php?prj=fr";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ renzo ];
|
||||
platforms = platforms.all;
|
||||
@ -86,7 +86,7 @@ let
|
||||
readmeFile = "README_" + dictFileName + ".txt";
|
||||
meta = with stdenv.lib; {
|
||||
description = "Hunspell dictionary for ${shortDescription} from Wordlist";
|
||||
homepage =http://wordlist.aspell.net/;
|
||||
homepage = http://wordlist.aspell.net/;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ renzo ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libdrm-2.4.59";
|
||||
name = "libdrm-2.4.60";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
|
||||
sha256 = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b";
|
||||
sha256 = "12cqnmssi6mbr93n29mm84k8wix5nx6zs82k7wcmj7z3r335ymwr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libebml-1.3.0";
|
||||
name = "libebml-1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2";
|
||||
sha256 = "1plnh2dv8k9s4d06c2blv2sl8bnz6d6shvj0h00al597nvb79c43";
|
||||
sha256 = "15a2d15rq0x9lp7rfsv0jxaw5c139xs7s5dwr5bmd9dc3arr8n0r";
|
||||
};
|
||||
|
||||
configurePhase = "cd make/linux";
|
||||
makeFlags = "prefix=$(out)";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Extensible Binary Meta Language library";
|
||||
license = licenses.lgpl21;
|
||||
homepage = http://dl.matroska.org/downloads/libebml/;
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,25 +1,16 @@
|
||||
a :
|
||||
let
|
||||
s = import ./src-for-default.nix;
|
||||
buildInputs = with a; [
|
||||
|
||||
];
|
||||
in
|
||||
rec {
|
||||
src = a.fetchUrlFromSrcInfo s;
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
inherit (s) name;
|
||||
inherit buildInputs;
|
||||
configureFlags = [];
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doConfigure" "doMakeInstall"];
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libev-${version}";
|
||||
version="4.19";
|
||||
src = fetchurl {
|
||||
url = "http://dist.schmorp.de/libev/${name}.tar.gz";
|
||||
sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48";
|
||||
};
|
||||
meta = {
|
||||
description = "An event loop library remotely similar to libevent";
|
||||
maintainers = [
|
||||
a.lib.maintainers.raskin
|
||||
];
|
||||
platforms = a.lib.platforms.all;
|
||||
description = "A high-performance event loop/event model with lots of features";
|
||||
maintainers = [ stdenv.lib.maintainers.raskin ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = stdenv.lib.licenses.bsd2; # or GPL2+
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
rec {
|
||||
version="4.15";
|
||||
name="libev-4.15";
|
||||
hash="1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj";
|
||||
url="http://dist.schmorp.de/libev/Attic/libev-${version}.tar.gz";
|
||||
advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz";
|
||||
|
||||
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
{
|
||||
downloadPage = "http://dist.schmorp.de/libev/Attic/?M=D";
|
||||
sourceRegexp = "(^|/)libev-.*[.]tar[.]gz";
|
||||
baseName = "libev";
|
||||
}
|
||||
@ -15,11 +15,11 @@ in
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libinput-0.11.0";
|
||||
name = "libinput-0.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
|
||||
sha256 = "0hq7plvf9gpscy69pngffrfzqdrcwvpqr0a8fh45xslm5xwxcz4j";
|
||||
sha256 = "06n6ih2bfr957rprsgjxhi6f7m96wmf4kgac8y0ispsjvrzszv3c";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -9,12 +9,16 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
configurePhase = "cd make/linux";
|
||||
makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib";
|
||||
makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib"
|
||||
+ stdenv.lib.optionalString stdenv.isDarwin " CXX=clang++";
|
||||
propagatedBuildInputs = [ libebml ];
|
||||
|
||||
meta = {
|
||||
description = "Matroska library";
|
||||
homepage = http://dl.matroska.org/downloads/libmatroska;
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library to parse Matroska files";
|
||||
homepage = http://matroska.org/;
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,23 +1,24 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, python, udev }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libmbim-1.6.0";
|
||||
name = "libmbim-1.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/libmbim/${name}.tar.xz";
|
||||
sha256 = "10mh1b8jfxg6y6nhr7swbi9wx4acjgvx1if7nhrw1ppd5apvvvz0";
|
||||
sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
for f in build-aux/mbim-codegen/*; do
|
||||
substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
|
||||
done
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
buildInputs = [ pkgconfig glib udev ];
|
||||
buildInputs = [ pkgconfig glib udev python ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.freedesktop.org/software/libmbim/;
|
||||
description = "talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ wkennington ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
|
||||
};
|
||||
|
||||
# Otherwise clang fails with 'duplicate symbol ___sputc'
|
||||
buildFlags = stdenv.lib.optionalString stdenv.isDarwin "CFLAGS=-std=gnu89";
|
||||
|
||||
meta = {
|
||||
homepage = http://libmpeg2.sourceforge.net/;
|
||||
description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libqmi-1.8.0";
|
||||
name = "libqmi-1.12.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/libqmi/${name}.tar.xz";
|
||||
sha256 = "03gf221yjcdzvnl4v2adwpc6cyg5mlbccn20s00fp5bgvmq81pgs";
|
||||
sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
@ -15,7 +15,10 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ pkgconfig glib python ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.freedesktop.org/wiki/Software/libqmi/;
|
||||
description = "Modem protocol helper library";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ wkennington ];
|
||||
};
|
||||
}
|
||||
|
||||
38
pkgs/development/libraries/libsvm/default.nix
Normal file
38
pkgs/development/libraries/libsvm/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libsvm-${version}";
|
||||
version = "3.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz";
|
||||
sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
make
|
||||
make lib
|
||||
'';
|
||||
|
||||
installPhase = let
|
||||
libSuff = if stdenv.isDarwin then "dylib" else "so";
|
||||
in ''
|
||||
mkdir -p $out/lib $out/bin $out/include;
|
||||
cp libsvm.so.2 $out/lib/libsvm.2.${libSuff};
|
||||
ln -s $out/lib/libsvm.2.${libSuff} $out/lib/libsvm.${libSuff};
|
||||
cp svm-scale svm-train svm-predict $out/bin;
|
||||
cp svm.h $out/include;
|
||||
'';
|
||||
|
||||
postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -id libsvm.2.dylib $out/lib/libsvm.2.dylib;
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library for support vector machines";
|
||||
homepage = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool}:
|
||||
{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}:
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
name = "libtheora-1.1.1";
|
||||
@ -7,12 +7,28 @@ stdenv.mkDerivation ({
|
||||
sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0";
|
||||
};
|
||||
|
||||
buildInputs = [pkgconfig];
|
||||
|
||||
propagatedBuildInputs = [libogg libvorbis];
|
||||
|
||||
# GCC's -fforce-addr flag is not supported by clang
|
||||
# It's just an optimization, so it's safe to simply remove it
|
||||
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure --replace "-fforce-addr" ""
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv];
|
||||
configureFlags = "--disable-examples";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.theora.org/;
|
||||
description = "Library for Theora, a free and open video compression format";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
# It has an old config.guess that doesn't know the mips64el.
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, wayland, libffi }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libva-1.5.0";
|
||||
name = "libva-1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
|
||||
sha256 = "11ilp32fy7s42ii2dlcnf7305r9pi610r3jqdbn26khf26rx8ip9";
|
||||
sha256 = "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes wayland libffi ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libvdpau-0.9";
|
||||
name = "libvdpau-1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
|
||||
sha256 = "0vhfkjqghfva3zjif04w7pdp84g08c8xnwir3ah4b99m10a5fag3";
|
||||
sha256 = "069r4qc934xw3z20hpmg0gx0al7fl1kdik1r46x2dgr0ya1yg95f";
|
||||
};
|
||||
|
||||
buildInputs = with xorg; [ pkgconfig dri2proto libXext ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, libogg, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libvorbis-1.3.4";
|
||||
name = "libvorbis-1.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
|
||||
sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g";
|
||||
sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig ];
|
||||
|
||||
@ -27,11 +27,11 @@ in
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libwebp-${version}";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
|
||||
sha256 = "0bbjl5spgq7jq7ms5q0scxg5hmg4dd386syb3di4jzggqbbjbn0l";
|
||||
sha256 = "1i4hfczjm3b1qj1g4cc9hgb69l47f3nkgf6hk7nz4dm9zmc0vgpg";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = glib.flattenInclude;
|
||||
|
||||
patches = stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./fix-clang36.patch;
|
||||
|
||||
meta = {
|
||||
homepage = http://pixman.org;
|
||||
description = "A low-level library for pixel manipulation";
|
||||
|
||||
11
pkgs/development/libraries/pixman/fix-clang36.patch
Normal file
11
pkgs/development/libraries/pixman/fix-clang36.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/pixman/pixman-mmx.c 2014-04-24 08:34:14.000000000 +0400
|
||||
+++ b/pixman/pixman-mmx.c 2015-01-30 20:19:28.000000000 +0300
|
||||
@@ -89,7 +89,7 @@
|
||||
return __A;
|
||||
}
|
||||
|
||||
-# ifdef __OPTIMIZE__
|
||||
+# if defined(__OPTIMIZE__) && !(defined (__clang__) && defined(__clang_major__) && defined(__clang_minor__) && __clang_major__ == 3 && __clang_minor__ >= 6)
|
||||
extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
|
||||
_mm_shuffle_pi16 (__m64 __A, int8_t const __N)
|
||||
{
|
||||
@ -1,11 +1,28 @@
|
||||
{stdenv, fetchurl, liboil, pkgconfig}:
|
||||
{stdenv, fetchurl, orc, pkgconfig}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "schroedinger-1.0.0";
|
||||
name = "schroedinger-1.0.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/schrodinger/schroedinger-1.0.0.tar.gz;
|
||||
sha256 = "0r374wvc73pfzkcpwk0q0sjx6yhp79acyiqbjy3c7sfqdy7sm4x8";
|
||||
url = http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz;
|
||||
sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy";
|
||||
};
|
||||
|
||||
buildInputs = [liboil pkgconfig];
|
||||
buildInputs = [orc pkgconfig];
|
||||
|
||||
# The test suite is known not to build against Orc >0.4.16 in Schroedinger 1.0.11.
|
||||
# A fix is in upstream, so test when pulling 1.0.12 if this is still needed. See:
|
||||
# http://www.mail-archive.com/schrodinger-devel@lists.sourceforge.net/msg00415.html
|
||||
preBuild = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "SUBDIRS = schroedinger doc tools testsuite" "SUBDIRS = schroedinger doc tools" \
|
||||
--replace "DIST_SUBDIRS = schroedinger doc tools testsuite" "DIST_SUBDIRS = schroedinger doc tools"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://diracvideo.org/";
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libdrm, libva, libX11, intel-gpu-tools, mesa_noglu, wayland, python, gnum4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libva-intel-driver-1.5.0";
|
||||
name = "libva-intel-driver-1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
|
||||
sha256 = "1p537n2dpmybpf7rligbnhw406lr575bhkafs4n64jxk78clid6h";
|
||||
sha256 = "1p7aw0wmb6z3rbbm3bqlp6rxw41kii23csbjmcvbbk037lq6rnqb";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{stdenv, fetchurl, yasm}:
|
||||
{stdenv, fetchurl, yasm, enable10bit ? false}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "snapshot-20130424-2245-stable";
|
||||
name = "x264-20130424_2245";
|
||||
version = "snapshot-20141218-2245-stable";
|
||||
name = "x264-20141218-2245";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
|
||||
sha256 = "0vzyqsgrm9k3hzka2p8ib92jl0ha8d4267r2rb3pr9gmpjaj9azk";
|
||||
sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
@ -14,13 +14,16 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-shared" ]
|
||||
++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic";
|
||||
++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"
|
||||
++ stdenv.lib.optional (enable10bit) "--bit-depth=10";
|
||||
|
||||
buildInputs = [ yasm ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "library for encoding H264/AVC video streams";
|
||||
homepage = http://www.videolan.org/developers/x264.html;
|
||||
license = "GPL";
|
||||
homepage = http://www.videolan.org/developers/x264.html;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ stdenv, fetchurl, cmake, llvmPackages }:
|
||||
{ stdenv, fetchurl, cmake, llvmPackages_35 }:
|
||||
|
||||
with llvmPackages;
|
||||
|
||||
let version = "3.5"; in
|
||||
let version = "3.5"; in with llvmPackages_35;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "include-what-you-use-${version}";
|
||||
|
||||
@ -16,12 +14,9 @@ stdenv.mkDerivation rec {
|
||||
longDescription = ''
|
||||
For every symbol (type, function variable, or macro) that you use in
|
||||
foo.cc, either foo.cc or foo.h should #include a .h file that exports the
|
||||
declaration of that symbol. The include-what-you-use tool is a program
|
||||
that can be built with the clang libraries in order to analyze #includes
|
||||
of source files to find include-what-you-use violations, and suggest
|
||||
fixes for them. The main goal of include-what-you-use is to remove
|
||||
superfluous #includes. It does this both by figuring out what #includes
|
||||
are not actually needed for this file (for both .cc and .h files), and
|
||||
declaration of that symbol. The main goal of include-what-you-use is to
|
||||
remove superfluous #includes, both by figuring out what #includes are not
|
||||
actually needed for this file (for both .cc and .h files), and by
|
||||
replacing #includes with forward-declares when possible.
|
||||
'';
|
||||
homepage = http://include-what-you-use.com;
|
||||
|
||||
28
pkgs/development/tools/build-managers/bazel/default.nix
Normal file
28
pkgs/development/tools/build-managers/bazel/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bazel-20150326.981b7bc1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "bazel";
|
||||
rev = "981b7bc1";
|
||||
sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
PROTOC=protoc bash compile.sh
|
||||
mkdir -p $out/bin $out/share
|
||||
cp -R output $out/share/bazel
|
||||
ln -s $out/share/bazel/bazel $out/bin/bazel
|
||||
wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://github.com/google/bazel/;
|
||||
description = "Build tool that builds code quickly and reliably";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
--- ./Modules/FindOpenSSL.cmake
|
||||
+++ ./Modules/FindOpenSSL.cmake
|
||||
@@ -264,7 +264,7 @@
|
||||
set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
|
||||
elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
|
||||
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
|
||||
- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
|
||||
+ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
|
||||
|
||||
# The version number is encoded as 0xMNNFFPPS: major minor fix patch status
|
||||
# The status gives if this is a developer or prerelease and is ignored here.
|
||||
@ -33,7 +33,11 @@ stdenv.mkDerivation rec {
|
||||
url = "http://public.kitware.com/Bug/file_download.php?"
|
||||
+ "file_id=4981&type=bug";
|
||||
sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
|
||||
});
|
||||
}) ++
|
||||
# fix cmake detection of openssl libs
|
||||
# see: http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
|
||||
# and http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1
|
||||
[./cmake_find_openssl_for_openssl-1.0.1m_and_up.patch];
|
||||
|
||||
buildInputs =
|
||||
[ bzip2 curl expat libarchive xz zlib ]
|
||||
|
||||
@ -41,7 +41,7 @@ let
|
||||
#
|
||||
# extraConfig is meant to be sh lines exporting environment
|
||||
# variables like DISTCC_HOSTS, DISTCC_DIR, ...
|
||||
links = extraConfig : (runCommand "distcc-links" { }
|
||||
links = extraConfig: (runCommand "distcc-links" { passthru.gcc = gcc.cc; }
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
if [ -x "${gcc.cc}/bin/gcc" ]; then
|
||||
|
||||
33
pkgs/development/tools/toluapp/default.nix
Normal file
33
pkgs/development/tools/toluapp/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchFromGitHub, scons, lua }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.92";
|
||||
name = "toluapp-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eddieringle";
|
||||
repo = "toluapp";
|
||||
rev = "b1e680dc486c17128a3c21f89db1693ff06c02b1";
|
||||
sha256 = "1d1a9bll9825dg4mz71vwykvfd3s5zi2yvzbfsvlr3qz1l3zqfwb";
|
||||
};
|
||||
|
||||
buildInputs = [ lua scons ];
|
||||
|
||||
patches = [ ./environ-and-linux-is-kinda-posix.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace config_posix.py \
|
||||
--replace /usr/local $out
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fPIC";
|
||||
|
||||
buildPhase = ''scons'';
|
||||
|
||||
installPhase = ''scons install'';
|
||||
|
||||
meta = {
|
||||
licence = stdenv.lib.licenses.mit;
|
||||
};
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
As it turns out, scons doesn't inherit environment variables by
|
||||
default. Debugging this was very pleasant. -- oxij
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 5c1e774..66aa4c8 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -5,13 +5,11 @@ tools = ['default']
|
||||
if os.name == 'nt':
|
||||
tools = ['mingw']
|
||||
|
||||
-env = Environment(tools = tools)
|
||||
+env = Environment(tools = tools, ENV = os.environ)
|
||||
|
||||
options_file = None
|
||||
-if sys.platform == 'linux2':
|
||||
- options_file = "linux"
|
||||
|
||||
-elif 'msvc' in env['TOOLS']:
|
||||
+if 'msvc' in env['TOOLS']:
|
||||
options_file = "msvc"
|
||||
else:
|
||||
options_file = "posix"
|
||||
diff --git a/config_posix.py b/config_posix.py
|
||||
index 2bb696c..eb4eb9b 100644
|
||||
--- a/config_posix.py
|
||||
+++ b/config_posix.py
|
||||
@@ -16,7 +16,7 @@ CCFLAGS = ['-O2', '-ansi', '-Wall']
|
||||
prefix = '/usr/local'
|
||||
|
||||
# libraries
|
||||
-LIBS = ['lua', 'lualib', 'm']
|
||||
+LIBS = ['lua', 'liblua', 'm']
|
||||
|
||||
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
|
||||
, dbus, libusb, acl }:
|
||||
, dbus, acl
|
||||
, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
|
||||
}:
|
||||
|
||||
let version = "1.7.5"; in
|
||||
let version = "2.0.2"; in
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation {
|
||||
name = "cups-${version}";
|
||||
|
||||
@ -10,15 +13,27 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
|
||||
sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq";
|
||||
sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
|
||||
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
|
||||
++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
|
||||
|
||||
propagatedBuildInputs = [ openssl ];
|
||||
|
||||
configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
"--with-systemd=\${out}/lib/systemd/system"
|
||||
"--enable-raw-printing"
|
||||
"--enable-threads"
|
||||
] ++ optionals stdenv.isLinux [
|
||||
"--enable-dbus"
|
||||
"--enable-pam"
|
||||
] ++ optional (libusb != null) "--enable-libusb"
|
||||
++ optional (gnutls != null) "--enable-ssl"
|
||||
++ optional (avahi != null) "--enable-avahi"
|
||||
++ optional (libpaper != null) "--enable-libpaper";
|
||||
|
||||
installFlags =
|
||||
[ # Don't try to write in /var at build time.
|
||||
|
||||
24
pkgs/misc/screensavers/physlock/default.nix
Normal file
24
pkgs/misc/screensavers/physlock/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "git-20150126";
|
||||
name = "physlock-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "muennich";
|
||||
repo = "physlock";
|
||||
rev = "b64dccc8c22710f8bf01eb5419590cdb0e65cabb";
|
||||
sha256 = "1dapkwj3y6bb4j8q4glms7zsqm7drr37nrnr30sbahwq67rnvzcc";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace /usr/local $out \
|
||||
--replace "-m 4755 -o root -g root" ""
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A secure suspend/hibernate-friendly alternative to `vlock -an` without PAM support";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,14 +1,25 @@
|
||||
{stdenv, fetchurl, x11, mesa, pkgconfig, imagemagick, libtiff, bzip2}:
|
||||
{stdenv, fetchurl, pkgconfig, x11, libXext, mesa, imagemagick, libtiff, bzip2}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.1";
|
||||
name = "rss-glx-${version}";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rss-glx-0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2;
|
||||
sha256 = "1fs2xavyf9i6vcdmdnpyi9rbnrg05ldd49bvlcwpn5igv2g400yg";
|
||||
url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2";
|
||||
sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg";
|
||||
};
|
||||
|
||||
buildInputs = [x11 mesa pkgconfig imagemagick libtiff bzip2];
|
||||
buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick";
|
||||
NIX_LDFLAGS= "-rpath ${libXext}/lib";
|
||||
|
||||
meta = {
|
||||
description = "Really Slick Screensavers Port to GLX";
|
||||
longDescription = ''
|
||||
This package currently contains all of the screensavers from the
|
||||
original collection, plus a few others.
|
||||
'';
|
||||
licence = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# TODO check that no license information gets lost
|
||||
{ fetchurl, bash, stdenv, python, cmake, vim, vimUtils, perl, ruby, unzip,
|
||||
which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip,
|
||||
vim_configurable, vimPlugins, xkb_switch
|
||||
vim_configurable, vimPlugins, xkb_switch, git
|
||||
}:
|
||||
|
||||
let
|
||||
@ -51,25 +51,24 @@ rec {
|
||||
alternative = a; # backwards compat, added 2014-10-21
|
||||
|
||||
calendar = buildVimPlugin {
|
||||
name = "calendar-git-2014-10-19";
|
||||
name = "calendar-git-2015-03-19";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/itchyny/calendar.vim.git";
|
||||
rev = "44890a96d80bcd5fe62307e4bcb4d4085010e324";
|
||||
sha256 = "55f38e3e0af0f95229c654420c332668f93ac941f044c0573c7f1b26030e9202";
|
||||
};
|
||||
rev = "a1b9d1a11e301a25bc48350da833469ef8bb6c9f";
|
||||
sha256 = "a3a8da7890c5eedba72e2def86760b79092b3b5cf2ca3999deda5fa8eddecd49";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/itchyny/calendar.vim;
|
||||
homepage = https://github.com/itchyny/calendar.vim;
|
||||
maintainers = [ stdenv.lib.maintainers.jagajaga ];
|
||||
};
|
||||
};
|
||||
|
||||
command-t = buildVimPlugin rec {
|
||||
version = "1.8";
|
||||
name = "command-t-${version}";
|
||||
src = fetchzip {
|
||||
inherit name;
|
||||
url = "https://github.com/wincent/Command-T/archive/${version}.tar.gz";
|
||||
sha256 = "186qz1smf7w91r68p724whg6d821f7ph6ks63l2vkhff8f9qqhrc";
|
||||
name = "command-t-git-2015-01-12";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/wincent/Command-T";
|
||||
rev = "13760a725779b65fa0f2ebef51806f3c05a52550";
|
||||
sha256 = "0cb284w1m8sxcc8ph64pm0cvqslpixss593a1ffnx9c09g6d7m8w";
|
||||
};
|
||||
buildInputs = [ perl ruby ];
|
||||
buildPhase = ''
|
||||
@ -83,25 +82,26 @@ rec {
|
||||
command_T = command-t; # backwards compat, added 2014-10-18
|
||||
|
||||
easymotion = buildVimPlugin {
|
||||
name = "easymotion-git-2014-09-29";
|
||||
name = "easymotion-git-2015-02-24";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/lokaltog/vim-easymotion.git";
|
||||
rev = "868cd71710a48e8ec8acffeabd1eebfb10812c77";
|
||||
sha256 = "13c8b93c257fcbb0f6e0eb197700b4f8cbe4cf4846d29f1aba65f625202b9d77";
|
||||
};
|
||||
rev = "8acdfc60e58bb0600ded42a4f752bec6e3b6d882";
|
||||
sha256 = "1177d1c06a16fe7c1e681a729d158a6cacf3fed9c14bd8c4ece35a069f21dc07";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/lokaltog/vim-easymotion;
|
||||
homepage = https://github.com/lokaltog/vim-easymotion;
|
||||
maintainers = [ stdenv.lib.maintainers.jagajaga ];
|
||||
};
|
||||
};
|
||||
|
||||
eighties = buildVimPlugin rec {
|
||||
version = "1.0.4";
|
||||
name = "eighties-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/justincampbell/vim-eighties/archive/${version}.tar.gz";
|
||||
sha256 = "0cjd9hbg2qd7jjkvyi15f9ysp7m3aa2sg8nvbf80yb890rfkwaqr";
|
||||
|
||||
eighties = buildVimPlugin {
|
||||
name = "eighties-git-2015-02-12";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/justincampbell/vim-eighties";
|
||||
rev = "5d0ebf5424adb8017bec049de0cd51f6fa427281";
|
||||
sha256 = "b4216c805e54f923efcbd8d914f97883f135c989f33e87d2eee69b488b57e747";
|
||||
};
|
||||
buildPhase = ":";
|
||||
meta = with stdenv.lib; {
|
||||
description = "Automatically resizes your windows to 80 characters";
|
||||
homepage = https://github.com/justincampbell/vim-eighties;
|
||||
@ -111,6 +111,7 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
gitgutter = vim-gitgutter;
|
||||
|
||||
golang = buildVimPlugin {
|
||||
@ -195,40 +196,40 @@ rec {
|
||||
};
|
||||
|
||||
idris-vim = buildVimPlugin {
|
||||
name = "idris-vim-git-2014-10-14";
|
||||
name = "idris-vim-git-2014-12-29";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/idris-hackers/idris-vim.git";
|
||||
rev = "78730e511cae0a067f79da1168466601553f619b";
|
||||
sha256 = "47638b25fa53203e053e27ec6f135fd63ae640edbe37e62d7450a8c434a4cc6b";
|
||||
};
|
||||
rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1";
|
||||
sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/idris-hackers/idris-vim;
|
||||
homepage = https://github.com/idris-hackers/idris-vim;
|
||||
maintainers = [ stdenv.lib.maintainers.jagajaga ];
|
||||
};
|
||||
};
|
||||
|
||||
ipython = buildVimPlugin {
|
||||
name = "ipython-git-2014-07-17";
|
||||
name = "ipython-git-2015-01-12";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/ivanov/vim-ipython.git";
|
||||
rev = "9ce4f201ce26e9f01d56a6040ddf9255aab27272";
|
||||
sha256 = "444dede544f9b519143ecc3a6cdfef0c4c32043fc3cd69f92fdcd86c1010e824";
|
||||
};
|
||||
rev = "a47d92b371588a81f8501c66604d79e2827c60a8";
|
||||
sha256 = "7cf2dbed5b404164199d4784331b21d90d371275b1d324298cde9eeda3c4eb53";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/ivanov/vim-ipython;
|
||||
homepage = https://github.com/ivanov/vim-ipython;
|
||||
maintainers = [ stdenv.lib.maintainers.jagajaga ];
|
||||
};
|
||||
};
|
||||
|
||||
latex-box = buildVimPlugin {
|
||||
name = "latex-box-git-2014-10-05";
|
||||
name = "latex-box-git-2015-03-05";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/latex-box-team/latex-box.git";
|
||||
rev = "3e000fb161bdf6efe7aef517aef276554aeabb65";
|
||||
sha256 = "462803aceec5904943074e11888482ef6c49c8a5e26d6728ebcb2c4f5dbbb6a4";
|
||||
};
|
||||
rev = "0992511ad9b250cbe53bccbec3b0cb24feca64ec";
|
||||
sha256 = "8e73020a4ad275dfb8887bfc6a85c8aa059a081feefb680b2fd7c85267137440";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/latex-box-team/latex-box;
|
||||
homepage = https://github.com/latex-box-team/latex-box;
|
||||
maintainers = [ stdenv.lib.maintainers.jagajaga ];
|
||||
};
|
||||
};
|
||||
@ -247,14 +248,14 @@ rec {
|
||||
};
|
||||
|
||||
neco-ghc = buildVimPlugin {
|
||||
name = "neco-ghc-git-2014-10-17";
|
||||
name = "neco-ghc-git-2015-03-21";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/eagletmt/neco-ghc.git";
|
||||
rev = "fffdf57dcb312f874a43a202157b5efecfe3d9de";
|
||||
sha256 = "464b24e3151ebaf0e95c25f09cb047e2542d5dd9100087e538d0a5e46bd0e638";
|
||||
};
|
||||
rev = "7d2c360736679064986925873b8d1e2b1978d9f8";
|
||||
sha256 = "3c4d1b00c79953e56379792a64df036075a456cb10a7b891e1691d04c9f15310";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/eagletmt/neco-ghc;
|
||||
homepage = https://github.com/eagletmt/neco-ghc;
|
||||
maintainers = [ stdenv.lib.maintainers.jagajaga ];
|
||||
};
|
||||
};
|
||||
@ -262,12 +263,12 @@ rec {
|
||||
necoGhc = neco-ghc; # backwards compat, added 2014-10-18
|
||||
|
||||
neocomplete = buildVimPlugin {
|
||||
name = "neocomplete-git-2014-11-18";
|
||||
name = "neocomplete-git-2015-03-24";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/Shougo/neocomplete.vim.git";
|
||||
rev = "26aef680ece29047089e7540b78696f1e6336be2";
|
||||
sha256 = "42734ddb29f6661de687e0d18c5ddbd443adc6d2f69fe8e44d0e47473f1bc0ae";
|
||||
};
|
||||
rev = "1ef1c33cfdcae43d8b3c6381c4f54f0e93a17287";
|
||||
sha256 = "5c61629c30906aacc00924ab5aaad720aba0011df348ea8835b6aaa53199550a";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/Shougo/neocomplete.vim;
|
||||
maintainers = [ stdenv.lib.maintainers.jagajaga ];
|
||||
@ -275,12 +276,12 @@ rec {
|
||||
};
|
||||
|
||||
neosnippet = buildVimPlugin {
|
||||
name = "neosnippet-git-2014-11-18";
|
||||
name = "neosnippet-git-2015-01-19";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/Shougo/neosnippet.vim.git";
|
||||
rev = "811176b29b1a60a164c9878f8dcbe4a680ee32e5";
|
||||
sha256 = "903b6fa01511e319e5ce3efa3a7007047512f5f7ee7d61b69cd4a324420cf718";
|
||||
};
|
||||
rev = "044c9cb8ca46a5e27eec37198990c26fe707b02a";
|
||||
sha256 = "c448fac34e432a496ec1d76e07b478b27e66e6e4ec99c1b3923e66c781b74fc8";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/Shougo/neosnippet.vim;
|
||||
maintainers = [ stdenv.lib.maintainers.jagajaga ];
|
||||
@ -288,26 +289,27 @@ rec {
|
||||
};
|
||||
|
||||
neosnippet-snippets = buildVimPlugin {
|
||||
name = "neosnippet-snippets-git-2014-11-17";
|
||||
name = "neosnippet-snippets-git-2015-03-25";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/Shougo/neosnippet-snippets.git";
|
||||
rev = "a15cdc307a62d64c3510b4a1097a8bd174746894";
|
||||
sha256 = "8d69b93163dd93474422bf4f362130151f25e2c9fad3500ba170161c24bf5bce";
|
||||
};
|
||||
rev = "dfa436157c9e72f16f0f0d088fa181b37e226c2f";
|
||||
sha256 = "00a65d1f6a1309acef42c0ca70f333ab355db521319c14db8247be38d28da730";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/Shougo/neosnippet-snippets;
|
||||
maintainers = [ stdenv.lib.maintainers.jagajaga ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
nerdcommenter = The_NERD_Commenter;
|
||||
|
||||
quickrun = buildVimPlugin {
|
||||
name = "quickrun-git-2014-10-08";
|
||||
name = "quickrun-git-2015-03-26";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/thinca/vim-quickrun.git";
|
||||
rev = "ae97cef42ae142306e9431dce9ab97c4353e5254";
|
||||
sha256 = "3219fadb3732c895c82b8bcff1d6e86f0917cd5ac7bf34180c27bb3f75ed1787";
|
||||
rev = "2d03b3a7405da0e95ff7f6f617843ba9f536395f";
|
||||
sha256 = "803e902a083b79c70ea3f826a89864b8879897cd36a655d9e789a0d651127eb3";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/thinca/vim-quickrun;
|
||||
@ -316,16 +318,14 @@ rec {
|
||||
};
|
||||
|
||||
racer = buildVimPlugin {
|
||||
name = "racer-git-2014-11-24";
|
||||
name = "racer-git-2015-03-23";
|
||||
src = fetchgit {
|
||||
url = https://github.com/phildawes/racer;
|
||||
rev = "50655ffd509bea09ea9b310970dedfeaf5a33cf3";
|
||||
sha256 = "0bd456i4nz12z39ljnw1kjg8mcflvm7rjql2r80fb038c7rd6xi1";
|
||||
url = "https://github.com/phildawes/racer";
|
||||
rev = "c6f557bfd9a22d45476651fa95f7d8415ed897a8";
|
||||
sha256 = "697d92e0acbb3a8c1d691eaebc008bec422060df10e3c4cf6fad448b30391852";
|
||||
};
|
||||
buildPhase = ''
|
||||
find . -type f -not -name 'racer.vim' -exec rm -rf {} \;
|
||||
mkdir plugin
|
||||
mv ./editors/racer.vim plugin/racer.vim
|
||||
rm -rf editors images src
|
||||
'';
|
||||
meta = {
|
||||
@ -399,11 +399,11 @@ rec {
|
||||
};
|
||||
|
||||
thumbnail = buildVimPlugin {
|
||||
name = "thumbnail-git-2014-07-24";
|
||||
name = "thumbnail-git-2015-03-15";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/itchyny/thumbnail.vim.git";
|
||||
rev = "e59a1791862ed470510a58456cc001226e177a39";
|
||||
sha256 = "f36d915804e36b5f2dcea7db481da97ec60d0c90df87599a5d5499e649d97f66";
|
||||
rev = "19bd717307a8d0986a4a77116f47168fbe11e178";
|
||||
sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/itchyny/thumbnail.vim;
|
||||
@ -412,11 +412,11 @@ rec {
|
||||
};
|
||||
|
||||
tmux-navigator = buildVimPlugin {
|
||||
name = "tmux-navigator-git-2014-09-09";
|
||||
name = "tmux-navigator-git-2015-03-16";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/christoomey/vim-tmux-navigator.git";
|
||||
rev = "195cdf087fea7beaf6274d0a655d157dfab3130c";
|
||||
sha256 = "4235c2bfb64a9094b854cdd7303a64bbb994717f24704911c4b358b2373dfaa9";
|
||||
rev = "928a52fbda90ec70b2eb6edaf570654df4521af0";
|
||||
sha256 = "6f6912960245664146ead711886aad216b74f4c6b1feec975cab199114afb13c";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/christoomey/vim-tmux-navigator;
|
||||
@ -427,11 +427,11 @@ rec {
|
||||
tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18
|
||||
|
||||
tslime = buildVimPlugin {
|
||||
name = "tslime-git-2014-06-12";
|
||||
name = "tslime-git-2015-02-10";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/jgdavey/tslime.vim.git";
|
||||
rev = "e801a32b27d83cb5d91afbf7c3d71bb6220f32bd";
|
||||
sha256 = "47fb7165c1dcc444285cdff6fa89bbd4ace82ca79ec14ba0da6091c5f78d1251";
|
||||
rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7";
|
||||
sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/jgdavey/tslime.vim;
|
||||
@ -440,12 +440,12 @@ rec {
|
||||
};
|
||||
|
||||
vimproc = buildVimPlugin {
|
||||
name = "vimproc-git-2014-10-03";
|
||||
name = "vimproc-git-2015-02-23";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/shougo/vimproc.vim.git";
|
||||
rev = "3e055023dfab4f5a4dfa05a834f9d0cb7294a82e";
|
||||
sha256 = "63c2786897e8315eed2473822879b7ceb847e6021695a861892d7b9ab15a69fb";
|
||||
};
|
||||
rev = "0f68bcd93399ecbcde3eaa4efd09107314c9bdee";
|
||||
sha256 = "850cb6d347f4c353782c48533f2dc6e3150a3982dc71efbd5f6b0a921264f939";
|
||||
};
|
||||
buildInputs = [ which ];
|
||||
|
||||
buildPhase = ''
|
||||
@ -460,9 +460,12 @@ rec {
|
||||
};
|
||||
|
||||
vimshell = buildVimPlugin rec {
|
||||
version = "9.2";
|
||||
name = "vimshell-${version}";
|
||||
|
||||
name = "vimshell-git-2015-03-24";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/Shougo/vimshell.vim";
|
||||
rev = "41d3ad325852e80588ab57c64433fa338789d6ac";
|
||||
sha256 = "bf76ee252a3cbb121013ce10547cee7d31a64d10c46687ddfaa988e7c5baf095";
|
||||
};
|
||||
meta = with stdenv.lib; {
|
||||
description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script";
|
||||
homepage = https://github.com/Shougo/vimshell.vim;
|
||||
@ -471,14 +474,7 @@ rec {
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Shougo/vimshell.vim/archive/ver.${version}.tar.gz";
|
||||
sha256 = "1pbwxdhpv6pr09b6hwkgy7grpmpwlqpsgsawl38r40q6yib8zb4a";
|
||||
};
|
||||
|
||||
buildInputs = [ vimproc ];
|
||||
|
||||
preBuild = ''
|
||||
sed -ie '1 i\
|
||||
set runtimepath+=${vimproc}/${rtpPath}/vimproc\
|
||||
@ -508,11 +504,11 @@ rec {
|
||||
};
|
||||
|
||||
watchdogs = buildVimPlugin {
|
||||
name = "watchdogs-git-2014-10-18";
|
||||
name = "watchdogs-git-2015-03-20";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/osyo-manga/vim-watchdogs.git";
|
||||
rev = "ad222796eb88b44954340c19c39938046af26e05";
|
||||
sha256 = "4c621ac2834864cf0c46f776029837913e1ba0c725a12d7cb24bf92e04ed1279";
|
||||
rev = "01ba53074fd3bedd81f5aed2dcc4fec092f62ba9";
|
||||
sha256 = "7b363779a0b035a0aaec025653a29e2f4dbd9e1518a34a6e993c43e8ec810d57";
|
||||
};
|
||||
meta = {
|
||||
homepage = https://github.com/osyo-manga/vim-watchdogs;
|
||||
@ -548,14 +544,13 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
YouCompleteMe = addRtp "${rtpPath}/youcompleteme" (stdenv.mkDerivation rec {
|
||||
YouCompleteMe = buildVimPlugin {
|
||||
src = fetchgit {
|
||||
rev = "035b6ca862da3bba0ab8aad388a485758311a464";
|
||||
rev = "56dc60ddc88d075902a5f13f10446923b009ad2f";
|
||||
url = "https://github.com/Valloric/YouCompleteMe.git";
|
||||
sha256 = "0l4a7mp0r888gdfzl59z8vk5jx4km58kzzqbn8v48i1k6scryvl7";
|
||||
sha256 = "1i4qv2g9vhd8999iv7ly0pxyp9l99dzq3rjf4snkb8rpcrimgbkj";
|
||||
};
|
||||
|
||||
name = "vimplugin-youcompleteme-2015-02-05";
|
||||
name = "youcompleteme-2015-03-25";
|
||||
|
||||
buildInputs = [ python cmake llvmPackages.clang ];
|
||||
|
||||
@ -583,13 +578,13 @@ rec {
|
||||
installPhase = ":";
|
||||
|
||||
meta = {
|
||||
description = "fastest non utf-8 aware word and C completion engine for Vim";
|
||||
description = "Fastest non utf-8 aware word and C completion engine for Vim";
|
||||
homepage = http://github.com/Valloric/YouCompleteMe;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [stdenv.lib.maintainers.marcweber];
|
||||
maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
youcompleteme = YouCompleteMe;
|
||||
|
||||
@ -639,6 +634,7 @@ rec {
|
||||
|
||||
### The following derivations are generated by nix#ExportPluginsForNix
|
||||
|
||||
|
||||
"Colour_Sampler_Pack" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Colour_Sampler_Pack";
|
||||
src = fetchurl {
|
||||
@ -655,11 +651,11 @@ rec {
|
||||
|
||||
};
|
||||
"Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Gist";
|
||||
name = "Gist-2015-03-25";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/mattn/gist-vim";
|
||||
rev = "8a567b823163d349406dffaff4519e0bac10eade";
|
||||
sha256 = "3f1b701529808bfbd000d377d49448d0ddd7e4e0cbf54fdc83fc5b676f567c88";
|
||||
rev = "22eeb3a72f116818dec0e2f9fe3ea46443141b95";
|
||||
sha256 = "9ecaa593267958c5860d6e34be5fc1e3280da5265a1fb35bdb2904163049325f";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -675,7 +671,7 @@ rec {
|
||||
|
||||
};
|
||||
"Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Hoogle";
|
||||
name = "Hoogle-2013-11-26";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/Twinside/vim-hoogle";
|
||||
rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
|
||||
@ -685,7 +681,7 @@ rec {
|
||||
|
||||
};
|
||||
"Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Solarized";
|
||||
name = "Solarized-2011-05-09";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/altercation/vim-colors-solarized";
|
||||
rev = "528a59f26d12278698bb946f8fb82a63711eec21";
|
||||
@ -695,27 +691,27 @@ rec {
|
||||
|
||||
};
|
||||
"Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Supertab";
|
||||
name = "Supertab-2015-02-15";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/ervandew/supertab";
|
||||
rev = "454c06e25680799b6f408622d6bfbaf920ace825";
|
||||
sha256 = "7ec13edc3338281ea1eb2fbae9a79b947fb3b490b684f8b4cc0ff9252845aa01";
|
||||
rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7";
|
||||
sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Syntastic";
|
||||
name = "Syntastic-2015-03-25";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scrooloose/syntastic";
|
||||
rev = "7d9aec0bee91be677c38b94ff222d02aa732fe52";
|
||||
sha256 = "9175783f6ea7ca148c156d9152ab59741da8e9ddede56c1ef9058a1856815723";
|
||||
rev = "dac07db61758590c71d655ed5403181af4e845a2";
|
||||
sha256 = "96ae43056b79a50c34272f483c5c7a3cf55f5aa8699b319fe9ed5f7ba12ed0d7";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Tabular";
|
||||
name = "Tabular-2013-05-16";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/godlygeek/tabular";
|
||||
rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
|
||||
@ -725,17 +721,17 @@ rec {
|
||||
|
||||
};
|
||||
"Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Tagbar";
|
||||
name = "Tagbar-2015-03-17";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/majutsushi/tagbar";
|
||||
rev = "00dfa82b00e734b453153564efeec933c48087f0";
|
||||
sha256 = "29305a2eb45ca104046b97557e9dbd599611564c533e5493de2fe467913af635";
|
||||
rev = "3634e7ab4feeab8ad49166e9e716638c20f1637c";
|
||||
sha256 = "cecbb15e025b300f688a7a67cc886a2e8a8afaf3e8fdca4a4d8ba73dabda8ab2";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "The_NERD_Commenter";
|
||||
name = "The_NERD_Commenter-2014-07-08";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scrooloose/nerdcommenter";
|
||||
rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
|
||||
@ -745,7 +741,7 @@ rec {
|
||||
|
||||
};
|
||||
"The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "The_NERD_tree";
|
||||
name = "The_NERD_tree-2014-11-20";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scrooloose/nerdtree";
|
||||
rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921";
|
||||
@ -755,17 +751,17 @@ rec {
|
||||
|
||||
};
|
||||
"UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "UltiSnips";
|
||||
name = "UltiSnips-2015-03-05";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/sirver/ultisnips";
|
||||
rev = "d693259abb2e28f70abf760d395fcf526d5272ee";
|
||||
sha256 = "541e47c9ae5b1e18072f5abfc64eadca8ddfe0271b251f1ddadd15ab98d82600";
|
||||
rev = "1971030b506a8f0e2e0398fb166f21a5341f8c7a";
|
||||
sha256 = "84c07f73ea22a34422c843c5ccb40aa8d3967175ff38ab6155303ba3c039e859";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "VimOutliner";
|
||||
name = "VimOutliner-2015-01-09";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/vimoutliner/vimoutliner";
|
||||
rev = "7c995f973c54b0d026137615af28059890edb197";
|
||||
@ -775,7 +771,7 @@ rec {
|
||||
|
||||
};
|
||||
"WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "WebAPI";
|
||||
name = "WebAPI-2014-10-27";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/mattn/webapi-vim";
|
||||
rev = "a7789abffe936db56e3152e23733847f94755753";
|
||||
@ -800,7 +796,7 @@ rec {
|
||||
|
||||
};
|
||||
"commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "commentary";
|
||||
name = "commentary-2014-11-10";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/tpope/vim-commentary";
|
||||
rev = "9c685131a5facfa0d643feca3a61b41c007d8170";
|
||||
@ -810,7 +806,7 @@ rec {
|
||||
|
||||
};
|
||||
"ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "ctrlp";
|
||||
name = "ctrlp-2013-07-29";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/kien/ctrlp.vim";
|
||||
rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f";
|
||||
@ -820,7 +816,7 @@ rec {
|
||||
|
||||
};
|
||||
"extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "extradite";
|
||||
name = "extradite-2015-01-26";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/int3/vim-extradite";
|
||||
rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f";
|
||||
@ -830,33 +826,33 @@ rec {
|
||||
|
||||
};
|
||||
"fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "fugitive";
|
||||
name = "fugitive-2015-02-20";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/tpope/vim-fugitive";
|
||||
rev = "933f6a1e1df549564062f936bd1c836d28cf1676";
|
||||
sha256 = "f8b43c6f0513a814d6ddc735c2f668b0b1f187bbb0a312a82276c4501ef2a908";
|
||||
rev = "0095769029709b531d2505ee6ad9907dd9bd72a0";
|
||||
sha256 = "83184b527538d0aac01783074ec29addfa18b62880ec8959dae6e404c6ff3d11";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "ghcmod";
|
||||
name = "ghcmod-2015-03-17";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/eagletmt/ghcmod-vim";
|
||||
rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9";
|
||||
sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d";
|
||||
rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb";
|
||||
sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"github:MarcWeber/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "github-MarcWeber-vim-addon-vim2nix";
|
||||
"github:JagaJaga/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "github-JagaJaga-vim-addon-vim2nix-2015-03-06";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-vim2nix";
|
||||
rev = "5507ee4db7599873d72fab035c752dea245e2cd4";
|
||||
sha256 = "1rqvgg3wq1grkh4nfj2wqmjg7a9r4hd82m89s9520kyzvldp8sgx";
|
||||
};
|
||||
dependencies = ["vim-addon-manager"];
|
||||
url = "git://github.com/JagaJaga/vim-addon-vim2nix";
|
||||
rev = "343d8a4e43a5b40f134e73be7140f754ca74d2e5";
|
||||
sha256 = "466ac56d4397d964cf21a63d31f2628fdea40bc94a54018affe8717de8514564";
|
||||
};
|
||||
dependencies = ["vim-addon-manager"];
|
||||
|
||||
};
|
||||
"matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
@ -881,7 +877,7 @@ rec {
|
||||
'';
|
||||
};
|
||||
"pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "pathogen";
|
||||
name = "pathogen-2014-11-06";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/tpope/vim-pathogen";
|
||||
rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2";
|
||||
@ -891,7 +887,7 @@ rec {
|
||||
|
||||
};
|
||||
"quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "quickfixstatus";
|
||||
name = "quickfixstatus-2011-09-02";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/dannyob/quickfixstatus";
|
||||
rev = "fd3875b914fc51bbefefa8c4995588c088163053";
|
||||
@ -901,7 +897,7 @@ rec {
|
||||
|
||||
};
|
||||
"rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "rainbow_parentheses";
|
||||
name = "rainbow_parentheses-2013-03-04";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/kien/rainbow_parentheses.vim";
|
||||
rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695";
|
||||
@ -911,7 +907,7 @@ rec {
|
||||
|
||||
};
|
||||
"rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "rust";
|
||||
name = "rust-2015-01-29";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/wting/rust.vim";
|
||||
rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376";
|
||||
@ -921,26 +917,27 @@ rec {
|
||||
|
||||
};
|
||||
"sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "sensible";
|
||||
name = "sensible-2014-11-24";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/tpope/vim-sensible";
|
||||
rev = "b30dcf387af977acfa21732592bfca05598b2188";
|
||||
sha256 = "6a9fc68c3eb0ee500ac59bdbc2c48d98e88a2936ee544f7203fa1a0296002b5f";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "snipmate";
|
||||
name = "snipmate-2015-03-21";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/garbas/vim-snipmate";
|
||||
rev = "22e3bb0133ed6e2acbc630a49f0a780487f56fd5";
|
||||
sha256 = "ec4a34d60a3930154342d37116baca5ca135881582261fa2a5136b298650ebe0";
|
||||
rev = "2079ea5aadaada568f78acfc6b565945625ed97d";
|
||||
sha256 = "47f5d131485f8a57389a0b455c6e83f8f543d71a04cbaa7af594b3abe9099d9f";
|
||||
};
|
||||
dependencies = ["vim-addon-mw-utils" "tlib"];
|
||||
|
||||
};
|
||||
"sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "sourcemap";
|
||||
name = "sourcemap-2012-09-19";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/chikatoike/sourcemap.vim";
|
||||
rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1";
|
||||
@ -950,47 +947,47 @@ rec {
|
||||
|
||||
};
|
||||
"surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "surround";
|
||||
name = "surround-2015-03-15";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/tpope/vim-surround";
|
||||
rev = "6afb2d90e3b3a637da093e1022ffaa232a2aeafd";
|
||||
sha256 = "775e8d58469840f1cf5d69d3c92914fcca9ace6e351708e491fcc82fd2fa1269";
|
||||
rev = "772ab9587b7d1e2c3bae75395c9123803059ba8a";
|
||||
sha256 = "5f4c5afecaa99dc67875a2356b46cb6e8daeffca4a00a451965ca022de26cbef";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "table-mode";
|
||||
name = "table-mode-2015-03-17";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/dhruvasagar/vim-table-mode";
|
||||
rev = "3096a26db437bfb6e66798bfbf45e7549ba767d9";
|
||||
sha256 = "78e63f47cdae63507fc567e3c60c214a794be8d072a6b83a980c7bb58396829c";
|
||||
rev = "c0a6d43f2191b841c01cec0638a33a8116f7f920";
|
||||
sha256 = "222532a9803f855b5f261eb311359980625606716c1b9419703b97874554c49d";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "tlib";
|
||||
name = "tlib-2015-02-23";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/tomtom/tlib_vim";
|
||||
rev = "9e629767e5a91ede057d07f8754326e68c92a692";
|
||||
sha256 = "8b435939fb1a439cc89734d3d7a38294217716c5b46b1402486e947e6ae97bb6";
|
||||
rev = "2376d1233e7d1db8157fdc3157278dda7a2c796f";
|
||||
sha256 = "07966a0f2a073ae07e8d2a63a8a265ec0053997721545b41cedff910bcc24de0";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "undotree";
|
||||
name = "undotree-2015-03-01";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/mbbill/undotree";
|
||||
rev = "42000e2a7140843030f517de9d4923dd5fa40458";
|
||||
sha256 = "9a9a89ccfa69f41ba24ec8f2be366f469e0497cef735ad01ec0f22fef5fcc293";
|
||||
rev = "fa018f38252f58073f2987f8bf0d2d4a61e07277";
|
||||
sha256 = "c52874b0b85d0a44a1f2f055a74985886af97615bac032259fc21d6ea40d6ca7";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-actions";
|
||||
name = "vim-addon-actions-2014-09-22";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-actions";
|
||||
rev = "a5d20500fb8812958540cf17862bd73e7af64936";
|
||||
@ -1000,7 +997,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-async";
|
||||
name = "vim-addon-async-2013-10-18";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-async";
|
||||
rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c";
|
||||
@ -1010,7 +1007,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-background-cmd";
|
||||
name = "vim-addon-background-cmd-2015-01-05";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-background-cmd";
|
||||
rev = "e99076519139b959edce0581b0f31207a5ec7c64";
|
||||
@ -1020,7 +1017,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-commenting";
|
||||
name = "vim-addon-commenting-2013-06-10";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-commenting";
|
||||
rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b";
|
||||
@ -1030,17 +1027,17 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-completion";
|
||||
name = "vim-addon-completion-2015-02-10";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-completion";
|
||||
rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435";
|
||||
sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859";
|
||||
rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75";
|
||||
sha256 = "969a474749edf7e4443d2540eaf12e891cc0a3f5533e62e081d32408f403a0ea";
|
||||
};
|
||||
dependencies = ["tlib"];
|
||||
|
||||
};
|
||||
"vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-errorformats";
|
||||
name = "vim-addon-errorformats-2014-11-05";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-errorformats";
|
||||
rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28";
|
||||
@ -1050,7 +1047,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-goto-thing-at-cursor";
|
||||
name = "vim-addon-goto-thing-at-cursor-2012-01-11";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor";
|
||||
rev = "f052e094bdb351829bf72ae3435af9042e09a6e4";
|
||||
@ -1060,27 +1057,27 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-local-vimrc";
|
||||
name = "vim-addon-local-vimrc-2015-03-19";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-local-vimrc";
|
||||
rev = "7689b55ee86dd6046923fd28ceab49da3881abfe";
|
||||
sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556";
|
||||
rev = "6a27f95b35befa70cd0d049329cd0920566c764b";
|
||||
sha256 = "f0687e08f380ff085b6fa3e708d1631049571706f55d796e22612aff02e51459";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-manager";
|
||||
name = "vim-addon-manager-2014-12-03";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-manager";
|
||||
rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07";
|
||||
sha256 = "1gp7w6wnp1cnvq7lhb6kkqrp315mxzwsc4sy1bxz1ih1rjdxmdd3";
|
||||
sha256 = "a3b5da9bcc01c6f0fb0a5e13a6f9efb58471339ed32c480fde96856bb9e1e7be";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-mru";
|
||||
name = "vim-addon-mru-2013-08-08";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-mru";
|
||||
rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb";
|
||||
@ -1090,7 +1087,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-mw-utils";
|
||||
name = "vim-addon-mw-utils-2012-11-05";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-mw-utils";
|
||||
rev = "0c5612fa31ee434ba055e21c76f456244b3b5109";
|
||||
@ -1100,17 +1097,17 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-nix";
|
||||
name = "vim-addon-nix-2015-03-10";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-nix";
|
||||
rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8";
|
||||
sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410";
|
||||
rev = "2aed79ba5d8c5e6abd102de77e55e242f61b17f1";
|
||||
sha256 = "0e326e2c6cb6597ca533a64a845ef9dd946cd249250375ef9775d974ecef37e2";
|
||||
};
|
||||
dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
|
||||
|
||||
};
|
||||
"vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-other";
|
||||
name = "vim-addon-other-2014-07-15";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-other";
|
||||
rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b";
|
||||
@ -1120,7 +1117,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-php-manual";
|
||||
name = "vim-addon-php-manual-2015-01-01";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-php-manual";
|
||||
rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff";
|
||||
@ -1130,7 +1127,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-signs";
|
||||
name = "vim-addon-signs-2013-04-19";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-signs";
|
||||
rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae";
|
||||
@ -1140,7 +1137,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-sql";
|
||||
name = "vim-addon-sql-2014-01-18";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-sql";
|
||||
rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b";
|
||||
@ -1150,7 +1147,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-syntax-checker";
|
||||
name = "vim-addon-syntax-checker-2013-07-12";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-syntax-checker";
|
||||
rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77";
|
||||
@ -1160,7 +1157,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-toggle-buffer";
|
||||
name = "vim-addon-toggle-buffer-2012-01-13";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-toggle-buffer";
|
||||
rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b";
|
||||
@ -1170,7 +1167,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-xdebug";
|
||||
name = "vim-addon-xdebug-2014-08-29";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-xdebug";
|
||||
rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172";
|
||||
@ -1180,17 +1177,17 @@ rec {
|
||||
|
||||
};
|
||||
"vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-airline";
|
||||
name = "vim-airline-2015-03-24";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/bling/vim-airline";
|
||||
rev = "446397e006d8cba9e1ac38d8c656ba39218c139b";
|
||||
sha256 = "c1f3ae483616318574e892b1cbaac2e08b0b90fd7348d7de745984c764b21119";
|
||||
rev = "f45ecdac15d99ed2354873a8b4d40432fd0a85a3";
|
||||
sha256 = "30176b06f13838fe7b0374e2ed529c0d26abe432ff7453c7443b2f204cf70012";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-coffee-script";
|
||||
name = "vim-coffee-script-2014-10-10";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/kchmck/vim-coffee-script";
|
||||
rev = "827e4a38b07479433b619091469a7495a392df8a";
|
||||
@ -1200,7 +1197,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-easy-align";
|
||||
name = "vim-easy-align-2014-12-14";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/junegunn/vim-easy-align";
|
||||
rev = "c62d124be614de65922b15d468c4049d1eee9353";
|
||||
@ -1210,17 +1207,17 @@ rec {
|
||||
|
||||
};
|
||||
"vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-gitgutter";
|
||||
name = "vim-gitgutter-2015-03-23";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/airblade/vim-gitgutter";
|
||||
rev = "e5efbaffc066ababc9ae0d689c7050fa5d6591bd";
|
||||
sha256 = "78e7db87f4f677ede5aad758131d060f4fb6017cf716aa6adc0736e92934d42d";
|
||||
rev = "8345c35770ffc6fc4088c36406d1e24170aabcc6";
|
||||
sha256 = "f7580832ebfd60f0b7cf05e697ac44e4b59a0f606fe49b7ef392052a50c69ad3";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-iced-coffee-script";
|
||||
name = "vim-iced-coffee-script-2013-12-27";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/noc7c9/vim-iced-coffee-script";
|
||||
rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2";
|
||||
@ -1230,7 +1227,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-latex-live-preview";
|
||||
name = "vim-latex-live-preview-2013-11-25";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/xuhdev/vim-latex-live-preview";
|
||||
rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c";
|
||||
@ -1240,7 +1237,7 @@ rec {
|
||||
|
||||
};
|
||||
"vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-signature";
|
||||
name = "vim-signature-2015-01-12";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/kshenoy/vim-signature";
|
||||
rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45";
|
||||
@ -1250,17 +1247,17 @@ rec {
|
||||
|
||||
};
|
||||
"vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-snippets";
|
||||
name = "vim-snippets-2015-03-24";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/honza/vim-snippets";
|
||||
rev = "27906a3754f0ac292d0915a4075bff22db53fa3e";
|
||||
sha256 = "fce0a62e78f031a00da0c7863d51d9f19f826bdc01c56cf5fc959132db29b6a6";
|
||||
rev = "707f005ccddaa15a0b8c207a7a711b0a9590578a";
|
||||
sha256 = "0c5807b82e18530a6b83f4f1c0010564a1a4b39f687672ab235b95e694095d03";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
"vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim2hs";
|
||||
name = "vim2hs-2014-04-16";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/dag/vim2hs";
|
||||
rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
|
||||
@ -1270,11 +1267,11 @@ rec {
|
||||
|
||||
};
|
||||
"vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vundle";
|
||||
name = "vundle-2015-03-21";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/gmarik/vundle";
|
||||
rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab";
|
||||
sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204";
|
||||
rev = "cfd3b2d388a8c2e9903d7a9d80a65539aabfe933";
|
||||
sha256 = "7ce9bb0a59c8f86cedd9b3867b834bcd160f2224c187189997ef76c2bfd99d50";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -1292,7 +1289,6 @@ rec {
|
||||
url = "http://www.vim.org/scripts/script.php?script_id=2465";
|
||||
};
|
||||
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user